Update net/samba3 to the 3.0.30. Problems, addressed in this version:

  o Problems following domain trusts on a Samba DC.
  o SMB Signing errors.
  o Interoperability issues with Windows 2008 domains.

Approved by:	shaun (mentor, implicit)

5 files changed, 198 insertions, 672 deletions

diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 4c3dfe8ad1cf..990880d0d8f6 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=		samba
-PORTVERSION?=		3.0.28a
-PORTREVISION=	2
+PORTVERSION?=		3.0.30
+PORTREVISION=		0
 PORTEPOCH?=		1
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
@@ -66,6 +66,7 @@ OPTIONS=	LDAP		"With LDAP support" on \
 		CUPS		"With CUPS printing support" on \
 		WINBIND		"With WinBIND support" on \
 		ACL_SUPPORT	"With ACL support" off \
+		AIO_SUPPORT	"With Asyncronous IO support" off \
 		FAM_SUPPORT	"With File Alteration Monitor" off \
 		SYSLOG		"With Syslog support" off \
 		QUOTAS		"With Disk quota support" off \
@@ -73,9 +74,10 @@ OPTIONS=	LDAP		"With LDAP support" on \
 		MSDFS		"With MSDFS support" on \
 		PAM_SMBPASS	"With PAM authentication vs passdb backends" off \
 		CLUSTER		"With experimental cluster support" off \
-		DNSUPDATE	"With dynamic DNS update" off \
+		DNSUPDATE	"With dynamic DNS update(require ADS)" off \
 		EXP_MODULES	"With experimental modules" off \
 		POPT		"With system-wide POPT library" on \
+		PCH		"With precompiled headers optimization" on \
 		MAX_DEBUG	"With maximum debugging" off \
 		SMBTORTURE	"With smbtorture" off
 .endif
@@ -191,14 +193,6 @@ WANT_EXP_MODULES+=	vfs_catia vfs_cacheprime vfs_commit
 .	endif
 .endif
 
-.if defined(WITH_FAM_SUPPORT)
-USE_FAM=		yes
-CONFIGURE_ARGS+=	--enable-fam
-WANT_EXP_MODULES+=	vfs_notify_fam
-.else
-CONFIGURE_ARGS+=	--disable-fam
-.endif
-
 .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES)
 USE_EXP_MODULES!=	${ECHO_CMD} ${WANT_EXP_MODULES} | ${SED} -E 's/ +/,/g'
 CONFIGURE_ARGS+=	--with-shared-modules="${USE_EXP_MODULES}"
@@ -212,15 +206,32 @@ CONFIGURE_ARGS+=	--without-pam_smbpass
 PLIST_SUB+=		SMBPASS="@comment "
 .endif
 
+.if defined(WITH_FAM_SUPPORT)
+USE_FAM=		yes
+CONFIGURE_ARGS+=	--enable-fam
+WANT_EXP_MODULES+=	vfs_notify_fam
+.else
+CONFIGURE_ARGS+=	--disable-fam
+.endif
+
 .if defined(WITH_ACL_SUPPORT)
 .if ${OSVERSION} < 500018
-BROKEN=			ACL support requires FreeBSD 5.x at least after 20010326. Disable ACL support
+IGNORE=			ACL support requires 5.1-RELEASE or later. Disable ACL support
 .endif
 CONFIGURE_ARGS+=	--with-acl-support
 .else
 CONFIGURE_ARGS+=	--without-acl-support
 .endif
 
+.if defined(WITH_AIO_SUPPORT)
+.if ${OSVERSION} < 700055
+IGNORE=			AIO support requires 7.0-RELEASE or later. Disable AIO support
+.endif
+CONFIGURE_ARGS+=	--with-aio-support
+.else
+CONFIGURE_ARGS+=	--without-aio-support
+.endif
+
 .if defined(WITH_SMBSH)
 IGNORE=			broken IPC and code. Disable SMBSH support
 CONFIGURE_ARGS+=	--with-smbwrapper
@@ -246,13 +257,6 @@ CONFIGURE_ARGS+=	--with-dnsupdate
 CONFIGURE_ARGS+=	--without-dnsupdate
 .endif
 
-.if defined(WITH_AIO_SUPPORT)
-IGNORE=			broken kernel API until now (7-CURRENT). Disable AIO support
-CONFIGURE_ARGS+=	--with-aio-support
-.else
-CONFIGURE_ARGS+=	--without-aio-support
-.endif
-
 .if !defined(WITHOUT_POPT)
 LIB_DEPENDS+=		popt.0:${PORTSDIR}/devel/popt
 CONFIGURE_ARGS+=	--without-included-popt
@@ -358,6 +362,9 @@ MAN8+=		vfs_catia.8
 MAN8+=		vfs_commit.8
 .endif
 
+# Off by now
+PLIST_SUB+=	SAMBA_BOOK="@comment "
+
 PLIST_SUB+=	SAMBA_LOGDIR="${SAMBA_LOGDIR}" \
 		SAMBA_LOCKDIR="${SAMBA_LOCKDIR}" \
 		SAMBA_CONFDIR="${SAMBA_CONFDIR}" \
@@ -404,7 +411,7 @@ post-patch:
 	@${FIND} ${WRKDIR}/${DISTNAME} -type f | ${XARGS} ${CHMOD} u+w,a+r
 
 # This would speedup compilation for gcc 3.4(available in FreeBSD 5.2) and higher
