samba: update to version 3.6.8

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2026-05-08 05:29:22 +00:00 · 2012-10-23 19:25:05 +00:00
parent 84cdc8465c
commit be304441d8
29 changed files with 21995 additions and 47 deletions
@@ -0,0 +1,20 @@
+Description: 64 bit fix for libsmbclient
+Author: Christian Perrier <bubulle@debian.org>
+Bug-Debian: http://bugs.debian.org/221618
+Forwarded: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=221618#27
+
+Index: samba/source3/include/libsmbclient.h
+===================================================================
+--- samba.orig/source3/include/libsmbclient.h
+++ samba/source3/include/libsmbclient.h
+@@ -79,6 +79,10 @@
+ #include <fcntl.h>
+ #include <utime.h>
+ 
+  /* Debian bug #221618 */
+#define _LARGEFILE64_SOURCE
+#define _FILE_OFFSET_BITS 64
+
+ #define SMBC_BASE_FD        10000 /* smallest file descriptor returned */
+ 
+ #define SMBC_WORKGROUP      1
@@ -0,0 +1,34 @@
+Description: Add mention about some user for user information in smbspool manpage
+Author: Christian Perrier <bubulle@debian.org>
+Bug-Debian: http://bugs.debian.org/387266
+Forwarded: yes
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=4104
+
+Index: samba/docs-xml/manpages-3/smbspool.8.xml
+===================================================================
+--- samba.orig/docs-xml/manpages-3/smbspool.8.xml
+++ samba/docs-xml/manpages-3/smbspool.8.xml
+@@ -73,7 +73,9 @@
+ 		</para></listitem>
+ 
+ 		<listitem><para>The user argument (argv[2]) contains the 
+-		print user's name and is presently not used by smbspool.
+		print user's name and is presently not used by smbspool
+		except in Kerberos environments to access the user's
+		ticket cache.
+ 		</para></listitem>
+ 
+ 		<listitem><para>The title argument (argv[3]) contains the 
+Index: samba/docs/manpages/smbspool.8
+===================================================================
+--- samba.orig/docs/manpages/smbspool.8
+++ samba/docs/manpages/smbspool.8
+@@ -114,7 +114,7 @@
+ .sp -1
+ .IP \(bu 2.3
+ .\}
+-The user argument (argv[2]) contains the print user\'s name and is presently not used by smbspool\&.
+The user argument (argv[2]) contains the print user\'s name and is presently not used by smbspool except in Kerberos environments to access the user\'s ticket cache\&.
+ .RE
+ .sp
+ .RS 4
@@ -0,0 +1,47 @@
+Description: nss_wins stop clobbering other daemon's log
+Author: Christian Perrier <bubulle@debian.org>,Buchan Milne 
+Bug-Debian: http://bugs.debian.org/598313
+Forwarded: yes
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=7499
+
+Index: samba/lib/util/debug.c
+===================================================================
+--- samba.orig/lib/util/debug.c
+++ samba/lib/util/debug.c
+@@ -474,15 +474,17 @@
+ 
+ 	if (state.logtype == DEBUG_FILE) {
+ #ifdef WITH_SYSLOG
+-		const char *p = strrchr_m( prog_name,'/' );
+-		if (p)
+-			prog_name = p + 1;
+		if (prog_name) {
+			const char *p = strrchr_m( prog_name,'/' );
+			if (p)
+				prog_name = p + 1;
+ #ifdef LOG_DAEMON
+-		openlog( prog_name, LOG_PID, SYSLOG_FACILITY );
+			openlog( prog_name, LOG_PID, SYSLOG_FACILITY );
+ #else
+-		/* for old systems that have no facility codes. */
+-		openlog( prog_name, LOG_PID );
+			/* for old systems that have no facility codes. */
+			openlog( prog_name, LOG_PID );
+ #endif
+		}
+ #endif
+ 	}
+ }
+Index: samba/nsswitch/wins.c
+===================================================================
+--- samba.orig/nsswitch/wins.c
+++ samba/nsswitch/wins.c
+@@ -52,7 +52,7 @@
+ 	lp_set_cmdline("log level", "0");
+ 
+ 	TimeInit();
+-	setup_logging("nss_wins",False);
+	setup_logging(NULL,False);
+ 	lp_load(get_dyn_CONFIGFILE(),True,False,False,True);
+ 	load_interfaces();
+ }
@@ -0,0 +1,15 @@
+Description: Fix path to perl binary in example file
+Author: Christian Perrier <bubulle@debian.org>
+Bug-Debian: http://bugs.debian.org/601406
+Forwarded: not-needed
+
+Index: samba/examples/misc/wall.perl
+===================================================================
+--- samba.orig/examples/misc/wall.perl
+++ samba/examples/misc/wall.perl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
+#!/usr/bin/perl
+ # 
+ #@(#) smb-wall.pl Description:
+ #@(#) A perl script which allows you to announce whatever you choose to
@@ -0,0 +1,21 @@
+Description: Drop Using Samba link in HTML documentation summary
+Author: Christian Perrier <bubulle@debian.org>
+Bug-Debian: http://bugs.debian.org/604768
+Forwarded: yes
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=7826
+
+Index: samba/docs/htmldocs/index.html
+===================================================================
+--- samba.orig/docs/htmldocs/index.html
+++ samba/docs/htmldocs/index.html
+@@ -23,10 +23,6 @@
+  <td valign="top">This book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework.</td>
+ </tr>
+ <tr>
+- <td valign="top"><a href="using_samba/toc.html">Using Samba</a>, 2nd Edition</td>
+- <td valign="top"><i>Using Samba</i>, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients.</td>
+-</tr>
+-<tr>
+  <td valign="top"><a href="manpages/index.html">Man pages</a></td>
+  <td valign="top">The Samba man pages in HTML.</td>
+ </tr>
@@ -0,0 +1,18 @@
+Description: Fix WHATSNEW.txt link in HTML documentation summary to fit Debian files organization
+Author: Christian Perrier <bubulle@debian.org>
+Bug-Debian: http://bugs.debian.org/604768
+Forwarded: not-needed
+
+Index: samba/docs/htmldocs/index.html
+===================================================================
+--- samba.orig/docs/htmldocs/index.html
+++ samba/docs/htmldocs/index.html
+@@ -27,7 +27,7 @@
+  <td valign="top">The Samba man pages in HTML.</td>
+ </tr>
+ <tr>
+- <td valign="top"><a href="../../WHATSNEW.txt">WHATSNEW</a></td>
+ <td valign="top"><a href="../WHATSNEW.txt">WHATSNEW</a></td>
+   <td valign="top">Samba Release Notes.</td>
+ </tr>
+ </table></body></html>
@@ -0,0 +1,20 @@
+--- samba-3.6.8/source3/configure.orig	2012-10-01 16:28:17.559074996 -0300
+++ samba-3.6.8/source3/configure	2012-10-01 16:39:07.747700087 -0300
+@@ -16718,7 +16718,7 @@
+ #################################################
+ # Check to see if core dump directory is defined in linux
+ # with /proc/sys/kernel/core_pattern
+-
+if false; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /proc/sys/kernel/core_pattern" >&5
+ $as_echo_n "checking for /proc/sys/kernel/core_pattern... " >&6; }
+ if ${ac_cv_file__proc_sys_kernel_core_pattern+:} false; then :
+@@ -16739,7 +16739,7 @@
+ $as_echo "#define HAVE_SYS_KERNEL_PROC_CORE_PATTERN 1" >>confdefs.h
+ 
+ fi
+-
+fi
+ 
+ #############################
+ # check if building with gpfs
@@ -0,0 +1,11 @@
+--- samba-3.6.6/source3/configure.orig	2012-10-01 15:50:15.371574883 -0300
+++ samba-3.6.6/source3/configure	2012-10-01 15:50:35.563699659 -0300
+@@ -13302,7 +13302,7 @@
+ 	# getaddrinfo is broken on some AIX systems
+ 	# see bug 5910, use our replacements if we detect
+ 	# a broken system.
+-	if test "$cross_compiling" = yes; then :
+	if test "$cross_compiling" = foo; then :
+   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "cannot run test program while cross compiling
@@ -0,0 +1,302 @@
+Description: Remove documentation parts that do not apply to Debian
+Author: Christian Perrier <bubulle@debian.org>
+Forwarded: not-needed
+
+Index: experimental/docs/manpages/swat.8
+===================================================================
+--- experimental.orig/docs/manpages/swat.8
+++ experimental/docs/manpages/swat.8
+@@ -111,86 +111,6 @@
+ .RS 4
+ Print a summary of command line options\&.
+ .RE
+-.SH "INSTALLATION"
+-.PP
+-Swat is included as binary package with most distributions\&. The package manager in this case takes care of the installation and configuration\&. This section is only for those who have compiled swat from scratch\&.
+-.PP
+-After you compile SWAT you need to run
+-make install
+-to install the
+-swat
+-binary and the various help files and images\&. A default install would put these in:
+-.sp
+-.RS 4
+-.ie n \{\
+-\h'-04'\(bu\h'+03'\c
+-.\}
+-.el \{\
+-.sp -1
+-.IP \(bu 2.3
+-.\}
+-/usr/local/samba/sbin/swat
+-.RE
+-.sp
+-.RS 4
+-.ie n \{\
+-\h'-04'\(bu\h'+03'\c
+-.\}
+-.el \{\
+-.sp -1
+-.IP \(bu 2.3
+-.\}
+-/usr/local/samba/swat/images/*
+-.RE
+-.sp
+-.RS 4
+-.ie n \{\
+-\h'-04'\(bu\h'+03'\c
+-.\}
+-.el \{\
+-.sp -1
+-.IP \(bu 2.3
+-.\}
+-/usr/local/samba/swat/help/*
+-.RE
+-.sp
+-.RE
+-.SS "Inetd Installation"
+-.PP
+-You need to edit your
+-/etc/inetd\&.conf
+-and
+-/etc/services
+-to enable SWAT to be launched via
+-inetd\&.
+-.PP
+-In
+-/etc/services
+-you need to add a line like this:
+-.PP
+-swat 901/tcp
+-.PP
+-Note for NIS/YP and LDAP users \- you may need to rebuild the NIS service maps rather than alter your local
+-/etc/services
+-file\&.
+-.PP
+-the choice of port number isn\'t really important except that it should be less than 1024 and not currently used (using a number above 1024 presents an obscure security hole depending on the implementation details of your
+-inetd
+-daemon)\&.
+-.PP
+-In
+-/etc/inetd\&.conf
+-you should add a line like this:
+-.PP
+-swat stream tcp nowait\&.400 root /usr/local/samba/sbin/swat swat
+-.PP
+-Once you have edited
+-/etc/services
+-and
+-/etc/inetd\&.conf
+-you need to send a HUP signal to inetd\&. To do this use
+-kill \-1 PID
+-where PID is the process ID of the inetd daemon\&.
+ .SH "LAUNCHING"
+ .PP
+ To launch SWAT just run your favorite web browser and point it at "http://localhost:901/"\&.
+@@ -208,14 +128,11 @@
+ This file must contain a mapping of service name (e\&.g\&., swat) to service port (e\&.g\&., 901) and protocol type (e\&.g\&., tcp)\&.
+ .RE
+ .PP
+-/usr/local/samba/lib/smb\&.conf
+/etc/samba/smb\&.conf
+ .RS 4
+ This is the default location of the
+ \fBsmb.conf\fR(5)
+-server configuration file that swat edits\&. Other common places that systems install this file are
+-/usr/samba/lib/smb\&.conf
+-and
+-/etc/smb\&.conf\&. This file describes all the services the server is to make available to clients\&.
+server configuration file that swat edits\&. This file describes all the services the server is to make available to clients\&.
+ .RE
+ .SH "WARNINGS"
+ .PP
+Index: experimental/docs/manpages/nmbd.8
+===================================================================
+--- experimental.orig/docs/manpages/nmbd.8
+++ experimental/docs/manpages/nmbd.8
+@@ -115,10 +115,7 @@
+ to answer any name queries\&. Adding a line to this file affects name NetBIOS resolution from this host
+ \fIONLY\fR\&.
+ .sp
+-The default path to this file is compiled into Samba as part of the build process\&. Common defaults are
+-/usr/local/samba/lib/lmhosts,
+-/usr/samba/lib/lmhosts
+-or
+The default path to this file is
+ /etc/samba/lmhosts\&. See the
+ \fBlmhosts\fR(5)
+ man page for details on the contents of this file\&.
+@@ -187,14 +184,11 @@
+ inetd, this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
+ .RE
+ .PP
+-/usr/local/samba/lib/smb\&.conf
+/etc/samba/smb\&.conf
+ .RS 4
+ This is the default location of the
+ \fBsmb.conf\fR(5)
+-server configuration file\&. Other common places that systems install this file are
+-/usr/samba/lib/smb\&.conf
+-and
+-/etc/samba/smb\&.conf\&.
+server configuration file\&.
+ .sp
+ When run as a WINS server (see the
+ \m[blue]\fBwins support\fR\m[]
+@@ -238,10 +232,8 @@
+ will accept SIGHUP, which will cause it to dump out its namelists into the file
+ namelist\&.debug
+ in the
+-/usr/local/samba/var/locks
+-directory (or the
+-var/locks
+-directory configured under wherever Samba was configured to install itself)\&. This will also cause
+/var/run/samba
+directory\&. This will also cause
+ nmbd
+ to dump out its server database in the
+ log\&.nmb
+Index: experimental/docs/manpages/smbd.8
+===================================================================
+--- experimental.orig/docs/manpages/smbd.8
+++ experimental/docs/manpages/smbd.8
+@@ -169,14 +169,11 @@
+ inetd, this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
+ .RE
+ .PP
+-/usr/local/samba/lib/smb\&.conf
+/etc/samba/smb\&.conf
+ .RS 4
+ This is the default location of the
+ \fBsmb.conf\fR(5)
+-server configuration file\&. Other common places that systems install this file are
+-/usr/samba/lib/smb\&.conf
+-and
+-/etc/samba/smb\&.conf\&.
+server configuration file\&.
+ .sp
+ This file describes all the services the server is to make available to clients\&. See
+ \fBsmb.conf\fR(5)
+Index: experimental/docs/manpages/lmhosts.5
+===================================================================
+--- experimental.orig/docs/manpages/lmhosts.5
+++ experimental/docs/manpages/lmhosts.5
+@@ -96,10 +96,8 @@
+ file\&.
+ .SH "FILES"
+ .PP
+-lmhosts is loaded from the configuration directory\&. This is usually
+-/etc/samba
+-or
+-/usr/local/samba/lib\&.
+lmhosts is loaded from the configuration directory\&. This is
+/etc/samba\&.
+ .SH "VERSION"
+ .PP
+ This man page is correct for version 3 of the Samba suite\&.
+Index: experimental/docs/manpages/ntlm_auth.1
+===================================================================
+--- experimental.orig/docs/manpages/ntlm_auth.1
+++ experimental/docs/manpages/ntlm_auth.1
+@@ -43,7 +43,7 @@
+ Some of these commands also require access to the directory
+ winbindd_privileged
+ in
+-$LOCKDIR\&. This should be done either by running this command as root or providing group access to the
+/var/run/samba\F[]\&. This should be done either by running this command as root or providing group access to the
+ winbindd_privileged
+ directory\&. For security reasons, this directory should not be world\-accessable\&.
+ .SH "OPTIONS"
+@@ -69,7 +69,7 @@
+ Requires access to the directory
+ winbindd_privileged
+ in
+-$LOCKDIR\&. The protocol used is described here:
+/var/run/samba\&. The protocol used is described here:
+ http://devel\&.squid\-cache\&.org/ntlm/squid_helper_protocol\&.html\&. This protocol has been extended to allow the NTLMSSP Negotiate packet to be included as an argument to the
+ YR
+ command\&. (Thus avoiding loss of information in the protocol exchange)\&.
+@@ -92,7 +92,7 @@
+ Requires access to the directory
+ winbindd_privileged
+ in
+-$LOCKDIR\&.
+/var/run/samba\&.
+ .RE
+ .PP
+ gss\-spnego\-client
+Index: experimental/docs/manpages/tdbbackup.8
+===================================================================
+--- experimental.orig/docs/manpages/tdbbackup.8
+++ experimental/docs/manpages/tdbbackup.8
+@@ -77,7 +77,7 @@
+ .\}
+ 
+ secrets\&.tdb
+-\- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba\&.
+\- usual location is in the /var/lib/samba directory\&.
+ .RE
+ .sp
+ .RS 4
+@@ -90,7 +90,7 @@
+ .\}
+ 
+ passdb\&.tdb
+-\- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba\&.
+\- usual location is in the /var/lib/samba directory\&.
+ .RE
+ .sp
+ .RS 4
+@@ -103,7 +103,7 @@
+ .\}
+ 
+ *\&.tdb
+-located in the /usr/local/samba/var directory or on some systems in the /var/cache or /var/lib/samba directories\&.
+located in the /var/lib/samba and /var/run/samba directories\&.
+ .RE
+ .SH "VERSION"
+ .PP
+Index: experimental/docs/manpages/winbindd.8
+===================================================================
+--- experimental.orig/docs/manpages/winbindd.8
+++ experimental/docs/manpages/winbindd.8
+@@ -550,16 +550,16 @@
+ file are owned by root\&.
+ .RE
+ .PP
+-$LOCKDIR/winbindd_privileged/pipe
+/var/run/samba/winbindd_privileged/pipe
+ .RS 4
+ The UNIX pipe over which \'privileged\' clients communicate with the
+ winbindd
+ program\&. For security reasons, access to some winbindd functions \- like those needed by the
+ ntlm_auth
+-utility \- is restricted\&. By default, only users in the \'root\' group will get this access, however the administrator may change the group permissions on $LOCKDIR/winbindd_privileged to allow programs like \'squid\' to use ntlm_auth\&. Note that the winbind client will only attempt to connect to the winbindd daemon if both the
+-$LOCKDIR/winbindd_privileged
+utility \- is restricted\&. By default, only users in the \'root\' group will get this access, however the administrator may change the group permissions on /var/run/samba/winbindd_privileged to allow programs like \'squid\' to use ntlm_auth\&. Note that the winbind client will only attempt to connect to the winbindd daemon if both the
+/var/run/samba/winbindd_privileged
+ directory and
+-$LOCKDIR/winbindd_privileged/pipe
+/var/run/samba/winbindd_privileged/pipe
+ file are owned by root\&.
+ .RE
+ .PP
+@@ -568,15 +568,12 @@
+ Implementation of name service switch library\&.
+ .RE
+ .PP
+-$LOCKDIR/winbindd_idmap\&.tdb
+/var/run/samba/winbindd_idmap\&.tdb
+ .RS 4
+-Storage for the Windows NT rid to UNIX user/group id mapping\&. The lock directory is specified when Samba is initially compiled using the
+-\fI\-\-with\-lockdir\fR
+-option\&. This directory is by default
+-/usr/local/samba/var/locks\&.
+Storage for the Windows NT rid to UNIX user/group id mapping\&.
+ .RE
+ .PP
+-$LOCKDIR/winbindd_cache\&.tdb
+/var/run/samba/winbindd_cache\&.tdb
+ .RS 4
+ Storage for cached user and group information\&.
+ .RE
@@ -0,0 +1,314 @@
+Description: Remove documentation parts that do not apply to Debian
+Author: Christian Perrier <bubulle@debian.org>
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=8789
+Forwarded: yes
+
+Index: samba/docs-xml/manpages-3/nmbd.8.xml
+===================================================================
+--- samba.orig/docs-xml/manpages-3/nmbd.8.xml
+++ samba/docs-xml/manpages-3/nmbd.8.xml
+@@ -266,7 +266,6 @@
+ 	<manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smb.conf</refentrytitle>
+ 	<manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbclient</refentrytitle>
+ 	<manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testparm</refentrytitle>
+-	<manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testprns</refentrytitle>
+ 	<manvolnum>1</manvolnum></citerefentry>, and the Internet 
+ 	RFC's <filename>rfc1001.txt</filename>, <filename>rfc1002.txt</filename>. 
+ 	In addition the CIFS (formerly SMB) specification is available 
+Index: samba/docs-xml/manpages-3/samba.7.xml
+===================================================================
+--- samba.orig/docs-xml/manpages-3/samba.7.xml
+++ samba/docs-xml/manpages-3/samba.7.xml
+@@ -76,16 +76,6 @@
+ 		</varlistentry>
+ 
+ 		<varlistentry>
+-		<term><citerefentry><refentrytitle>testprns</refentrytitle>
+-		<manvolnum>1</manvolnum></citerefentry></term>
+-		<listitem><para>The <command>testprns</command>
+-		utility supports testing printer names defined 
+-		in your <filename>printcap</filename> file used 
+-		by Samba.</para>
+-		</listitem>
+-		</varlistentry>
+-
+-		<varlistentry>
+ 		<term><citerefentry><refentrytitle>smbstatus</refentrytitle>
+ 		<manvolnum>1</manvolnum></citerefentry></term>
+ 		<listitem><para>The <command>smbstatus</command>
+@@ -125,7 +115,8 @@
+ 		<manvolnum>1</manvolnum></citerefentry></term>
+ 		<listitem><para>The <command>smbsh</command> command is 
+ 		a program that allows you to run a unix shell with 
+-		with an overloaded VFS.</para></listitem>
+		with an overloaded VFS. Note that, it is not installed by
+		the current samba package.</para></listitem>
+ 		</varlistentry>
+ 
+ 		<varlistentry>
+Index: samba/docs-xml/manpages-3/smb.conf.5.xml
+===================================================================
+--- samba.orig/docs-xml/manpages-3/smb.conf.5.xml
+++ samba/docs-xml/manpages-3/smb.conf.5.xml
+@@ -856,7 +856,6 @@
+ 	<manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbclient</refentrytitle>
+ 	<manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>nmblookup</refentrytitle>
+ 	<manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testparm</refentrytitle>
+-	<manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testprns</refentrytitle>
+ 	<manvolnum>1</manvolnum></citerefentry>.</para>
+ </refsect1>
+ 
+Index: samba/docs-xml/manpages-3/smbd.8.xml
+===================================================================
+--- samba.orig/docs-xml/manpages-3/smbd.8.xml
+++ samba/docs-xml/manpages-3/smbd.8.xml
+@@ -417,7 +417,6 @@
+ 	<manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smb.conf</refentrytitle>
+ 	<manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbclient</refentrytitle>
+ 	<manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testparm</refentrytitle>
+-	<manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testprns</refentrytitle>
+ 	<manvolnum>1</manvolnum></citerefentry>, and the 
+ 	Internet RFC's	<filename>rfc1001.txt</filename>, <filename>rfc1002.txt</filename>. 
+ 	In addition the CIFS (formerly SMB) specification is available 
+Index: samba/docs-xml/using_samba/appd.xml
+===================================================================
+--- samba.orig/docs-xml/using_samba/appd.xml
+++ samba/docs-xml/using_samba/appd.xml
+@@ -296,7 +296,7 @@
+ 
+ 
+ <para>The <emphasis>smbsh</emphasis>
+-<indexterm id="appd-idx-993744-0"><primary>smbsh program</primary></indexterm> program lets you use a remote Windows share on your Samba server as if the share was a regular Unix directory. When it's run, it provides an extra directory tree under <filename>/smb</filename>. Subdirectories of <filename>/smb</filename> are servers, and subdirectories of the servers are their individual disk and printer shares. Commands run by <emphasis>smbsh</emphasis> treat the <filename>/smb</filename> filesystem as if it were local to Unix. This means that you don't need <emphasis>smbmount</emphasis> in your kernel to mount Windows filesystems the way you mount with NFS filesystems. However, you do need to configure Samba with the <literal>--with-smbwrappers</literal> option to enable <filename>smbsh</filename>.</para>
+<indexterm id="appd-idx-993744-0"><primary>smbsh program</primary></indexterm> program (<emphasis>not available in this samba package</emphasis>) lets you use a remote Windows share on your Samba server as if the share was a regular Unix directory. When it's run, it provides an extra directory tree under <filename>/smb</filename>. Subdirectories of <filename>/smb</filename> are servers, and subdirectories of the servers are their individual disk and printer shares. Commands run by <emphasis>smbsh</emphasis> treat the <filename>/smb</filename> filesystem as if it were local to Unix. This means that you don't need <emphasis>smbmount</emphasis> in your kernel to mount Windows filesystems the way you mount with NFS filesystems. However, you do need to configure Samba with the <literal>--with-smbwrappers</literal> option to enable <filename>smbsh</filename>.</para>
+ 
+ 
+ <sect3 role="" label="D.1.4.1" id="appd-SECT-1.4.1">
+@@ -1320,24 +1320,6 @@
+ </sect2>
+ 
+ 
+-
+-
+-
+-<sect2 role="" label="D.1.11" id="appd-SECT-1.11">
+-<title>testprns</title>
+-
+-
+-<para>The<indexterm id="appd-idx-993761-0"><primary>testprns program</primary></indexterm>
+-<indexterm id="appd-idx-993761-1"><primary>printers</primary><secondary>names</secondary><tertiary>checking</tertiary></indexterm> <emphasis>testprns</emphasis> program checks a specified printer name against the system printer capabilities (<filename>printcap</filename>) file. Its command line is:</para>
+-
+-
+-<programlisting>testprns <replaceable>printername</replaceable> [<replaceable>printcapname</replaceable>]</programlisting>
+-
+-
+-<para>If the <literal>printcapname</literal> isn't specified, Samba attempts to use one located in the <filename>smb.conf</filename> file. If one isn't specified there, Samba will try <filename>/etc/printcap</filename>. If that fails, the program will generate an error.</para>
+-</sect2>
+-
+-
+ 
+ 
+ 
+Index: samba/docs-xml/using_samba/ch01.xml
+===================================================================
+--- samba.orig/docs-xml/using_samba/ch01.xml
+++ samba/docs-xml/using_samba/ch01.xml
+@@ -1375,12 +1375,6 @@
+ </varlistentry>
+ 
+ 
+-<varlistentry><term>testprns</term>
+-<listitem><para>A program that tests whether various printers are recognized by the <filename>smbd</filename> daemon</para></listitem>
+-</varlistentry>
+-</variablelist>
+-
+-
+ <para>Each significant release of Samba goes through a significant exposure test before it's announced. In addition, it is quickly updated afterward if problems or unwanted side-effects are found. The latest stable distribution as of this writing is Samba 2.0.5, the long-awaited production version of Samba 2.0. This book focuses on the functionality supported in Samba 2.0, as opposed to the older 1.9.<emphasis>x</emphasis> versions of Samba, which are now obsolete.</para>
+ </sect1>
+ 
+Index: samba/docs-xml/using_samba/ch07.xml
+===================================================================
+--- samba.orig/docs-xml/using_samba/ch07.xml
+++ samba/docs-xml/using_samba/ch07.xml
+@@ -306,7 +306,7 @@
+ 	public: true</programlisting>
+ 
+ 
+-<para>Second, try the command <literal>testprns</literal> <replaceable>printername</replaceable>. This is a simple program that verifies that the specified printer is available in your <emphasis>printcap</emphasis> file. If your <emphasis>printcap</emphasis> file is not in the usual place, you can specify its full pathname as the second argument to the <emphasis>testprns</emphasis> command:</para>
+<para>Second, try the command <literal>testprns</literal> <replaceable>printername</replaceable>. <emphasis>Note</emphasis>: This command is not available in this package. This is a simple program that verifies that the specified printer is available in your <emphasis>printcap</emphasis> file. If your <emphasis>printcap</emphasis> file is not in the usual place, you can specify its full pathname as the second argument to the <emphasis>testprns</emphasis> command:</para>
+ 
+ 
+ <programlisting># testprns lp /etc/printcap
+Index: samba/docs/htmldocs/manpages/nmbd.8.html
+===================================================================
+--- samba.orig/docs/htmldocs/manpages/nmbd.8.html
+++ samba/docs/htmldocs/manpages/nmbd.8.html
+@@ -131,7 +131,7 @@
+ 	transient problems to be diagnosed, whilst still running 
+ 	at a normally low log level.</p></div><div class="refsect1" title="VERSION"><a name="id307511"></a><h2>VERSION</h2><p>This man page is correct for version 3 of 
+ 	the Samba suite.</p></div><div class="refsect1" title="SEE ALSO"><a name="id307521"></a><h2>SEE ALSO</h2><p>
+-	<a class="citerefentry" href="inetd.8.html"><span class="citerefentry"><span class="refentrytitle">inetd</span>(8)</span></a>, <a class="citerefentry" href="smbd.8.html"><span class="citerefentry"><span class="refentrytitle">smbd</span>(8)</span></a>, <a class="citerefentry" href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a>, <a class="citerefentry" href="smbclient.1.html"><span class="citerefentry"><span class="refentrytitle">smbclient</span>(1)</span></a>, <a class="citerefentry" href="testparm.1.html"><span class="citerefentry"><span class="refentrytitle">testparm</span>(1)</span></a>, <a class="citerefentry" href="testprns.1.html"><span class="citerefentry"><span class="refentrytitle">testprns</span>(1)</span></a>, and the Internet 
+	<a class="citerefentry" href="inetd.8.html"><span class="citerefentry"><span class="refentrytitle">inetd</span>(8)</span></a>, <a class="citerefentry" href="smbd.8.html"><span class="citerefentry"><span class="refentrytitle">smbd</span>(8)</span></a>, <a class="citerefentry" href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a>, <a class="citerefentry" href="smbclient.1.html"><span class="citerefentry"><span class="refentrytitle">smbclient</span>(1)</span></a>, <a class="citerefentry" href="testparm.1.html"><span class="citerefentry"><span class="refentrytitle">testparm</span>(1)</span></a>, and the Internet
+ 	RFC's <code class="filename">rfc1001.txt</code>, <code class="filename">rfc1002.txt</code>. 
+ 	In addition the CIFS (formerly SMB) specification is available 
+ 	as a link from the Web page <a class="ulink" href="http://samba.org/cifs/" target="_top"> 
+Index: samba/docs/htmldocs/manpages/samba.7.html
+===================================================================
+--- samba.orig/docs/htmldocs/manpages/samba.7.html
+++ samba/docs/htmldocs/manpages/samba.7.html
+@@ -17,10 +17,7 @@
+ 		servers (such as Windows NT), and can also be used 
+ 		to allow a UNIX box to print to a printer attached to 
+ 		any SMB server (such as a PC running Windows NT).</p></dd><dt><span class="term"><a class="citerefentry" href="testparm.1.html"><span class="citerefentry"><span class="refentrytitle">testparm</span>(1)</span></a></span></dt><dd><p>The <code class="literal">testparm</code>
+-		utility is a simple syntax checker for Samba's <a class="citerefentry" href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a> configuration file.</p></dd><dt><span class="term"><a class="citerefentry" href="testprns.1.html"><span class="citerefentry"><span class="refentrytitle">testprns</span>(1)</span></a></span></dt><dd><p>The <code class="literal">testprns</code>
+-		utility supports testing printer names defined 
+-		in your <code class="filename">printcap</code> file used 
+-		by Samba.</p></dd><dt><span class="term"><a class="citerefentry" href="smbstatus.1.html"><span class="citerefentry"><span class="refentrytitle">smbstatus</span>(1)</span></a></span></dt><dd><p>The <code class="literal">smbstatus</code>
+		utility is a simple syntax checker for Samba's <a class="citerefentry" href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a> configuration file.</p></dd><dt><span class="term"><a class="citerefentry" href="smbstatus.1.html"><span class="citerefentry"><span class="refentrytitle">smbstatus</span>(1)</span></a></span></dt><dd><p>The <code class="literal">smbstatus</code>
+ 		tool provides access to information about the 
+ 		current connections to <code class="literal">smbd</code>.</p></dd><dt><span class="term"><a class="citerefentry" href="nmblookup.1.html"><span class="citerefentry"><span class="refentrytitle">nmblookup</span>(1)</span></a></span></dt><dd><p>The <code class="literal">nmblookup</code>
+ 		tools allows NetBIOS name queries to be made 
+@@ -29,7 +26,8 @@
+ 		password hashes on Samba and Windows NT servers.</p></dd><dt><span class="term"><a class="citerefentry" href="smbcacls.1.html"><span class="citerefentry"><span class="refentrytitle">smbcacls</span>(1)</span></a></span></dt><dd><p>The <code class="literal">smbcacls</code> command is 
+ 		a tool to set ACL's on remote CIFS servers. </p></dd><dt><span class="term"><a class="citerefentry" href="smbsh.1.html"><span class="citerefentry"><span class="refentrytitle">smbsh</span>(1)</span></a></span></dt><dd><p>The <code class="literal">smbsh</code> command is 
+ 		a program that allows you to run a unix shell with 
+-		with an overloaded VFS.</p></dd><dt><span class="term"><a class="citerefentry" href="smbtree.1.html"><span class="citerefentry"><span class="refentrytitle">smbtree</span>(1)</span></a></span></dt><dd><p>The <code class="literal">smbtree</code> command 
+		with an overloaded VFS. Note that, it is not installed by 
+		the current samba package.</p></dd><dt><span class="term"><a class="citerefentry" href="smbtree.1.html"><span class="citerefentry"><span class="refentrytitle">smbtree</span>(1)</span></a></span></dt><dd><p>The <code class="literal">smbtree</code> command 
+ 		is a text-based network neighborhood tool.</p></dd><dt><span class="term"><a class="citerefentry" href="smbtar.1.html"><span class="citerefentry"><span class="refentrytitle">smbtar</span>(1)</span></a></span></dt><dd><p>The <code class="literal">smbtar</code> can make 
+ 		backups of data on CIFS/SMB servers.</p></dd><dt><span class="term"><a class="citerefentry" href="smbspool.8.html"><span class="citerefentry"><span class="refentrytitle">smbspool</span>(8)</span></a></span></dt><dd><p><code class="literal">smbspool</code> is a 
+ 		helper utility for printing on printers connected 
+Index: samba/docs/htmldocs/manpages/smb.conf.5.html
+===================================================================
+--- samba.orig/docs/htmldocs/manpages/smb.conf.5.html
+++ samba/docs/htmldocs/manpages/smb.conf.5.html
+@@ -6964,7 +6964,7 @@
+ 	care when designing these sections. In particular, ensure that the permissions on spool directories are
+ 	correct.
+ 	</p></div><div class="refsect1" title="VERSION"><a name="id340677"></a><h2>VERSION</h2><p>This man page is correct for version 3 of the Samba suite.</p></div><div class="refsect1" title="SEE ALSO"><a name="id340688"></a><h2>SEE ALSO</h2><p>
+-	<a class="citerefentry" href="samba.7.html"><span class="citerefentry"><span class="refentrytitle">samba</span>(7)</span></a>, <a class="citerefentry" href="smbpasswd.8.html"><span class="citerefentry"><span class="refentrytitle">smbpasswd</span>(8)</span></a>, <a class="citerefentry" href="swat.8.html"><span class="citerefentry"><span class="refentrytitle">swat</span>(8)</span></a>, <a class="citerefentry" href="smbd.8.html"><span class="citerefentry"><span class="refentrytitle">smbd</span>(8)</span></a>, <a class="citerefentry" href="nmbd.8.html"><span class="citerefentry"><span class="refentrytitle">nmbd</span>(8)</span></a>, <a class="citerefentry" href="smbclient.1.html"><span class="citerefentry"><span class="refentrytitle">smbclient</span>(1)</span></a>, <a class="citerefentry" href="nmblookup.1.html"><span class="citerefentry"><span class="refentrytitle">nmblookup</span>(1)</span></a>, <a class="citerefentry" href="testparm.1.html"><span class="citerefentry"><span class="refentrytitle">testparm</span>(1)</span></a>, <a class="citerefentry" href="testprns.1.html"><span class="citerefentry"><span class="refentrytitle">testprns</span>(1)</span></a>.</p></div><div class="refsect1" title="AUTHOR"><a name="id340767"></a><h2>AUTHOR</h2><p>
+	<a class="citerefentry" href="samba.7.html"><span class="citerefentry"><span class="refentrytitle">samba</span>(7)</span></a>, <a class="citerefentry" href="smbpasswd.8.html"><span class="citerefentry"><span class="refentrytitle">smbpasswd</span>(8)</span></a>, <a class="citerefentry" href="swat.8.html"><span class="citerefentry"><span class="refentrytitle">swat</span>(8)</span></a>, <a class="citerefentry" href="smbd.8.html"><span class="citerefentry"><span class="refentrytitle">smbd</span>(8)</span></a>, <a class="citerefentry" href="nmbd.8.html"><span class="citerefentry"><span class="refentrytitle">nmbd</span>(8)</span></a>, <a class="citerefentry" href="smbclient.1.html"><span class="citerefentry"><span class="refentrytitle">smbclient</span>(1)</span></a>, <a class="citerefentry" href="nmblookup.1.html"><span class="citerefentry"><span class="refentrytitle">nmblookup</span>(1)</span></a>, <a class="citerefentry" href="testparm.1.html"><span class="citerefentry"><span class="refentrytitle">testparm</span>(1)</span></a>.</p></div><div class="refsect1" title="AUTHOR"><a name="id340767"></a><h2>AUTHOR</h2><p>
+ 	The original Samba software and related utilities were created by Andrew Tridgell. Samba is now developed
+ 	by the Samba Team as an Open Source project similar to the way the Linux kernel is developed.
+ 	</p><p>
+Index: samba/docs/htmldocs/manpages/smbd.8.html
+===================================================================
+--- samba.orig/docs/htmldocs/manpages/smbd.8.html
+++ samba/docs/htmldocs/manpages/smbd.8.html
+@@ -147,7 +147,7 @@
+ 	<code class="literal">smbd</code> is in a state of waiting for an incoming SMB before 
+ 	issuing them. It is possible to make the signal handlers safe 
+ 	by un-blocking the signals before the select call and re-blocking 
+-	them after, however this would affect performance.</p></div><div class="refsect1" title="SEE ALSO"><a name="id307739"></a><h2>SEE ALSO</h2><p><a class="citerefentry" href="hosts_access.5.html"><span class="citerefentry"><span class="refentrytitle">hosts_access</span>(5)</span></a>, <a class="citerefentry" href="inetd.8.html"><span class="citerefentry"><span class="refentrytitle">inetd</span>(8)</span></a>, <a class="citerefentry" href="nmbd.8.html"><span class="citerefentry"><span class="refentrytitle">nmbd</span>(8)</span></a>, <a class="citerefentry" href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a>, <a class="citerefentry" href="smbclient.1.html"><span class="citerefentry"><span class="refentrytitle">smbclient</span>(1)</span></a>, <a class="citerefentry" href="testparm.1.html"><span class="citerefentry"><span class="refentrytitle">testparm</span>(1)</span></a>, <a class="citerefentry" href="testprns.1.html"><span class="citerefentry"><span class="refentrytitle">testprns</span>(1)</span></a>, and the 
+	them after, however this would affect performance.</p></div><div class="refsect1" title="SEE ALSO"><a name="id307739"></a><h2>SEE ALSO</h2><p><a class="citerefentry" href="hosts_access.5.html"><span class="citerefentry"><span class="refentrytitle">hosts_access</span>(5)</span></a>, <a class="citerefentry" href="inetd.8.html"><span class="citerefentry"><span class="refentrytitle">inetd</span>(8)</span></a>, <a class="citerefentry" href="nmbd.8.html"><span class="citerefentry"><span class="refentrytitle">nmbd</span>(8)</span></a>, <a class="citerefentry" href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a>, <a class="citerefentry" href="smbclient.1.html"><span class="citerefentry"><span class="refentrytitle">smbclient</span>(1)</span></a>, <a class="citerefentry" href="testparm.1.html"><span class="citerefentry"><span class="refentrytitle">testparm</span>(1)</span></a>, and the
+ 	Internet RFC's	<code class="filename">rfc1001.txt</code>, <code class="filename">rfc1002.txt</code>. 
+ 	In addition the CIFS (formerly SMB) specification is available 
+ 	as a link from the Web page <a class="ulink" href="http://samba.org/cifs/" target="_top"> 
+Index: samba/docs/manpages/nmbd.8
+===================================================================
+--- samba.orig/docs/manpages/nmbd.8
+++ samba/docs/manpages/nmbd.8
+@@ -252,8 +252,7 @@
+ \fBsmbd\fR(8),
+ \fBsmb.conf\fR(5),
+ \fBsmbclient\fR(1),
+-\fBtestparm\fR(1),
+-\fBtestprns\fR(1), and the Internet RFC\'s
+\fBtestparm\fR(1), and the Internet RFC\'s
+ rfc1001\&.txt,
+ rfc1002\&.txt\&. In addition the CIFS (formerly SMB) specification is available as a link from the Web page
+ http://samba\&.org/cifs/\&.
+Index: samba/docs/manpages/samba.7
+===================================================================
+--- samba.orig/docs/manpages/samba.7
+++ samba/docs/manpages/samba.7
+@@ -60,15 +60,6 @@
+ configuration file\&.
+ .RE
+ .PP
+-\fBtestprns\fR(1)
+-.RS 4
+-The
+-testprns
+-utility supports testing printer names defined in your
+-printcap
+-file used by Samba\&.
+-.RE
+-.PP
+ \fBsmbstatus\fR(1)
+ .RS 4
+ The
+@@ -102,7 +93,7 @@
+ .RS 4
+ The
+ smbsh
+-command is a program that allows you to run a unix shell with with an overloaded VFS\&.
+command is a program that allows you to run a unix shell with with an overloaded VFS. Note that, it is not installed by the current samba package\&.
+ .RE
+ .PP
+ \fBsmbtree\fR(1)
+Index: samba/docs/manpages/smb.conf.5
+===================================================================
+--- samba.orig/docs/manpages/smb.conf.5
+++ samba/docs/manpages/smb.conf.5
+@@ -11021,8 +11021,7 @@
+ \fBnmbd\fR(8),
+ \fBsmbclient\fR(1),
+ \fBnmblookup\fR(1),
+-\fBtestparm\fR(1),
+-\fBtestprns\fR(1)\&.
+\fBtestparm\fR(1)\&.
+ .SH "AUTHOR"
+ .PP
+ The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&.
+Index: samba/docs/manpages/smbd.8
+===================================================================
+--- samba.orig/docs/manpages/smbd.8
+++ samba/docs/manpages/smbd.8
+@@ -370,8 +370,7 @@
+ \fBnmbd\fR(8),
+ \fBsmb.conf\fR(5),
+ \fBsmbclient\fR(1),
+-\fBtestparm\fR(1),
+-\fBtestprns\fR(1), and the Internet RFC\'s
+\fBtestparm\fR(1), and the Internet RFC\'s
+ rfc1001\&.txt,
+ rfc1002\&.txt\&. In addition the CIFS (formerly SMB) specification is available as a link from the Web page
+ http://samba\&.org/cifs/\&.
+Index: samba/examples/tridge/smb.conf
+===================================================================
+--- samba.orig/examples/tridge/smb.conf
+++ samba/examples/tridge/smb.conf
+@@ -31,14 +31,6 @@
+    print ok = yes
+    print command = xmenu -heading "%s" OK&
+ 
+-[testprn]
+-   comment = Test printer
+-   path = /tmp
+-   user = susan
+-   print ok = yes
+-   print command = cp %s /tmp/smb.%U.prn
+-   lpq command = cat /tmp/xxyz
+-
+ [amd]
+    comment = amd area
+    path = /mount
+Index: samba/swat/lang/tr/help/welcome.html
+===================================================================
+--- samba.orig/swat/lang/tr/help/welcome.html
+++ samba/swat/lang/tr/help/welcome.html
+@@ -40,7 +40,6 @@
+    <ul>
+     <li><a href="/swat/help/smbstatus.1.html" target="docs">smbstatus</a> - Samba gözlemcisi
+     <li><a href="/swat/help/testparm.1.html" target="docs">testparm</a> - ayar dosyas?n? kontrol eder
+-    <li><a href="/swat/help/testprns.1.html" target="docs">testprns</a> - yaz?c? ayarlar?n? kontrol eder
+     <li><a href="/swat/help/nmblookup.1.html" target="docs">nmblookup</a> - NetBIOS isim sorgulama arac?
+    </ul>
+  <li><b>Kitaplar</b>
+@@ -66,4 +65,4 @@
+ 
+  E?er SWAT'?n bu sürümü ile ilgili konular? tart??mak istiyorsan?z, lütfen
+ <A HREF="http://lists.samba.org/">samba</A> eposta listesine üye olun.
+- 
+\ No newline at end of file
+
@@ -0,0 +1,31 @@
+Description: Do not build VFS examples
+Author: Christian Perrier <bubulle@debian.org>
+Forwarded: not-needed
+
+Index: samba/source3/Makefile.in
+===================================================================
+--- samba.orig/source3/Makefile.in
+++ samba/source3/Makefile.in
+@@ -1616,8 +1616,7 @@
+ 
+ 
+ everything:: all libtalloc libsmbclient libnetapi debug2html smbfilter talloctort replacetort smbconftort modules torture \
+-	$(EVERYTHING_PROGS) \
+-	vfs_examples
+	$(EVERYTHING_PROGS)
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .o .lo
+@@ -3552,12 +3551,3 @@
+ bin/ndrdump4: $(BINARY_PREREQS)
+ 	$(MAKE) -f Makefile-smbtorture4 bin/ndrdump4
+ 
+-.PHONY: vfs_examples
+-
+-vfs_examples:
+-	( \
+-	cd ../examples/VFS && \
+-	./configure && \
+-	make clean && \
+-	make \
+-	)
@@ -0,0 +1,65 @@
+Description: Prepare the sources to better respect FHS
+ This patch was historically very long but most parts have
+ been integrated upstream.
+ .
+ The last remaining bit is the location of "private files
+ We historically have them in /var/lib/samba while upstream
+ has them in /etc/samba
+ .
+ We need to provide a migraiton path and go back to the "normal"
+ file layout
+Author: Eloy A. Paris <peloy@debian.org>
+Bug-Debian: http://bugs.debian.org/49011
+Forwarded: not-needed
+
+
+Index: samba/source3/passdb/pdb_tdb.c
+===================================================================
+--- samba.orig/source3/passdb/pdb_tdb.c
+++ samba/source3/passdb/pdb_tdb.c
+@@ -1260,7 +1260,7 @@
+ 	/* save the path for later */
+ 
+ 	if (!location) {
+-		if (asprintf(&tdbfile, "%s/%s", lp_private_dir(),
+		if (asprintf(&tdbfile, "%s/%s", lp_statedir(),
+ 			     PASSDB_FILE_NAME) < 0) {
+ 			return NT_STATUS_NO_MEMORY;
+ 		}
+Index: samba/source3/passdb/secrets.c
+===================================================================
+--- samba.orig/source3/passdb/secrets.c
+++ samba/source3/passdb/secrets.c
+@@ -64,7 +64,7 @@
+ 		return True;
+ 
+ 	fname = talloc_asprintf(talloc_tos(), "%s/secrets.tdb",
+-				lp_private_dir());
+				lp_statedir());
+ 	if (fname == NULL) {
+ 		return false;
+ 	}
+Index: samba/docs/manpages/smb.conf.5
+===================================================================
+--- samba.orig/docs/manpages/smb.conf.5
+++ samba/docs/manpages/smb.conf.5
+@@ -7167,7 +7167,7 @@
+ .\}
+ tdbsam
+ \- The TDB based password storage backend\&. Takes a path to the TDB as an optional argument (defaults to passdb\&.tdb in the
+-\m[blue]\fBprivate dir\fR\m[]
+\m[blue]\fBstate directory\fR\m[]
+ directory\&.
+ .RE
+ .sp
+@@ -8038,9 +8038,7 @@
+ .PP
+ .RS 4
+ This parameters defines the directory smbd will use for storing such files as
+-smbpasswd
+-and
+-secrets\&.tdb\&.
+smbpasswd\&. secrets\&.tdb is stored in state directory on Debian systems\&.
+ .sp
+ Default:
+ \fI\fIprivate dir\fR\fR\fI = \fR\fI${prefix}/private\fR\fI \fR
@@ -0,0 +1,23 @@
+Description: Do not install the Using Samba book when installing SWAT
+ Using Samba is packaged in samba-doc, however upstream also
+ installs it in SWAT install dirs
+Author: Christian Perrier <bubulle@debian.org>
+Forwarded: not-needed
+
+Index: experimental/source3/script/installswat.sh
+===================================================================
+--- experimental.orig/source3/script/installswat.sh
+++ experimental/source3/script/installswat.sh
+@@ -198,7 +198,11 @@
+ 
+ # Install/ remove Using Samba book (but only if it is there)
+ 
+-if [ "x$BOOKDIR" != "x" -a -f $SRCDIR../docs/htmldocs/using_samba/toc.html ]; then
+# Under Debian we don't actually install the book. The book is part of
+# the samba-doc package, so we just provide a symlink that points to
+# where the book is actually installed. The symlink is created in
+# debian/rules.
+if /bin/false; then
+ 
+     # Create directories
+ 
@@ -0,0 +1,54 @@
+From 185cd4c79492a7de5988f9407d764cdb3a0e2e10 Mon Sep 17 00:00:00 2001
+From: Simo Sorce <idra@samba.org>
+Date: Wed, 11 May 2011 17:50:07 -0400
+Subject: [PATCH] libutil: use AI_ADDRCONFIG only when AI_NUMERIC is not defined
+
+This flag prevents startup w/o ip addresses assigned to any interface.
+If AI_NUMERIC is passed it should be safe to avoid it.
+
+Signed-off-by: Andreas Schneider <asn@samba.org>
+---
+ lib/util/util_net.c |   16 +++++++++++-----
+ 1 files changed, 11 insertions(+), 5 deletions(-)
+
+Index: samba/lib/util/util_net.c
+===================================================================
+--- samba.orig/lib/util/util_net.c
+++ samba/lib/util/util_net.c
+@@ -64,10 +64,9 @@
+ 			ppres);
+ 
+ 	if (ret) {
+-		DEBUG(3,("interpret_string_addr_internal: getaddrinfo failed "
+-			"for name %s [%s]\n",
+-			str,
+-			gai_strerror(ret) ));
+		DEBUG(3, ("interpret_string_addr_internal: "
+			  "getaddrinfo failed for name %s (flags %d) [%s]\n",
+			  str, flags, gai_strerror(ret)));
+ 		return false;
+ 	}
+ 	return true;
+@@ -88,6 +87,7 @@
+ #if defined(HAVE_IPV6)
+ 	char addr[INET6_ADDRSTRLEN];
+ 	unsigned int scope_id = 0;
+	int int_flags;
+ 
+ 	if (strchr_m(str, ':')) {
+ 		char *p = strchr_m(str, '%');
+@@ -108,7 +108,13 @@
+ 
+ 	zero_sockaddr(pss);
+ 
+-	if (!interpret_string_addr_internal(&res, str, flags|AI_ADDRCONFIG)) {
+	if (flags & AI_NUMERICHOST) {
+		int_flags = flags;
+	} else {
+		int_flags = flags|AI_ADDRCONFIG;
+	}
+
+	if (!interpret_string_addr_internal(&res, str, int_flags)) {
+ 		return false;
+ 	}
+ 	if (!res) {
@@ -0,0 +1,21 @@
+Description: only export public symbols
+ Force usage of the symbols list when linking shared libraries. Otherwise,
+ private symbols get exported in libsmbclient and libwbclient.
+Forwarded: no
+Author: Ivo De Decker <ivo.dedecker@ugent.be>
+Last-Update: 2012-06-27
+
+--- samba-3.6.6.orig/source3/Makefile.in
+++ samba-3.6.6/source3/Makefile.in
+@@ -28,8 +28,9 @@ SHLD=@SHLD@
+ LIB_PATH_VAR=@LIB_PATH_VAR@
+ 
+ ## Dynamic shared libraries build settings
+-DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's:\.@SHLIBEXT@[\.0-9]*$$:.@SYMSEXT@:'`
+-DSO_EXPORTS=@DSO_EXPORTS@
+# force using syms file
+DSO_EXPORTS=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's:\.@SHLIBEXT@[\.0-9]*$$:.@SYMSEXT@:'`
+#DSO_EXPORTS=@DSO_EXPORTS@
+ SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@
+ 
+ # The MODULE_EXPORTS variable contains the platform-specific linker flags
@@ -0,0 +1,17 @@
+Description: Fix examples directory location  in pam_smbpass README
+Author: Christian Perrier <bubulle@debian.org>
+Forwarded: not-needed
+
+Index: experimental/source3/pam_smbpass/README
+===================================================================
+--- experimental.orig/source3/pam_smbpass/README
+++ experimental/source3/pam_smbpass/README
+@@ -37,7 +37,7 @@
+ 	smbconf=<file>	-	specify an alternate path to the smb.conf
+ 				file.
+ 
+-See the samples/ directory for example PAM configurations using this
+See the examples/ directory for example PAM configurations using this
+ module.
+ 
+ Thanks go to the following people:
@@ -0,0 +1,18 @@
+Description: Use the pager alternative as pager is PAGER is undefined
+Author: Steve Langasek <vorlon@debian.org>
+Bug-Debian: http://bugs.debian.org/135603
+Forwarded: not-needed
+
+Index: experimental/source3/include/local.h
+===================================================================
+--- experimental.orig/source3/include/local.h
+++ experimental/source3/include/local.h
+@@ -127,7 +127,7 @@
+ /* the default pager to use for the client "more" command. Users can
+    override this with the PAGER environment variable */
+ #ifndef PAGER
+-#define PAGER "more"
+#define PAGER "/usr/bin/pager"
+ #endif
+ 
+ /* the size of the uid cache used to reduce valid user checks */
@@ -0,0 +1,19 @@
+Description: Avoid using bashism in smbtar
+Author: Jelmer Vernooij <jelmer@samba.org>
+Bug-Debian: http://bugs.debian.org/486056
+Forwarded: yes
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=8924
+
+Index: experimental/source3/script/smbtar
+===================================================================
+--- experimental.orig/source3/script/smbtar
+++ experimental/source3/script/smbtar
+@@ -151,7 +151,7 @@
+ if [ -z "$verbose" ]; then
+       echo "server    is $server"
+ #     echo "share     is $service"
+-      echo "share     is $service\\$cdcmd"
+      printf "share     is %s\\%s\n" "$service" "$cdcmd"
+       echo "tar args  is $tarargs"
+ #     echo "password  is $password"  # passwords should never be sent to screen
+       echo "tape      is $tapefile"
@@ -0,0 +1,94 @@
+Description: Provide a manpage for smbtorture
+Author: Christian Perrier <bubulle@debian.org>
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=8930
+Forwarded: yes
+Bug-Debian: http://bugs.debian.org/528735
+
+Index: samba/docs/manpages/smbtorture.1
+===================================================================
+--- /dev/null
+++ samba/docs/manpages/smbtorture.1
+@@ -0,0 +1,83 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.9.
+.TH smbtorture "1" "May 2012" "samba test suite" "User Commands"
+.SH NAME
+smbtorture \- samba test suite.
+.SH SYNOPSIS
+.B smbtorture
+\fI//server/share <options> TEST1 TEST2 \fR...
+.SH DESCRIPTION
+smbtorture is the original samba3 test suite. It is nowadays recommended to use samba4 torture.
+.HP
+\fB\-d\fR debuglevel
+.HP
+\fB\-U\fR user%pass
+.TP
+\fB\-k\fR
+use kerberos
+.HP
+\fB\-N\fR numprocs
+.HP
+\fB\-n\fR my_netbios_name
+.HP
+\fB\-W\fR workgroup
+.HP
+\fB\-o\fR num_operations
+.HP
+\fB\-O\fR socket_options
+.HP
+\fB\-m\fR maximum protocol
+.HP
+\fB\-L\fR use oplocks
+.TP
+\fB\-c\fR CLIENT.TXT
+specify client load file for NBENCH
+.HP
+\fB\-A\fR showall
+.HP
+\fB\-p\fR port
+.HP
+\fB\-s\fR seed
+.TP
+\fB\-b\fR unclist_filename
+specify multiple shares for multiple connections
+.PP
+tests are: FDPASS LOCK1 LOCK2 LOCK3 LOCK4 LOCK5 LOCK6 LOCK7 LOCK8 LOCK9 UNLINK BROWSE ATTR TRANS2 MAXFID TORTURE RANDOMIPC NEGNOWAIT NBENCH NBENCH2 OPLOCK1 OPLOCK2 OPLOCK3 OPLOCK4 DIR DIR1 DIR\-CREATETIME DENY1 DENY2 TCON TCONDEV RW1 RW2 RW3 RW\-SIGNING OPEN POSIX POSIX\-APPEND ASYNC\-ECHO UID\-REGRESSION\-TEST SHORTNAME\-TEST ADDRCHANGE OPENATTR XCOPY RENAME DELETE DELETE\-LN PROPERTIES MANGLE MANGLE1 W2K TRANS2SCAN NTTRANSSCAN UTABLE CASETABLE ERRMAPEXTRACT PIPE_NUMBER TCON2 IOCTL CHKPATH FDSESS EATEST SESSSETUP_BENCH CHAIN1 CHAIN2 WINDOWS\-WRITE CLI_ECHO GETADDRINFO TLDAP STREAMERROR NOTIFY\-BENCH BAD\-NBT\-SESSION SMB\-ANY\-CONNECT LOCAL\-SUBSTITUTE LOCAL\-GENCACHE LOCAL\-TALLOC\-DICT LOCAL\-BASE64 LOCAL\-RBTREE LOCAL\-MEMCACHE LOCAL\-STREAM\-NAME LOCAL\-WBCLIENT LOCAL\-string_to_sid LOCAL\-binary_to_sid LOCAL\-DBTRANS LOCAL\-TEVENT\-SELECT
+default test is ALL
+.PP
+Usage: smbtorture //server/share <options> TEST1 TEST2 ...
+.HP
+\fB\-d\fR debuglevel
+.HP
+\fB\-U\fR user%pass
+.TP
+\fB\-k\fR
+use kerberos
+.HP
+\fB\-N\fR numprocs
+.HP
+\fB\-n\fR my_netbios_name
+.HP
+\fB\-W\fR workgroup
+.HP
+\fB\-o\fR num_operations
+.HP
+\fB\-O\fR socket_options
+.HP
+\fB\-m\fR maximum protocol
+.HP
+\fB\-L\fR use oplocks
+.TP
+\fB\-c\fR CLIENT.TXT
+specify client load file for NBENCH
+.HP
+\fB\-A\fR showall
+.HP
+\fB\-p\fR port
+.HP
+\fB\-s\fR seed
+.TP
+\fB\-b\fR unclist_filename
+specify multiple shares for multiple connections
+.PP
+tests are: FDPASS LOCK1 LOCK2 LOCK3 LOCK4 LOCK5 LOCK6 LOCK7 LOCK8 LOCK9 UNLINK BROWSE ATTR TRANS2 MAXFID TORTURE RANDOMIPC NEGNOWAIT NBENCH NBENCH2 OPLOCK1 OPLOCK2 OPLOCK3 OPLOCK4 DIR DIR1 DIR\-CREATETIME DENY1 DENY2 TCON TCONDEV RW1 RW2 RW3 RW\-SIGNING OPEN POSIX POSIX\-APPEND ASYNC\-ECHO UID\-REGRESSION\-TEST SHORTNAME\-TEST ADDRCHANGE OPENATTR XCOPY RENAME DELETE DELETE\-LN PROPERTIES MANGLE MANGLE1 W2K TRANS2SCAN NTTRANSSCAN UTABLE CASETABLE ERRMAPEXTRACT PIPE_NUMBER TCON2 IOCTL CHKPATH FDSESS EATEST SESSSETUP_BENCH CHAIN1 CHAIN2 WINDOWS\-WRITE CLI_ECHO GETADDRINFO TLDAP STREAMERROR NOTIFY\-BENCH BAD\-NBT\-SESSION SMB\-ANY\-CONNECT LOCAL\-SUBSTITUTE LOCAL\-GENCACHE LOCAL\-TALLOC\-DICT LOCAL\-BASE64 LOCAL\-RBTREE LOCAL\-MEMCACHE LOCAL\-STREAM\-NAME LOCAL\-WBCLIENT LOCAL\-string_to_sid LOCAL\-binary_to_sid LOCAL\-DBTRANS LOCAL\-TEVENT\-SELECT
+default test is ALL
@@ -0,0 +1,24 @@
+Description: Fix missing symbols
+ Fix missing symbols in libsmbclient (and libnss_wins), and add
+ -Wl,-z,defs to the libsmbclient link options to prevent future
+ instances of undefined symbols.
+ .
+ This should be forwarded upstream once there's a configure test
+ for it.
+Author: Steve Langasek <vorlon@debian.org>
+Bug-Debian: http://bugs.debian.org/281181
+Forwarded: no
+
+Index: experimental/source3/Makefile.in
+===================================================================
+--- experimental.orig/source3/Makefile.in
+++ experimental/source3/Makefile.in
+@@ -2281,7 +2281,7 @@
+ 
+ $(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_THREAD_OBJ) $(LIBSMBCLIENT_SYMS) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+ 	@echo Linking shared library $@
+-	@$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_THREAD_OBJ) \
+	@$(SHLD_DSO) -Wl,-z,defs $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_THREAD_OBJ) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(LIBS) \
+ 		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(ZLIB_LIBS) $(PTHREAD_LDFLAGS) \
+ 		@SONAMEFLAG@`basename $@`
@@ -0,0 +1,38 @@
+Description: Enable net usershares by default at build time
+ Enable net usershares by default at build time, with a limit of
+ 100, and update the corresponding documentation.
+Author: Mathias Gug <mathiaz@ubuntu.com>,
+Author: Steve Langasek <vorlon@debian.org>
+Bug-Debian: http://bugs.debian.org/443230
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/samba/+bug/128548
+Forwarded: not-needed
+
+Index: experimental/docs/manpages/net.8
+===================================================================
+--- experimental.orig/docs/manpages/net.8
+++ experimental/docs/manpages/net.8
+@@ -800,9 +800,9 @@
+ .RE
+ .SS "USERSHARE"
+ .PP
+-Starting with version 3\&.0\&.23, a Samba server now supports the ability for non\-root users to add user defined shares to be exported using the "net usershare" commands\&.
+Starting with version 3\&.0\&.23, a Samba server now supports the ability for non\-root users to add user-defined shares to be exported using the "net usershare" commands\&.
+ .PP
+-To set this up, first set up your smb\&.conf by adding to the [global] section: usershare path = /usr/local/samba/lib/usershares Next create the directory /usr/local/samba/lib/usershares, change the owner to root and set the group owner to the UNIX group who should have the ability to create usershares, for example a group called "serverops"\&. Set the permissions on /usr/local/samba/lib/usershares to 01770\&. (Owner and group all access, no access for others, plus the sticky bit, which means that a file in that directory can be renamed or deleted only by the owner of the file)\&. Finally, tell smbd how many usershares you will allow by adding to the [global] section of smb\&.conf a line such as : usershare max shares = 100\&. To allow 100 usershare definitions\&. Now, members of the UNIX group "serverops" can create user defined shares on demand using the commands below\&.
+Members of the UNIX group "sambashare" can create user-defined shares on demand using the commands below\&.
+ .PP
+ The usershare commands are:
+ .RS 4
+Index: experimental/source3/param/loadparm.c
+===================================================================
+--- experimental.orig/source3/param/loadparm.c
+++ experimental/source3/param/loadparm.c
+@@ -5461,7 +5461,7 @@
+ 	string_set(&Globals.szUsersharePath, s);
+ 	SAFE_FREE(s);
+ 	string_set(&Globals.szUsershareTemplateShare, "");
+-	Globals.iUsershareMaxShares = 0;
+	Globals.iUsershareMaxShares = 100;
+ 	/* By default disallow sharing of directories not owned by the sharer. */
+ 	Globals.bUsershareOwnerOnly = True;
+ 	/* By default disallow guest access to usershares. */
@@ -3,12 +3,30 @@ SRC_URI += "file://config-lfs.patch \
            "

 EXTRA_OECONF += "\
+        --enable-nss-wrapper \
        --without-ads \
-        --without-winbind \
+        --with-winbind \
        --without-ldap \
        --without-krb5"

-PACKAGES =+ "libnetapi libtdb libsmbsharemodes libsmbclient libsmbclient-dev cifs cifs-doc swat"
+PACKAGES =+ "winbind winbind-dbg libnetapi libtdb libsmbsharemodes libsmbclient libsmbclient-dev cifs cifs-doc swat"
+
+FILES_winbind-dbg = "${libdir}/idmap/.debug/*.so \
+                     ${libdir}/security/.debug/pam_winbind.so \
+"
+
+FILES_${PN} += "${libdir}/vfs/*.so \
+                ${libdir}/charset/*.so \
+                ${libdir}/*.dat \
+                ${libdir}/auth/*.so \
+                ${libdir}/security/pam_smbpass.so \
+"
+
+FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so \
+                    ${libdir}/charset/.debug/*.so \
+                    ${libdir}/auth/.debug/*.so \
+                    ${libdir}/security/.debug/pam_smbpass.so \
+"

 FILES_libnetapi = "${libdir}/libnetapi.so.*"
 FILES_libsmbsharemodes = "${libdir}/libsmbsharemodes.so.*"
@@ -17,4 +35,17 @@ FILES_cifs = "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs"
 FILES_cifs-doc = "${mandir}/man8/mount.cifs.8 ${mandir}/man8/umount.cifs.8"
 FILES_libsmbclient = "${libdir}/libsmbclient.so.*"
 FILES_libsmbclient-dev = "${libdir}/libsmbclient.so ${includedir}"
+FILES_winbind = "${sysconfdir}/init.d/winbind \
+                 ${libdir}/libnss_*${SOLIBS} \
+                 ${sbindir}/winbindd \
+                 ${bindir}/wbinfo \
+                 ${bindir}/ntlm_auth \
+                 ${libdir}/idmap/*.so \
+                 ${libdir}/nss_info \
+                 ${libdir}/pdb \
+                 ${libdir}/gpext \
+                 ${libdir}/perfcount \
+                 ${libdir}/security/pam_winbind.so \
+"
+
 FILES_swat       = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
@@ -5,7 +5,8 @@ DEPENDS = "readline virtual/libiconv talloc"
 SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
           file://volatiles.03_samba \
           file://smb.conf \
-           file://init \
+           file://init.samba \
+           file://init.winbind \
           file://tdb.pc \
           "

@@ -13,11 +14,6 @@ S = "${WORKDIR}/samba-${PV}/source"

 inherit autotools update-rc.d

-FILES_${PN}     += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat \
-                    ${libdir}/auth/*.so ${libdir}/security/*.so"
-FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so ${libdir}/charset/.debug/*.so \
-                    ${libdir}/auth/.debug/*.so ${libdir}/security/.debug/*.so"
-
 SAMBAMMAP = "no"
 SAMBAMMAP_libc-glibc = "yes"

@@ -41,7 +37,9 @@ EXTRA_OECONF='--disable-cups \
              samba_cv_struct_timespec=yes \
              libreplace_cv_HAVE_MMAP=${SAMBAMMAP}'

-INITSCRIPT_NAME = "samba"
+INITSCRIPT_PACKAGES = "samba winbind"
+INITSCRIPT_NAME_samba = "samba"
+INITSCRIPT_NAME_winbind = "winbind"
 # No dependencies, goes in at level 20 (NOTE: take care with the
 # level, later levels put the shutdown later too - see the links
 # in rc6.d, the shutdown must precede network shutdown).
@@ -79,10 +77,27 @@ do_install_append() {
 		ln -sf ${bindir}/smbmount ${D}${base_sbindir}/mount.smbfs
 	fi
 	
-	install -D -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/samba
+        install -D -m 755 ${WORKDIR}/init.samba ${D}${sysconfdir}/init.d/samba
+        install -D -m 755 ${WORKDIR}/init.winbind ${D}${sysconfdir}/init.d/winbind
 	install -D -m 644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf
 	install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/volatiles.03_samba
 	install -d ${D}/var/log/samba
 	install -d ${D}/var/spool/samba
+
+        # Install other stuff not installed by "make install"
+        install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_winbind.so ${D}${libdir}/libnss_winbind.so.2
+        install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_wins.so ${D}${libdir}/libnss_wins.so.2
+
 }

+
+
+pkg_postinst_winbind () {
+    # add wins to the list of resolvers
+    ns=$D${sysconfdir}/nsswitch.conf
+    if ! grep "hosts:.*wins" $ns > /dev/null; then
+	hosts="`grep '^hosts:' $ns`"
+	hosts=`echo "$hosts" | sed 's/\[/\\\\[/g; s/\]/\\\\]/g'`
+	sed -i "s/$hosts/$hosts wins/" "$ns"
+    fi
+}
@@ -0,0 +1,38 @@
+#! /bin/sh 
+
+### BEGIN INIT INFO
+# Provides:          winbind
+# Required-Start:    $network $remote_fs $syslog
+# Required-Stop:     $network $remote_fs $syslog
+# Should-Start:      samba
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: start Winbind daemon
+### END INIT INFO
+
+winbind=/usr/sbin/winbindd
+test -x "$winbind" || exit 0
+
+case "$1" in
+  start)
+    echo -n "Starting Winbind... "
+    start-stop-daemon --start --quiet --exec $winbind
+    echo "done"
+    ;;
+  stop)
+    echo -n "Stopping Winbind... "
+    start-stop-daemon --stop --quiet --pidfile /var/run/winbind.pid
+    echo "done"
+    ;;
+  reload|force-reload)
+    start-stop-daemon --stop --quiet --signal 1 --exec $winbind
+    ;;
+  restart)
+    $0 stop && sleep 2 && $0 start
+    ;;
+  *)
+    echo "Usage: /etc/init.d/winbind {start|stop|reload|restart|force-reload}"
+    exit 1
+esac
+
+exit 0
@@ -1,37 +0,0 @@
-require samba.inc
-require samba-basic.inc
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-PR = "r1"
-
-SRC_URI += "file://config-h.patch \
-            file://tdbheaderfix.patch;patchdir=.."
-
-SRC_URI[md5sum] = "bf6c09ea497a166df8bd672db1d8da8f"
-SRC_URI[sha256sum] = "466410868375d19a286ac3fc5d9f3c267ce359189f8e0d76e72ec10bd54247da"
-
-S = "${WORKDIR}/samba-${PV}/source3"
-
-EXTRA_OECONF += "\
-	ac_cv_path_PYTHON=/not/exist \
-	ac_cv_path_PYTHON_CONFIG=/not/exist \
-	SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
-	samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \
-	linux_getgrouplist_ok=no \
-	samba_cv_HAVE_BROKEN_GETGROUPS=no \
-	samba_cv_HAVE_FTRUNCATE_EXTEND=yes \
-	samba_cv_have_setresuid=yes \
-	samba_cv_have_setresgid=yes \
-	samba_cv_HAVE_WRFILE_KEYTAB=yes \
-	samba_cv_linux_getgrouplist_ok=yes \
-	"
-
-do_configure() {
-	oe_runconf
-}
-
-do_compile () {
-	base_do_compile
-}
-
@@ -0,0 +1,56 @@
+require samba.inc
+require samba-basic.inc
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+SRC_URI += "\
+    file://config-h.patch \
+    file://documentation.patch;patchdir=.. \
+    file://documentation2.patch;patchdir=.. \
+    file://fhs-filespaths.patch;patchdir=.. \
+    file://installswat.sh.patch;patchdir=.. \
+    file://pam-examples.patch;patchdir=.. \
+    file://smbclient-pager.patch;patchdir=.. \
+    file://undefined-symbols.patch;patchdir=.. \
+    file://usershare.patch;patchdir=.. \
+    file://smbtar-bashism.patch;patchdir=.. \
+    file://dont-build-VFS-examples.patch;patchdir=.. \
+    file://bug_221618_precise-64bit-prototype.patch;patchdir=.. \
+    file://bug_598313_upstream_7499-nss_wins-dont-clobber-daemons-logs.patch;patchdir=.. \
+    file://bug_387266_upstream_4104_mention-kerberos-in-smbspool-manpage.patch;patchdir=.. \
+    file://bug_604768_upstream_7826_drop-using-samba-link.patch;patchdir=.. \
+    file://bug_604768_upstream_7826_fix-WHATSNEW-link.patch;patchdir=.. \
+    file://waf-as-source.patch;patchdir=.. \
+    file://smbtorture-manpage.patch;patchdir=.. \
+    file://libutil_drop_AI_ADDRCONFIG.patch;patchdir=.. \
+    file://shadow_copy2_backport.patch;patchdir=.. \
+    file://only_export_public_symbols.patch;patchdir=.. \
+    file://configure-disable-getaddrinfo-cross.patch;patchdir=.. \
+    file://configure-disable-core_pattern-cross-check.patch;patchdir=.. \
+"
+SRC_URI[md5sum] = "fbb245863eeef2fffe172df779a217be"
+SRC_URI[sha256sum] = "4f5a171a8d902c6b4f822ed875c51eb8339196d9ccf0ecd7f6521c966b3514de"
+
+S = "${WORKDIR}/samba-${PV}/source3"
+
+EXTRA_OECONF += "\
+	ac_cv_path_PYTHON=/not/exist \
+	ac_cv_path_PYTHON_CONFIG=/not/exist \
+	SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
+	samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \
+	linux_getgrouplist_ok=no \
+	samba_cv_HAVE_BROKEN_GETGROUPS=no \
+	samba_cv_HAVE_FTRUNCATE_EXTEND=yes \
+	samba_cv_have_setresuid=yes \
+	samba_cv_have_setresgid=yes \
+	samba_cv_HAVE_WRFILE_KEYTAB=yes \
+	samba_cv_linux_getgrouplist_ok=yes \
+	"
+
+do_configure() {
+	oe_runconf
+}
+
+do_compile () {
+	base_do_compile
+}