-.if ${OSVERSION} >= 502126
+.if !defined(WITHOUT_PCH) && ${OSVERSION} >= 502126
 pre-build:
 	cd ${WRKSRC} && ${MAKE} pch
 .endif
diff --git a/net/samba3/distinfo b/net/samba3/distinfo
index 21c4e5b9bf09..89a9b78d1610 100644
--- a/net/samba3/distinfo
+++ b/net/samba3/distinfo
@@ -1,3 +1,3 @@
-MD5 (samba-3.0.28a.tar.gz) = 59754cb0c19da6e65c42d0a163c5885a
-SHA256 (samba-3.0.28a.tar.gz) = 9dc9ecb26017b1831cb1e0b212e1eb8c0b6176df6513fc737b585f453181d9de
-SIZE (samba-3.0.28a.tar.gz) = 18172643
+MD5 (samba-3.0.30.tar.gz) = d647ec1f34414fa8691f74536dcccfb5
+SHA256 (samba-3.0.30.tar.gz) = a1789d3b896aab25a20c437f028bb56bc4de8655da8e6f5e7a743922c828fa53
+SIZE (samba-3.0.30.tar.gz) = 20510081
diff --git a/net/samba3/files/patch-CVE-2008-1105 b/net/samba3/files/patch-CVE-2008-1105
deleted file mode 100644
index 74f4a6b2e684..000000000000
--- a/net/samba3/files/patch-CVE-2008-1105
+++ /dev/null
@@ -1,187 +0,0 @@
-commit 7e191387d64de2c965fc2c999bc7d1ccf4aae010
-Author: Gerald W. Carter <jerry@samba.org>
-Date:   Wed May 28 07:30:19 2008 -0500
-
-    Security: Patche for CVE-2008-1105.
-    
-        -- Summary --
-        Specifically crafted SMB responses can result
-        in a heap overflow in the Samba client code.
-        Because the server process, smbd, can itself
-        act as a client during operations such as
-        printer notification and domain authentication,
-        this issue affects both Samba client and server
-        installations.
-    
-    Ensure that we specify the buffer size used to store incoming SMB
-    packets.  This bug was originally introduced in Samba 2.2.4.  Patch from
-    Jeremy Allison.
-
-diff --git client/client.c client/client.c
-index 3f96f63..e87623a 100644
---- client/client.c
-+++ client/client.c
-@@ -3626,7 +3626,7 @@ static void readline_callback(void)
- 	   session keepalives and then drop them here.
- 	*/
- 	if (FD_ISSET(cli->fd,&fds)) {
--		if (!receive_smb(cli->fd,cli->inbuf,0)) {
-+		if (!receive_smb(cli->fd,cli->inbuf,cli->bufsize,0)) {
- 			DEBUG(0, ("Read from server failed, maybe it closed the "
- 				"connection\n"));
- 			return;
-diff --git client/smbctool.c client/smbctool.c
-index 2063418..a18505b 100644
---- client/smbctool.c
-+++ client/smbctool.c
-@@ -3304,7 +3304,7 @@ static void readline_callback(void)
- 	   session keepalives and then drop them here.
- 	*/
- 	if (FD_ISSET(cli->fd,&fds)) {
--		receive_smb(cli->fd,cli->inbuf,0);
-+		receive_smb(cli->fd,cli->inbuf,cli->bufsize,0);
- 		goto again;
- 	}
- 	  
-diff --git lib/util_sock.c lib/util_sock.c
-index 94c5e82..4715ca7 100644
---- lib/util_sock.c
-+++ lib/util_sock.c
-@@ -654,14 +654,13 @@ ssize_t read_smb_length(int fd, char *inbuf, unsigned int timeout)
- }
- 
- /****************************************************************************
-- Read an smb from a fd. Note that the buffer *MUST* be of size
-- BUFFER_SIZE+SAFETY_MARGIN.
-+ Read an smb from a fd. 
-  The timeout is in milliseconds. 
-  This function will return on receipt of a session keepalive packet.
-  Doesn't check the MAC on signed packets.
- ****************************************************************************/
- 
--BOOL receive_smb_raw(int fd, char *buffer, unsigned int timeout)
-+BOOL receive_smb_raw(int fd, char *buffer, size_t buflen, unsigned int timeout)
- {
- 	ssize_t len,ret;
- 
-@@ -682,25 +681,18 @@ BOOL receive_smb_raw(int fd, char *buffer, unsigned int timeout)
- 		return False;
- 	}
- 
--	/*
--	 * A WRITEX with CAP_LARGE_WRITEX can be 64k worth of data plus 65 bytes
--	 * of header. Don't print the error if this fits.... JRA.
--	 */
--
--	if (len > (BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE)) {
-+	if (len > buflen) {
- 		DEBUG(0,("Invalid packet length! (%lu bytes).\n",(unsigned long)len));
--		if (len > BUFFER_SIZE + (SAFETY_MARGIN/2)) {
- 
--			/*
--			 * Correct fix. smb_read_error may have already been
--			 * set. Only set it here if not already set. Global
--			 * variables still suck :-). JRA.
--			 */
-+		/*
-+		 * smb_read_error may have already been
-+		 * set. Only set it here if not already set. Global
-+		 * variables still suck :-). JRA.
-+		 */
- 
--			if (smb_read_error == 0)
--				smb_read_error = READ_ERROR;
--			return False;
--		}
-+		if (smb_read_error == 0)
-+			smb_read_error = READ_ERROR;
-+		return False;
- 	}
- 
- 	if(len > 0) {
-@@ -730,9 +722,9 @@ BOOL receive_smb_raw(int fd, char *buffer, unsigned int timeout)
-  Checks the MAC on signed packets.
- ****************************************************************************/
- 
--BOOL receive_smb(int fd, char *buffer, unsigned int timeout)
-+BOOL receive_smb(int fd, char *buffer, size_t buflen, unsigned int timeout)
- {
--	if (!receive_smb_raw(fd, buffer, timeout)) {
-+	if (!receive_smb_raw(fd, buffer, buflen, timeout)) {
- 		return False;
- 	}
- 
-diff --git libsmb/clientgen.c libsmb/clientgen.c
-index c6cef08..7d7ab9e 100644
---- libsmb/clientgen.c
-+++ libsmb/clientgen.c
-@@ -44,8 +44,7 @@ int cli_set_port(struct cli_state *cli, int port)
- }
- 
- /****************************************************************************
-- Read an smb from a fd ignoring all keepalive packets. Note that the buffer 
-- *MUST* be of size BUFFER_SIZE+SAFETY_MARGIN.
-+ Read an smb from a fd ignoring all keepalive packets.
-  The timeout is in milliseconds
- 
-  This is exactly the same as receive_smb except that it never returns
-@@ -54,12 +53,12 @@ int cli_set_port(struct cli_state *cli, int port)
-  should never go into a blocking read.
- ****************************************************************************/
- 
--static BOOL client_receive_smb(int fd,char *buffer, unsigned int timeout)
-+static BOOL client_receive_smb(int fd,char *buffer, size_t bufsize, unsigned int timeout)
- {
- 	BOOL ret;
- 
- 	for(;;) {
--		ret = receive_smb_raw(fd, buffer, timeout);
-+		ret = receive_smb_raw(fd, buffer, bufsize, timeout);
- 
- 		if (!ret) {
- 			DEBUG(10,("client_receive_smb failed\n"));
-@@ -88,7 +87,7 @@ BOOL cli_receive_smb(struct cli_state *cli)
- 		return False; 
- 
-  again:
--	ret = client_receive_smb(cli->fd,cli->inbuf,cli->timeout);
-+	ret = client_receive_smb(cli->fd,cli->inbuf, cli->bufsize, cli->timeout);
- 	
- 	if (ret) {
- 		/* it might be an oplock break request */
-diff --git smbd/process.c smbd/process.c
-index 8dec719..3d31c29 100644
---- smbd/process.c
-+++ smbd/process.c
-@@ -521,7 +521,8 @@ static BOOL receive_message_or_smb(char *buffer, int buffer_len, int timeout)
- 		goto again;
- 	}
- 
--	return receive_smb(smbd_server_fd(), buffer, 0);
-+	return receive_smb(smbd_server_fd(), buffer,
-+			BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE, 0);
- }
- 
- /*
-diff --git utils/smbfilter.c utils/smbfilter.c
-index 97d2223..2152e53 100644
---- utils/smbfilter.c
-+++ utils/smbfilter.c
-@@ -140,7 +140,7 @@ static void filter_child(int c, struct in_addr dest_ip)
- 		if (num <= 0) continue;
- 		
- 		if (c != -1 && FD_ISSET(c, &fds)) {
--			if (!receive_smb(c, packet, 0)) {
-+			if (!receive_smb(c, packet, BUFFER_SIZE, 0)) {
- 				d_printf("client closed connection\n");
- 				exit(0);
- 			}
-@@ -151,7 +151,7 @@ static void filter_child(int c, struct in_addr dest_ip)
- 			}			
- 		}
- 		if (s != -1 && FD_ISSET(s, &fds)) {
--			if (!receive_smb(s, packet, 0)) {
-+			if (!receive_smb(s, packet, BUFFER_SIZE, 0)) {
- 				d_printf("server closed connection\n");
- 				exit(0);
- 			}
diff --git a/net/samba3/files/patch-utils_ntlm_auth.c b/net/samba3/files/patch-utils_ntlm_auth.c
deleted file mode 100644
index 828d1d1a38f5..000000000000
--- a/net/samba3/files/patch-utils_ntlm_auth.c
+++ /dev/null
@@ -1,295 +0,0 @@
---- utils/ntlm_auth.c.orig	Sun Jun  3 04:28:29 2007
-+++ utils/ntlm_auth.c	Sun Jun  3 04:47:26 2007
-@@ -689,8 +689,8 @@
- 	NTSTATUS nt_status;
- 
- 	if (strlen(buf) < 2) {
--		DEBUG(1, ("NTLMSSP query [%s] invalid", buf));
--		x_fprintf(x_stdout, "BH\n");
-+		DEBUG(1, ("NTLMSSP query [%s] invalid\n", buf));
-+		x_fprintf(x_stdout, "BH NTLMSSP query [%s] invalid\n", buf);
- 		return;
- 	}
- 
-@@ -714,7 +714,7 @@
- 
- 		if (opt_password == NULL) {
- 			DEBUG(1, ("Out of memory\n"));
--			x_fprintf(x_stdout, "BH\n");
-+			x_fprintf(x_stdout, "BH Out of memory\n");
- 			data_blob_free(&request);
- 			return;
- 		}
-@@ -741,14 +741,14 @@
- 			x_fprintf(x_stdout, "GK %s\n", key64?key64:"<NULL>");
- 			SAFE_FREE(key64);
- 		} else {
--			x_fprintf(x_stdout, "BH\n");
-+			x_fprintf(x_stdout, "BH missing NTLMSSP session key\n");
- 		}
- 			
- 		data_blob_free(&request);
- 		return;
- 	} else {
--		DEBUG(1, ("NTLMSSP query [%s] invalid", buf));
--		x_fprintf(x_stdout, "BH\n");
-+		DEBUG(1, ("NTLMSSP query [%s] invalid\n", buf));
-+		x_fprintf(x_stdout, "BH NTLMSSP query [%s] invalid\n", buf);
- 		return;
- 	}
- 
-@@ -817,8 +817,8 @@
- 	}
- 
- 	if (strlen(buf) < 2) {
--		DEBUG(1, ("NTLMSSP query [%s] invalid", buf));
--		x_fprintf(x_stdout, "BH\n");
-+		DEBUG(1, ("NTLMSSP query [%s] invalid\n", buf));
-+		x_fprintf(x_stdout, "BH NTLMSSP query [%s] invalid\n", buf);
- 		return;
- 	}
- 
-@@ -842,7 +842,7 @@
- 
- 		if (opt_password == NULL) {
- 			DEBUG(1, ("Out of memory\n"));
--			x_fprintf(x_stdout, "BH\n");
-+			x_fprintf(x_stdout, "BH Out of memory\n");
- 			data_blob_free(&request);
- 			return;
- 		}
-@@ -892,14 +892,14 @@
- 			SAFE_FREE(key64);
- 		}
- 		else {
--			x_fprintf(x_stdout, "BH\n");
-+			x_fprintf(x_stdout, "BH missing session key\n");
- 		}
- 
- 		data_blob_free(&request);
- 		return;
- 	} else {
--		DEBUG(1, ("NTLMSSP query [%s] invalid", buf));
--		x_fprintf(x_stdout, "BH\n");
-+		DEBUG(1, ("NTLMSSP query [%s] invalid\n", buf));
-+		x_fprintf(x_stdout, "BH NTLMSSP query [%s] invalid\n", buf);
- 		return;
- 	}
- 
-@@ -1027,7 +1027,7 @@
- 
- 	if (len == -1) {
- 		DEBUG(1, ("Could not write SPNEGO data blob\n"));
--		x_fprintf(x_stdout, "BH\n");
-+		x_fprintf(x_stdout, "BH Could not write SPNEGO data blob\n");
- 		return;
- 	}
- 
-@@ -1057,8 +1057,8 @@
- 	pstring     reply_argument;
- 
- 	if (strlen(buf) < 2) {
--		DEBUG(1, ("SPENGO query [%s] invalid", buf));
--		x_fprintf(x_stdout, "BH\n");
-+		DEBUG(1, ("SPNEGO query [%s] invalid\n", buf));
-+		x_fprintf(x_stdout, "BH SPNEGO query [%s] invalid\n", buf);
- 		return;
- 	}
- 
-@@ -1068,8 +1068,8 @@
- 	} else if (strncmp(buf, "KK", 2) == 0) {
- 		
- 	} else {
--		DEBUG(1, ("SPENGO query [%s] invalid", buf));
--		x_fprintf(x_stdout, "BH\n");
-+		DEBUG(1, ("SPNEGO query [%s] invalid\n", buf));
-+		x_fprintf(x_stdout, "BH SPNEGO query [%s] invalid\n", buf);
- 		return;
- 	}
- 
-@@ -1086,7 +1086,7 @@
- 
- 	if (strlen(buf) <= 3) {
- 		DEBUG(1, ("GSS-SPNEGO query [%s] invalid\n", buf));
--		x_fprintf(x_stdout, "BH\n");
-+		x_fprintf(x_stdout, "BH GSS-SPENEGO query [%s] invalid\n", buf);
- 		return;
- 	}
- 
-@@ -1096,7 +1096,7 @@
- 
- 	if (len == -1) {
- 		DEBUG(1, ("GSS-SPNEGO query [%s] invalid", buf));
--		x_fprintf(x_stdout, "BH\n");
-+		x_fprintf(x_stdout, "BH GSS-SPNEGO query [%s] invalid", buf);
- 		return;
- 	}
- 
-@@ -1107,8 +1107,8 @@
- 
- 		if ( (request.negTokenInit.mechTypes == NULL) ||
- 		     (request.negTokenInit.mechTypes[0] == NULL) ) {
--			DEBUG(1, ("Client did not offer any mechanism"));
--			x_fprintf(x_stdout, "BH\n");
-+			DEBUG(1, ("Client did not offer any mechanism\n"));
-+			x_fprintf(x_stdout, "BH Client did not offer any mechanism\n");
- 			return;
- 		}
- 
-@@ -1116,15 +1116,15 @@
- 		if (strcmp(request.negTokenInit.mechTypes[0], OID_NTLMSSP) == 0) {
- 
- 			if ( request.negTokenInit.mechToken.data == NULL ) {
--				DEBUG(1, ("Client did not provide  NTLMSSP data\n"));
--				x_fprintf(x_stdout, "BH\n");
-+				DEBUG(1, ("Client did not provide NTLMSSP data\n"));
-+				x_fprintf(x_stdout, "BH Client did not provide NTLMSSP data\n");
- 				return;
- 			}
- 
- 			if ( ntlmssp_state != NULL ) {
- 				DEBUG(1, ("Client wants a new NTLMSSP challenge, but "
- 					  "already got one\n"));
--				x_fprintf(x_stdout, "BH\n");
-+				x_fprintf(x_stdout, "BH Client wants a new NTLMSSP challenge, but already got one\n");
- 				ntlmssp_end(&ntlmssp_state);
- 				return;
- 			}
-@@ -1157,7 +1157,7 @@
- 
- 			if ( request.negTokenInit.mechToken.data == NULL ) {
- 				DEBUG(1, ("Client did not provide Kerberos data\n"));
--				x_fprintf(x_stdout, "BH\n");
-+				x_fprintf(x_stdout, "BH Client did not provide Kerberos data\n");
- 				return;
- 			}
- 
-@@ -1183,7 +1183,7 @@
- 				if (domain == NULL) {
- 					DEBUG(1, ("Did not get a valid principal "
- 						  "from ads_verify_ticket\n"));
--					x_fprintf(x_stdout, "BH\n");
-+					x_fprintf(x_stdout, "BH Did not get a valid principal from ads_verify_ticket\n");
- 					return;
- 				}
- 
-@@ -1206,13 +1206,14 @@
- 			   is the only one we support that sends this stuff */
- 			DEBUG(1, ("Got a negTokenTarg for something non-NTLMSSP: %s\n",
- 				  request.negTokenTarg.supportedMech));
--			x_fprintf(x_stdout, "BH\n");
-+			x_fprintf(x_stdout, "BH Got a negTokenTarg for something non-NTLMSSP: %s\n",
-+				  request.negTokenTarg.supportedMech);
- 			return;
- 		}
- 
- 		if (request.negTokenTarg.responseToken.data == NULL) {
- 			DEBUG(1, ("Got a negTokenTarg without a responseToken!\n"));
--			x_fprintf(x_stdout, "BH\n");
-+			x_fprintf(x_stdout, "BH Got a negTokenTarg without a responseToken!\n");
- 			return;
- 		}
- 
-@@ -1256,7 +1257,7 @@
- 
- 	if (len == -1) {
- 		DEBUG(1, ("Could not write SPNEGO data blob\n"));
--		x_fprintf(x_stdout, "BH\n");
-+		x_fprintf(x_stdout, "BH Could not write SPNEGO data blob\n");
- 		return;
- 	}
- 
-@@ -1346,7 +1347,7 @@
- 
- 	if (client_ntlmssp_state == NULL) {
- 		DEBUG(1, ("Got NTLMSSP tArg without a client state\n"));
--		x_fprintf(x_stdout, "BH\n");
-+		x_fprintf(x_stdout, "BH Got NTLMSSP tArg without a client state\n");
- 		return;
- 	}
- 
-@@ -1370,7 +1371,9 @@
- 		DEBUG(1, ("Expected MORE_PROCESSING_REQUIRED from "
- 			  "ntlmssp_client_update, got: %s\n",
- 			  nt_errstr(status)));
--		x_fprintf(x_stdout, "BH\n");
-+		x_fprintf(x_stdout, "BH Expected MORE_PROCESSING_REQUIRED from "
-+			  "ntlmssp_client_update, got: %s\n",
-+			  nt_errstr(status));
- 		data_blob_free(&request);
- 		ntlmssp_end(&client_ntlmssp_state);
- 		return;
-@@ -1486,7 +1489,7 @@
- 	switch (spnego.negTokenTarg.negResult) {
- 	case SPNEGO_ACCEPT_INCOMPLETE:
- 		DEBUG(1, ("Got a Kerberos negTokenTarg with ACCEPT_INCOMPLETE\n"));
--		x_fprintf(x_stdout, "BH\n");
-+		x_fprintf(x_stdout, "BH Got a Kerberos negTokenTarg with ACCEPT_INCOMPLETE\n");
- 		break;
- 	case SPNEGO_ACCEPT_COMPLETED:
- 		DEBUG(10, ("Accept completed\n"));
-@@ -1518,7 +1521,7 @@
- 
- 	if (strlen(buf) <= 3) {
- 		DEBUG(1, ("SPNEGO query [%s] too short\n", buf));
--		x_fprintf(x_stdout, "BH\n");
-+		x_fprintf(x_stdout, "BH SPNEGO query [%s] too short\n", buf);
- 		return;
- 	}
- 
-@@ -1532,7 +1535,7 @@
- 		
- 		if (opt_password == NULL) {
- 			DEBUG(1, ("Out of memory\n"));
--			x_fprintf(x_stdout, "BH\n");
-+			x_fprintf(x_stdout, "BH Out of memory\n");
- 			data_blob_free(&request);
- 			return;
- 		}
-@@ -1546,7 +1549,7 @@
- 	     (strncmp(buf, "AF ", 3) != 0) &&
- 	     (strncmp(buf, "NA ", 3) != 0) ) {
- 		DEBUG(1, ("SPNEGO request [%s] invalid\n", buf));
--		x_fprintf(x_stdout, "BH\n");
-+		x_fprintf(x_stdout, "BH SPNEGO request [%s] invalid\n", buf);
- 		data_blob_free(&request);
- 		return;
- 	}
-@@ -1559,7 +1562,7 @@
- 
- 	if (len == -1) {
- 		DEBUG(1, ("Could not read SPNEGO data for [%s]\n", buf));
--		x_fprintf(x_stdout, "BH\n");
-+		x_fprintf(x_stdout, "BH Could not read SPNEGO data for [%s]\n", buf);
- 		return;
- 	}
- 
-@@ -1588,7 +1591,7 @@
- 		}
- 
- 		DEBUG(1, ("Server offered no compatible mechanism\n"));
--		x_fprintf(x_stdout, "BH\n");
-+		x_fprintf(x_stdout, "BH Server offered no compatible mechanism\n");
- 		return;
- 	}
- 
-@@ -1610,7 +1613,9 @@
- 				DEBUG(1, ("Got a negTokenTarg with no mech and an "
- 					  "unknown negResult: %d\n",
- 					  spnego.negTokenTarg.negResult));
--				x_fprintf(x_stdout, "BH\n");
-+				x_fprintf(x_stdout, "BH Got a negTokenTarg with no mech and an "
-+					  "unknown negResult: %d\n",
-+					  spnego.negTokenTarg.negResult);
- 			}
- 
- 			ntlmssp_end(&client_ntlmssp_state);
-@@ -1634,7 +1639,7 @@
- 	}
- 
- 	DEBUG(1, ("Got an SPNEGO token I could not handle [%s]!\n", buf));
--	x_fprintf(x_stdout, "BH\n");
-+	x_fprintf(x_stdout, "BH Got an SPNEGO token I could not handle [%s]!\n", buf);
- 	return;
- 
-  out:
diff --git a/net/samba3/pkg-plist.swat b/net/samba3/pkg-plist.swat
index 7ccfa14ca48d..b65f0d84941c 100644
--- a/net/samba3/pkg-plist.swat
+++ b/net/samba3/pkg-plist.swat
@@ -5,10 +5,10 @@ share/swat/help/Samba3-ByExample/DomApps.html
 share/swat/help/Samba3-ByExample/ExNetworks.html
 share/swat/help/Samba3-ByExample/HA.html
 share/swat/help/Samba3-ByExample/RefSection.html
+share/swat/help/Samba3-ByExample/apa.html
 share/swat/help/Samba3-ByExample/appendix.html
 share/swat/help/Samba3-ByExample/ch14.html
 share/swat/help/Samba3-ByExample/go01.html
-share/swat/help/Samba3-ByExample/gpl.html
 share/swat/help/Samba3-ByExample/happy.html
 share/swat/help/Samba3-ByExample/images/AccountingNetwork.png
 share/swat/help/Samba3-ByExample/images/Charity-Network.png
@@ -111,6 +111,7 @@ share/swat/help/Samba3-HOWTO/ServerType.html
 share/swat/help/Samba3-HOWTO/StandAloneServer.html
 share/swat/help/Samba3-HOWTO/TOSHpreface.html
 share/swat/help/Samba3-HOWTO/VFS.html
+share/swat/help/Samba3-HOWTO/apa.html
 share/swat/help/Samba3-HOWTO/bugreport.html
 share/swat/help/Samba3-HOWTO/cfgsmarts.html
 share/swat/help/Samba3-HOWTO/ch-ldap-tls.html
@@ -120,7 +121,6 @@ share/swat/help/Samba3-HOWTO/compiling.html
 share/swat/help/Samba3-HOWTO/diagnosis.html
 share/swat/help/Samba3-HOWTO/domain-member.html
 share/swat/help/Samba3-HOWTO/go01.html
-share/swat/help/Samba3-HOWTO/gpl.html
 share/swat/help/Samba3-HOWTO/groupmapping.html
 share/swat/help/Samba3-HOWTO/idmapper.html
 share/swat/help/Samba3-HOWTO/images/10small.png
@@ -264,6 +264,7 @@ share/swat/help/manpages/vfs_readahead.8.html
 share/swat/help/manpages/vfs_readonly.8.html
 share/swat/help/manpages/vfs_recycle.8.html
 share/swat/help/manpages/vfs_shadow_copy.8.html
+share/swat/help/manpages/vfs_xattr_tdb.8.html
 share/swat/help/manpages/vfstest.1.html
 share/swat/help/manpages/wbinfo.1.html
 share/swat/help/manpages/winbindd.8.html
@@ -280,171 +281,171 @@ share/swat/images/viewconfig.gif
 share/swat/images/wizard.gif
 share/swat/include/footer.html
 share/swat/include/header.html
-share/swat/using_samba/appa.html
-share/swat/using_samba/appb.html
-share/swat/using_samba/appc.html
-share/swat/using_samba/appd.html
-share/swat/using_samba/appe.html
-share/swat/using_samba/appf.html
-share/swat/using_samba/appg.html
-share/swat/using_samba/ch00.html
-share/swat/using_samba/ch01.html
-share/swat/using_samba/ch02.html
-share/swat/using_samba/ch03.html
-share/swat/using_samba/ch04.html
-share/swat/using_samba/ch05.html
-share/swat/using_samba/ch06.html
-share/swat/using_samba/ch07.html
-share/swat/using_samba/ch08.html
-share/swat/using_samba/ch09.html
-share/swat/using_samba/ch10.html
-share/swat/using_samba/ch11.html
-share/swat/using_samba/ch12.html
-share/swat/using_samba/figs/sam2_0101.gif
-share/swat/using_samba/figs/sam2_0102.gif
-share/swat/using_samba/figs/sam2_0103.gif
-share/swat/using_samba/figs/sam2_0104.gif
-share/swat/using_samba/figs/sam2_0105.gif
-share/swat/using_samba/figs/sam2_0106.gif
-share/swat/using_samba/figs/sam2_0107.gif
-share/swat/using_samba/figs/sam2_0108.gif
-share/swat/using_samba/figs/sam2_0109.gif
-share/swat/using_samba/figs/sam2_0110.gif
-share/swat/using_samba/figs/sam2_0111.gif
-share/swat/using_samba/figs/sam2_0112.gif
-share/swat/using_samba/figs/sam2_0113.gif
-share/swat/using_samba/figs/sam2_0114.gif
-share/swat/using_samba/figs/sam2_0201.gif
-share/swat/using_samba/figs/sam2_0202.gif
-share/swat/using_samba/figs/sam2_0203.gif
-share/swat/using_samba/figs/sam2_0204.gif
-share/swat/using_samba/figs/sam2_0301.gif
-share/swat/using_samba/figs/sam2_0302.gif
-share/swat/using_samba/figs/sam2_0303.gif
-share/swat/using_samba/figs/sam2_0304.gif
-share/swat/using_samba/figs/sam2_0305.gif
-share/swat/using_samba/figs/sam2_0306.gif
-share/swat/using_samba/figs/sam2_0307.gif
-share/swat/using_samba/figs/sam2_0308.gif
-share/swat/using_samba/figs/sam2_0309.gif
-share/swat/using_samba/figs/sam2_0310.gif
-share/swat/using_samba/figs/sam2_0311.gif
-share/swat/using_samba/figs/sam2_0312.gif
-share/swat/using_samba/figs/sam2_0313.gif
-share/swat/using_samba/figs/sam2_0314.gif
-share/swat/using_samba/figs/sam2_0315.gif
-share/swat/using_samba/figs/sam2_0316.gif
-share/swat/using_samba/figs/sam2_0317.gif
-share/swat/using_samba/figs/sam2_0318.gif
-share/swat/using_samba/figs/sam2_0319.gif
-share/swat/using_samba/figs/sam2_0320.gif
-share/swat/using_samba/figs/sam2_0321.gif
-share/swat/using_samba/figs/sam2_0322.gif
-share/swat/using_samba/figs/sam2_0323.gif
-share/swat/using_samba/figs/sam2_0324.gif
-share/swat/using_samba/figs/sam2_0325.gif
-share/swat/using_samba/figs/sam2_0326.gif
-share/swat/using_samba/figs/sam2_0327.gif
-share/swat/using_samba/figs/sam2_0328.gif
-share/swat/using_samba/figs/sam2_0329.gif
-share/swat/using_samba/figs/sam2_0330.gif
-share/swat/using_samba/figs/sam2_0331.gif
-share/swat/using_samba/figs/sam2_0332.gif
-share/swat/using_samba/figs/sam2_0333.gif
-share/swat/using_samba/figs/sam2_0334.gif
-share/swat/using_samba/figs/sam2_0335.gif
-share/swat/using_samba/figs/sam2_0336.gif
-share/swat/using_samba/figs/sam2_0337.gif
-share/swat/using_samba/figs/sam2_0338.gif
-share/swat/using_samba/figs/sam2_0339.gif
-share/swat/using_samba/figs/sam2_0340.gif
-share/swat/using_samba/figs/sam2_0341.gif
-share/swat/using_samba/figs/sam2_0342.gif
-share/swat/using_samba/figs/sam2_0343.gif
-share/swat/using_samba/figs/sam2_0344.gif
-share/swat/using_samba/figs/sam2_0345.gif
-share/swat/using_samba/figs/sam2_0346.gif
-share/swat/using_samba/figs/sam2_0347.gif
-share/swat/using_samba/figs/sam2_0348.gif
-share/swat/using_samba/figs/sam2_0349.gif
-share/swat/using_samba/figs/sam2_0350.gif
-share/swat/using_samba/figs/sam2_0351.gif
-share/swat/using_samba/figs/sam2_0352.gif
-share/swat/using_samba/figs/sam2_0353.gif
-share/swat/using_samba/figs/sam2_0354.gif
-share/swat/using_samba/figs/sam2_0355.gif
-share/swat/using_samba/figs/sam2_0356.gif
-share/swat/using_samba/figs/sam2_0357.gif
-share/swat/using_samba/figs/sam2_0358.gif
-share/swat/using_samba/figs/sam2_0359.gif
-share/swat/using_samba/figs/sam2_0360.gif
-share/swat/using_samba/figs/sam2_0361.gif
-share/swat/using_samba/figs/sam2_0401.gif
-share/swat/using_samba/figs/sam2_0402.gif
-share/swat/using_samba/figs/sam2_0403.gif
-share/swat/using_samba/figs/sam2_0404.gif
-share/swat/using_samba/figs/sam2_0405.gif
-share/swat/using_samba/figs/sam2_0406.gif
-share/swat/using_samba/figs/sam2_0407.gif
-share/swat/using_samba/figs/sam2_0408.gif
-share/swat/using_samba/figs/sam2_0409.gif
-share/swat/using_samba/figs/sam2_0410.gif
-share/swat/using_samba/figs/sam2_0411.gif
-share/swat/using_samba/figs/sam2_0412.gif
-share/swat/using_samba/figs/sam2_0413.gif
-share/swat/using_samba/figs/sam2_0414.gif
-share/swat/using_samba/figs/sam2_0415.gif
-share/swat/using_samba/figs/sam2_0416.gif
-share/swat/using_samba/figs/sam2_0417.gif
-share/swat/using_samba/figs/sam2_0501.gif
-share/swat/using_samba/figs/sam2_0502.gif
-share/swat/using_samba/figs/sam2_0503.gif
-share/swat/using_samba/figs/sam2_0504.gif
-share/swat/using_samba/figs/sam2_0505.gif
-share/swat/using_samba/figs/sam2_0506.gif
-share/swat/using_samba/figs/sam2_0507.gif
-share/swat/using_samba/figs/sam2_0508.gif
-share/swat/using_samba/figs/sam2_0601.gif
-share/swat/using_samba/figs/sam2_0602.gif
-share/swat/using_samba/figs/sam2_0603.gif
-share/swat/using_samba/figs/sam2_0604.gif
-share/swat/using_samba/figs/sam2_0605.gif
-share/swat/using_samba/figs/sam2_0701.gif
-share/swat/using_samba/figs/sam2_0801.gif
-share/swat/using_samba/figs/sam2_0802.gif
-share/swat/using_samba/figs/sam2_0803.gif
-share/swat/using_samba/figs/sam2_0804.gif
-share/swat/using_samba/figs/sam2_0805.gif
-share/swat/using_samba/figs/sam2_0806.gif
-share/swat/using_samba/figs/sam2_0807.gif
-share/swat/using_samba/figs/sam2_0808.gif
-share/swat/using_samba/figs/sam2_0809.gif
-share/swat/using_samba/figs/sam2_0810.gif
-share/swat/using_samba/figs/sam2_0811.gif
-share/swat/using_samba/figs/sam2_0901.gif
-share/swat/using_samba/figs/sam2_0902.gif
-share/swat/using_samba/figs/sam2_0903.gif
-share/swat/using_samba/figs/sam2_1001.gif
-share/swat/using_samba/figs/sam2_1002.gif
-share/swat/using_samba/figs/sam2_1003.gif
-share/swat/using_samba/figs/sam2_1004.gif
-share/swat/using_samba/figs/sam2_1005.gif
-share/swat/using_samba/figs/sam2_1006.gif
-share/swat/using_samba/figs/sam2_1101.gif
-share/swat/using_samba/figs/sam2_1102.gif
-share/swat/using_samba/figs/sam2_af01.gif
-share/swat/using_samba/figs/sam2_af02.gif
-share/swat/using_samba/figs/sam2_af03.gif
-share/swat/using_samba/figs/sam2_af04.gif
-share/swat/using_samba/figs/sam2_af05.gif
-share/swat/using_samba/figs/sam2_af06.gif
-share/swat/using_samba/figs/sam2_af07.gif
-share/swat/using_samba/inx.html
-share/swat/using_samba/samba2_s.gif
-share/swat/using_samba/samba2_xs.gif
-share/swat/using_samba/toc.html
-@dirrm share/swat/using_samba/figs
-@dirrm share/swat/using_samba
+%%SAMBA_BOOK%%share/swat/using_samba/appa.html
+%%SAMBA_BOOK%%share/swat/using_samba/appb.html
+%%SAMBA_BOOK%%share/swat/using_samba/appc.html
+%%SAMBA_BOOK%%share/swat/using_samba/appd.html
+%%SAMBA_BOOK%%share/swat/using_samba/appe.html
+%%SAMBA_BOOK%%share/swat/using_samba/appf.html
+%%SAMBA_BOOK%%share/swat/using_samba/appg.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch00.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch01.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch02.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch03.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch04.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch05.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch06.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch07.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch08.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch09.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch10.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch11.html
+%%SAMBA_BOOK%%share/swat/using_samba/ch12.html
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0101.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0102.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0103.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0104.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0105.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0106.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0107.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0108.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0109.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0110.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0111.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0112.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0113.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0114.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0201.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0202.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0203.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0204.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0301.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0302.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0303.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0304.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0305.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0306.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0307.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0308.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0309.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0310.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0311.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0312.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0313.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0314.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0315.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0316.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0317.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0318.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0319.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0320.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0321.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0322.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0323.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0324.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0325.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0326.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0327.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0328.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0329.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0330.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0331.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0332.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0333.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0334.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0335.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0336.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0337.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0338.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0339.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0340.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0341.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0342.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0343.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0344.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0345.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0346.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0347.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0348.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0349.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0350.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0351.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0352.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0353.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0354.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0355.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0356.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0357.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0358.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0359.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0360.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0361.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0401.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0402.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0403.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0404.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0405.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0406.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0407.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0408.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0409.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0410.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0411.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0412.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0413.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0414.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0415.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0416.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0417.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0501.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0502.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0503.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0504.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0505.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0506.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0507.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0508.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0601.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0602.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0603.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0604.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0605.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0701.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0801.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0802.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0803.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0804.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0805.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0806.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0807.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0808.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0809.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0810.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0811.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0901.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0902.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_0903.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_1001.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_1002.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_1003.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_1004.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_1005.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_1006.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_1101.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_1102.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_af01.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_af02.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_af03.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_af04.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_af05.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_af06.gif
+%%SAMBA_BOOK%%share/swat/using_samba/figs/sam2_af07.gif
+%%SAMBA_BOOK%%share/swat/using_samba/inx.html
+%%SAMBA_BOOK%%share/swat/using_samba/samba2_s.gif
+%%SAMBA_BOOK%%share/swat/using_samba/samba2_xs.gif
+%%SAMBA_BOOK%%share/swat/using_samba/toc.html
+%%SAMBA_BOOK%%@dirrm share/swat/using_samba/figs
+%%SAMBA_BOOK%%@dirrm share/swat/using_samba
 @dirrm share/swat/js
 @dirrm share/swat/include
 @dirrm share/swat/images