Update to 3.0.6.

Submitted by: maintainer
author: lofi <lofi@FreeBSD.org> 2004-09-02 00:23:29 +0800
committer: lofi <lofi@FreeBSD.org> 2004-09-02 00:23:29 +0800
commit: ae09c2be3d473a59cc244f91e9a29420a80406da (patch)
tree: 7590d2a6ea39c4e41a6844cac46cb3545f64fc77 /net
parent: d8842b21adef43e83d12a33048cb6b94835dbcf4 (diff)
download: freebsd-ports-gnome-ae09c2be3d473a59cc244f91e9a29420a80406da.tar.gz
freebsd-ports-gnome-ae09c2be3d473a59cc244f91e9a29420a80406da.tar.zst
freebsd-ports-gnome-ae09c2be3d473a59cc244f91e9a29420a80406da.zip
16 files changed, 861 insertions, 624 deletions
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 9878721e107e..256b5f3bad53 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		samba
-PORTVERSION=		3.0.5
+PORTVERSION=		3.0.6
 PORTREVISION?=		0
 PORTEPOCH?=		1
 CATEGORIES?=		net
@@ -20,7 +20,7 @@ COMMENT?=		A free SMB and CIFS client and server for UNIX
 CONFLICTS?=		ja-samba-2.* samba-2.* sharity-light-1.*
 
 USE_ICONV=		yes
-USE_AUTOCONF_VER=	253
+USE_AUTOCONF_VER=	259
 
 LATEST_LINK?=		${PKGNAMEPREFIX}${PORTNAME}3${PKGNAMESUFFIX}
 EXAMPLESDIR=		${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
@@ -182,7 +182,7 @@ PLIST_SUB+=		SMBPASS="@comment "
 
 .if defined(WITH_ACL_SUPPORT)
 .if ${OSVERSION} < 500018
-BROKEN=			"Requires FreeBSD 5.x at least after 20010326"
+BROKEN=			"ACL support requires FreeBSD 5.x at least after 20010326"
 .else
 CONFIGURE_ARGS+=	--with-acl-support
 .endif
@@ -233,7 +233,7 @@ MAN1=		findsmb.1 nmblookup.1 log2pcap.1 rpcclient.1 \
 		smbget.1 smbcacls.1 smbclient.1 smbcontrol.1 smbsh.1 \
 		smbstatus.1 smbtar.1 testparm.1 testprns.1 vfstest.1 \
 		ntlm_auth.1 profiles.1 smbcquotas.1 smbtree.1
-MAN5=		lmhosts.5 smb.conf.5 smbpasswd.5
+MAN5=		lmhosts.5 smb.conf.5 smbgetrc.5 smbpasswd.5
 MAN7=		samba.7
 MAN8=		nmbd.8 smbd.8 net.8 pdbedit.8 smbpasswd.8 smbspool.8 \
 		swat.8 tdbdump.8 tdbbackup.8
@@ -249,10 +249,11 @@ WINBIND_FILTER=		${GREP} -v '^%%WINBIND%%'
 .endif
 
 .if defined(WITH_I18N)
+IGNORE=			"I18N patch not ported yet!"
 # Based on patch from miraclelinux.com.
 # http://www.miraclelinux.com/english/technet/samba30/index.html
-PATCH_SITES=	http://dist.bsdlab.org/
-PATCHFILES=	samba-3.0.4-i18n-20040521.bz2
+PATCH_SITES=		http://dist.bsdlab.org/
+PATCHFILES=		samba-3.0.4-i18n-20040521.bz2
 PATCH_DIST_STRIP=	-p1
 PLIST_SUB+=		I18N=""
 .else
@@ -281,6 +282,7 @@ pre-fetch:
 post-patch:
 	@${FIND} ${WRKSRC} -name CVS -o -name .cvsignore | ${XARGS} ${RM}
 	@${RM} -rf ${WRKDIR}/${DISTNAME}/examples/libsmbclient
+	@${CP} -pf ${FILESDIR}/samba.schema ${WRKDIR}/${DISTNAME}/examples/LDAP
 
 post-install:
 .for sect in 1 5 7 8
@@ -348,8 +350,8 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${CP} -Rp ${WRKDIR}/${DISTNAME}/docs/registry ${DOCSDIR}
-.for d in devel guide howto
-	@${CP} -Rp ${WRKDIR}/${DISTNAME}/docs/htmldocs/${d} ${DOCSDIR}
+.for f in Samba-Developers-Guide.pdf Samba-Guide.pdf Samba-HOWTO-Collection.pdf
+	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/docs/${f} ${DOCSDIR}
 .endfor
 	@${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR}
 .for f in README COPYING Manifest Read-Manifest-Now Roadmap \
diff --git a/net/samba3/distinfo b/net/samba3/distinfo
index 9b05a9c720ec..50a9baaef311 100644
--- a/net/samba3/distinfo
+++ b/net/samba3/distinfo
@@ -1,3 +1,5 @@
+MD5 (samba-3.0.6.tar.gz) = c8dc06e2bcf63513c2e8d849f6352d8a
+SIZE (samba-3.0.6.tar.gz) = 14947376
 MD5 (samba-3.0.5.tar.gz) = 5896ad33676e3c26efaab5dcd897c466
 SIZE (samba-3.0.5.tar.gz) = 15076996
 MD5 (samba-3.0.4-i18n-20040521.bz2) = 24158c2fd00b47ff5b0bcad23cae16e1
diff --git a/net/samba3/files/README.FreeBSD b/net/samba3/files/README.FreeBSD
index 5bc20d291549..bb9141e73c2f 100644
--- a/net/samba3/files/README.FreeBSD
+++ b/net/samba3/files/README.FreeBSD
@@ -18,4 +18,4 @@ use NT4+SP3 or Win95+updates clients, set "encrypt passwords" parameter to
 yes and use smbpasswd [username] to use /usr/local/private/smbpasswd for
 authentication.
 
-FreeBSD Samba-devel port maintainer: Timur Bakeyev <timur@gnu.org>
+FreeBSD Samba3 port maintainer: Timur Bakeyev <timur@gnu.org>
diff --git a/net/samba3/files/patch-Makefile.in b/net/samba3/files/patch-Makefile.in
index efeaa5e5b20e..742224c32c5c 100644
--- a/net/samba3/files/patch-Makefile.in
+++ b/net/samba3/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Sun Apr  4 09:37:15 2004
-+++ Makefile.in	Mon Apr  5 20:43:42 2004
-@@ -101,6 +101,7 @@
+--- Makefile.in.orig	Thu Aug 19 15:39:11 2004
++++ Makefile.in	Mon Aug 30 22:02:08 2004
+@@ -104,6 +104,7 @@
  LIBSMBCLIENT_MAJOR=0
  LIBSMBCLIENT_MINOR=1
  
@@ -8,7 +8,7 @@
  
  FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper  -I. $(CPPFLAGS) -I$(srcdir)
  FLAGS2 = 
-@@ -957,8 +958,8 @@
+@@ -992,8 +993,8 @@
  		@SONAMEFLAG@`basename $@`
  
  bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS)
@@ -19,7 +19,7 @@
  		$(KRB5LIBS) $(LDAP_LIBS) \
  		@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
  
-@@ -1041,13 +1042,13 @@
+@@ -1076,13 +1077,13 @@
  @WINBIND_NSS@: $(WINBIND_NSS_PICOBJS)
  	@echo "Linking $@"
  	@$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) \
@@ -35,21 +35,12 @@
  
  nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy
  	@echo "Linking $@"
-@@ -1218,7 +1219,7 @@
+@@ -1268,7 +1269,7 @@
  
  bin/t_snprintf@EXEEXT@: lib/snprintf.c
  	$(CC) $(FLAGS) -o $@ -DTEST_SNPRINTF lib/snprintf.c -lm
 -install: installbin installman installscripts installdat installswat installmodules @INSTALLCLIENT@
-+install: installbin installscripts installdat installswat installmodules @INSTALLCLIENT@
++install: installbin installscripts installdat installswat installmodules
  
  install-everything: install installmodules
  
-@@ -1270,7 +1271,7 @@
- 
- installclientlib: installdirs libsmbclient
- 	@$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/lib
--	-$(INSTALLCLIENTCMD_SH) bin/libsmbclient.@SHLIBEXT@ $(DESTDIR)${prefix}/lib
-+	-$(INSTALLCLIENTCMD_SH) bin/libsmbclient.@SHLIBEXT@.$(LIBSMBCLIENT_MAJOR) $(DESTDIR)${prefix}/lib
- 	-$(INSTALLCLIENTCMD_A) bin/libsmbclient.a $(DESTDIR)${prefix}/lib
- 	@$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/include
- 	-$(INSTALLCMD) $(srcdir)/include/libsmbclient.h $(DESTDIR)${prefix}/include
diff --git a/net/samba3/files/patch-configure.in b/net/samba3/files/patch-configure.in
index 9f38d6ecbfb6..1b8afc674007 100644
--- a/net/samba3/files/patch-configure.in
+++ b/net/samba3/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	Thu Apr 29 09:34:48 2004
-+++ configure.in	Thu May 20 14:16:15 2004
-@@ -803,6 +803,13 @@
+--- configure.in.orig	Fri Aug  6 23:38:21 2004
++++ configure.in	Wed Sep  1 03:03:48 2004
+@@ -810,6 +810,13 @@
     AC_DEFINE(HAVE_SIG_ATOMIC_T_TYPE,1,[Whether we have the atomic_t variable type])
  fi
  
@@ -14,3 +14,21 @@
  # stupid headers have the functions but no declaration. grrrr.
  AC_HAVE_DECL(errno, [#include <errno.h>])
  AC_HAVE_DECL(setresuid, [#include <unistd.h>])
+@@ -3870,7 +3877,7 @@
+ 		AC_DEFINE(HAVE_TRU64_ACLS,1,[Whether Tru64 ACLs are available])
+ 		ACL_LIBS="$ACL_LIBS -lpacl"
+ 		;;
+-	*freebsd5*)
++	*freebsd[[5-9]]*)
+ 		AC_MSG_RESULT(Using FreeBSD posix ACLs)
+ 		AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether FreeBSD POSIX ACLs are available])
+ 		AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available])
+@@ -4189,7 +4196,7 @@
+ 	*linux*)
+ 		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
+ 		;;
+-	*freebsd5*)
++	*freebsd[[5-9]]*)
+ 		# FreeBSD winbind client is implemented as a wrapper around
+ 		# the Linux version.
+ 		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
diff --git a/net/samba3/files/patch-jerry-cli_pipe.c b/net/samba3/files/patch-jerry-cli_pipe.c
deleted file mode 100644
index 310f3d860f3f..000000000000
--- a/net/samba3/files/patch-jerry-cli_pipe.c
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: source/rpc_client/cli_pipe.c
-===================================================================
---- rpc_client/cli_pipe.c	(revision 842)
-+++ rpc_client/cli_pipe.c	(working copy)
-@@ -332,13 +332,24 @@
- 	if (cli->pipe_auth_flags & AUTH_PIPE_NETSEC) {
- 		RPC_AUTH_NETSEC_CHK chk;
- 
--		if (auth_len != RPC_AUTH_NETSEC_CHK_LEN) {
-+		if ( (auth_len != RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN) 
-+			&& (auth_len != RPC_AUTH_NETSEC_SIGN_ONLY_CHK_LEN)  ) 
-+		{
- 			DEBUG(0,("rpc_auth_pipe: wrong schannel auth len %d\n", auth_len));
- 			return False;
- 		}
- 
--		if (!smb_io_rpc_auth_netsec_chk("schannel_auth_sign", 
--						&chk, &auth_verf, 0)) {
-+		/* can't seal with no nonce */
-+		if ( (cli->pipe_auth_flags & AUTH_PIPE_SEAL)
-+			&& (auth_len != RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN)  )
-+		{
-+			DEBUG(0,("rpc_auth_pipe: sealing not supported with schannel auth len %d\n", auth_len));
-+			return False;
-+		}
-+		
-+
-+		if (!smb_io_rpc_auth_netsec_chk("schannel_auth_sign", auth_len, &chk, &auth_verf, 0)) 
-+		{
- 			DEBUG(0, ("rpc_auth_pipe: schannel unmarshalling "
- 				  "RPC_AUTH_NETSECK_CHK failed\n"));
- 			return False;
-@@ -918,7 +929,7 @@
- 			auth_len = RPC_AUTH_NTLMSSP_CHK_LEN;
- 		}
- 		if (cli->pipe_auth_flags & AUTH_PIPE_NETSEC) {	
--			auth_len = RPC_AUTH_NETSEC_CHK_LEN;
-+			auth_len = RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN;
- 		}
- 		auth_hdr_len = RPC_HDR_AUTH_LEN;
- 	}
-@@ -1034,8 +1045,9 @@
- 				/* write auth footer onto the packet */
- 				
- 				parse_offset_marker = prs_offset(&sec_blob);
--				if (!smb_io_rpc_auth_netsec_chk("", &verf,
--								&sec_blob, 0)) {
-+				if (!smb_io_rpc_auth_netsec_chk("", RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN, 
-+					&verf, &sec_blob, 0)) 
-+				{
- 					prs_mem_free(&sec_blob);
- 					return False;
- 				}
diff --git a/net/samba3/files/patch-jerry-filename.c b/net/samba3/files/patch-jerry-filename.c
deleted file mode 100644
index 9ee1ade38fc8..000000000000
--- a/net/samba3/files/patch-jerry-filename.c
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: source/smbd/filename.c
-===================================================================
---- smbd/filename.c	(revision 842)
-+++ smbd/filename.c	(working copy)
-@@ -137,6 +137,10 @@
- 	if (!*name) {
- 		name[0] = '.';
- 		name[1] = '\0';
-+		if (SMB_VFS_STAT(conn,name,&st) == 0) {
-+			*pst = st;
-+		}
-+		DEBUG(5,("conversion finished %s -> %s\n",orig_path, name));
- 		return(True);
- 	}
- 
diff --git a/net/samba3/files/patch-jerry-homes-reuse_v2 b/net/samba3/files/patch-jerry-homes-reuse_v2
new file mode 100644
index 000000000000..e8d39b60b4d7
--- /dev/null
+++ b/net/samba3/files/patch-jerry-homes-reuse_v2
@@ -0,0 +1,69 @@
+Index: smbd/password.c
+===================================================================
+--- smbd/password.c	(revision 2069)
++++ smbd/password.c	(working copy)
+@@ -252,27 +252,30 @@
+ 	}
+ 
+ 	/* Register a home dir service for this user iff
++	
+ 	   (a) This is not a guest connection,
+ 	   (b) we have a home directory defined 
+-	   If a share exists by this name (autoloaded or not) reuse it so
+-	   long as the home directory is the same as the share directory. */
++	   (c) there s not an existing static share by that name
++	   
++	   If a share exists by this name (autoloaded or not) reuse it . */
+ 
+-	if ( (!vuser->guest) && vuser->unix_homedir && *(vuser->unix_homedir)) {
++	vuser->homes_snum = -1;
++
++	if ( (!vuser->guest) && vuser->unix_homedir && *(vuser->unix_homedir)) 
++	{
+ 		int servicenumber = lp_servicenumber(vuser->user.unix_name);
++
+ 		if ( servicenumber == -1 ) {
+ 			DEBUG(3, ("Adding homes service for user '%s' using home directory: '%s'\n", 
+ 				vuser->user.unix_name, vuser->unix_homedir));
+ 			vuser->homes_snum = add_home_service(vuser->user.unix_name, 
+ 						vuser->user.unix_name, vuser->unix_homedir);
+-		} else if (strcmp(lp_pathname(servicenumber),vuser->unix_homedir) == 0) {
+-			DEBUG(3, ("Reusing homes service for user '%s' using home directory: '%s'\n", 
+-				vuser->user.unix_name, vuser->unix_homedir));
+-
++		} else {
++			DEBUG(3, ("Using static (or previously created) service for user '%s'; path = '%s'\n", 
++				vuser->user.unix_name, lp_pathname(servicenumber) ));
+ 			vuser->homes_snum = servicenumber;
+ 		}
+-	} else {
+-		vuser->homes_snum = -1;
+-	}
++	} 
+ 	
+ 	if (srv_is_signing_negotiated() && !vuser->guest && !srv_signing_started()) {
+ 		/* Try and turn on server signing on the first non-guest sessionsetup. */
+Index: param/loadparm.c
+===================================================================
+--- param/loadparm.c	(revision 2069)
++++ param/loadparm.c	(working copy)
+@@ -2305,6 +2305,10 @@
+ 	copy_service(ServicePtrs[i], &tservice, NULL);
+ 	if (name)
+ 		string_set(&ServicePtrs[i]->szService, name);
++		
++	DEBUG(8,("add_a_service: Creating snum = %d for %s\n", 
++		i, ServicePtrs[i]->szService));
++		
+ 	return (i);
+ }
+ 
+@@ -2344,7 +2348,7 @@
+ 	ServicePtrs[i]->autoloaded = True;
+ 
+ 	DEBUG(3, ("adding home's share [%s] for user '%s' at '%s'\n", pszHomename, 
+-	       user, newHomedir));
++	       user, ServicePtrs[i]->szPath ));
+ 	
+ 	return (True);
+ }
diff --git a/net/samba3/files/patch-jerry-parse_rpc.c b/net/samba3/files/patch-jerry-parse_rpc.c
deleted file mode 100644
index e0beba3cf61c..000000000000
--- a/net/samba3/files/patch-jerry-parse_rpc.c
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: source/rpc_parse/parse_rpc.c
-===================================================================
---- rpc_parse/parse_rpc.c	(revision 842)
-+++ rpc_parse/parse_rpc.c	(working copy)
-@@ -1189,7 +1189,8 @@
- /*******************************************************************
- reads or writes an RPC_AUTH_NETSEC_CHK structure.
- ********************************************************************/
--BOOL smb_io_rpc_auth_netsec_chk(const char *desc, RPC_AUTH_NETSEC_CHK * chk,
-+BOOL smb_io_rpc_auth_netsec_chk(const char *desc, int auth_len, 
-+                                RPC_AUTH_NETSEC_CHK * chk,
- 				prs_struct *ps, int depth)
- {
- 	if (chk == NULL)
-@@ -1198,10 +1199,19 @@
- 	prs_debug(ps, depth, desc, "smb_io_rpc_auth_netsec_chk");
- 	depth++;
- 
--	prs_uint8s(False, "sig  ", ps, depth, chk->sig, sizeof(chk->sig));
--	prs_uint8s(False, "seq_num", ps, depth, chk->seq_num, sizeof(chk->seq_num));
--	prs_uint8s(False, "packet_digest", ps, depth, chk->packet_digest, sizeof(chk->packet_digest));
--	prs_uint8s(False, "confounder", ps, depth, chk->confounder, sizeof(chk->confounder));
-+	if ( !prs_uint8s(False, "sig  ", ps, depth, chk->sig, sizeof(chk->sig)) )
-+		return False;
-+		
-+	if ( !prs_uint8s(False, "seq_num", ps, depth, chk->seq_num, sizeof(chk->seq_num)) )
-+		return False;
-+		
-+	if ( !prs_uint8s(False, "packet_digest", ps, depth, chk->packet_digest, sizeof(chk->packet_digest)) )
-+		return False;
-+	
-+	if ( auth_len == RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN ) {
-+		if ( !prs_uint8s(False, "confounder", ps, depth, chk->confounder, sizeof(chk->confounder)) )
-+			return False;
-+	}
- 
- 	return True;
- }
diff --git a/net/samba3/files/patch-jerry-rpc_dce.h b/net/samba3/files/patch-jerry-rpc_dce.h
deleted file mode 100644
index e99931e00cd0..000000000000
--- a/net/samba3/files/patch-jerry-rpc_dce.h
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: source/include/rpc_dce.h
-===================================================================
---- include/rpc_dce.h	(revision 842)
-+++ include/rpc_dce.h	(working copy)
-@@ -63,8 +63,10 @@
- #define NETSEC_AUTH_TYPE 0x44
- #define NETSEC_SIGN_SIGNATURE { 0x77, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00 }
- #define NETSEC_SEAL_SIGNATURE { 0x77, 0x00, 0x7a, 0x00, 0xff, 0xff, 0x00, 0x00 }
--#define RPC_AUTH_NETSEC_CHK_LEN 0x20
- 
-+#define RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN 	0x20
-+#define RPC_AUTH_NETSEC_SIGN_ONLY_CHK_LEN 	0x18
-+
- /* The 7 here seems to be required to get Win2k not to downgrade us
-    to NT4.  Actually, anything other than 1ff would seem to do... */
- #define NETLOGON_NEG_AUTH2_FLAGS 0x000701ff
diff --git a/net/samba3/files/patch-jerry-srv_pipe.c b/net/samba3/files/patch-jerry-srv_pipe.c
deleted file mode 100644
index 9185fac2e4b9..000000000000
--- a/net/samba3/files/patch-jerry-srv_pipe.c
+++ /dev/null
@@ -1,54 +0,0 @@
-Index: source/rpc_server/srv_pipe.c
-===================================================================
---- rpc_server/srv_pipe.c	(revision 842)
-+++ rpc_server/srv_pipe.c	(working copy)
-@@ -124,7 +124,7 @@
- 	if(p->ntlmssp_auth_validated) {
- 		data_space_available -= (RPC_HDR_AUTH_LEN + RPC_AUTH_NTLMSSP_CHK_LEN);
- 	} else if(p->netsec_auth_validated) {
--		data_space_available -= (RPC_HDR_AUTH_LEN + RPC_AUTH_NETSEC_CHK_LEN);
-+		data_space_available -= (RPC_HDR_AUTH_LEN + RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN);
- 	}
- 
- 	/*
-@@ -177,8 +177,8 @@
- 	} else if (p->netsec_auth_validated) {
- 		p->hdr.frag_len = RPC_HEADER_LEN + RPC_HDR_RESP_LEN +
- 			data_len + ss_padding_len +
--			RPC_HDR_AUTH_LEN + RPC_AUTH_NETSEC_CHK_LEN;
--		p->hdr.auth_len = RPC_AUTH_NETSEC_CHK_LEN;
-+			RPC_HDR_AUTH_LEN + RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN;
-+		p->hdr.auth_len = RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN;
- 	} else {
- 		p->hdr.frag_len = RPC_HEADER_LEN + RPC_HDR_RESP_LEN + data_len;
- 		p->hdr.auth_len = 0;
-@@ -309,7 +309,8 @@
- 			      SENDER_IS_ACCEPTOR,
- 			      &verf, data, data_len + ss_padding_len);
- 
--		smb_io_rpc_auth_netsec_chk("", &verf, &outgoing_pdu, 0);
-+		smb_io_rpc_auth_netsec_chk("", RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN, 
-+			&verf, &outgoing_pdu, 0);
- 
- 		p->netsec_auth.seq_num++;
- 	}
-@@ -1339,7 +1340,7 @@
- 
- 	auth_len = p->hdr.auth_len;
- 
--	if (auth_len != RPC_AUTH_NETSEC_CHK_LEN) {
-+	if (auth_len != RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN) {
- 		DEBUG(0,("Incorrect auth_len %d.\n", auth_len ));
- 		return False;
- 	}
-@@ -1384,7 +1385,9 @@
- 		return False;
- 	}
- 
--	if(!smb_io_rpc_auth_netsec_chk("", &netsec_chk, rpc_in, 0)) {
-+	if(!smb_io_rpc_auth_netsec_chk("", RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN, 
-+		&netsec_chk, rpc_in, 0)) 
-+	{
- 		DEBUG(0,("failed to unmarshal RPC_AUTH_NETSEC_CHK.\n"));
- 		return False;
- 	}
diff --git a/net/samba3/files/patch-jerry-uid.c b/net/samba3/files/patch-jerry-uid.c
deleted file mode 100644
index c3c4a7b5c9ad..000000000000
--- a/net/samba3/files/patch-jerry-uid.c
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: source/smbd/uid.c
-===================================================================
---- smbd/uid.c	(revision 842)
-+++ smbd/uid.c	(working copy)
-@@ -189,20 +189,26 @@
- 
- 	snum = SNUM(conn);
- 
-+	if ((vuser) && !check_user_ok(conn, vuser, snum)) {
-+		DEBUG(2,("change_to_user: SMB user %s (unix user %s, vuid %d) not permitted access to share %s.\n",
-+			vuser->user.smb_name, vuser->user.unix_name, vuid, lp_servicename(snum)));
-+		return False;
-+	}
-+
- 	if (conn->force_user) /* security = share sets this too */ {
- 		uid = conn->uid;
- 		gid = conn->gid;
- 		current_user.groups = conn->groups;
- 		current_user.ngroups = conn->ngroups;
- 		token = conn->nt_user_token;
--	} else if ((vuser) && check_user_ok(conn, vuser, snum)) {
-+	} else if (vuser) {
- 		uid = conn->admin_user ? 0 : vuser->uid;
- 		gid = vuser->gid;
- 		current_user.ngroups = vuser->n_groups;
- 		current_user.groups  = vuser->groups;
- 		token = vuser->nt_user_token;
- 	} else {
--		DEBUG(2,("change_to_user: Invalid vuid used %d or vuid not permitted access to share.\n",vuid));
-+		DEBUG(2,("change_to_user: Invalid vuid used %d in accessing share %s.\n",vuid, lp_servicename(snum) ));
- 		return False;
- 	}
- 
diff --git a/net/samba3/files/patch-jerry-winbind_getpwnam_v1 b/net/samba3/files/patch-jerry-winbind_getpwnam_v1
new file mode 100644
index 000000000000..484c9e775d36
--- /dev/null
+++ b/net/samba3/files/patch-jerry-winbind_getpwnam_v1
@@ -0,0 +1,66 @@
+Index: libsmb/samlogon_cache.c
+===================================================================
+--- libsmb/samlogon_cache.c	(revision 2082)
++++ libsmb/samlogon_cache.c	(working copy)
+@@ -106,9 +106,10 @@
+ 
+ /***********************************************************************
+  Store a NET_USER_INFO_3 structure in a tdb for later user 
++ username should be in UTF-8 format
+ ***********************************************************************/
+ 
+-BOOL netsamlogon_cache_store(TALLOC_CTX *mem_ctx, NET_USER_INFO_3 *user)
++BOOL netsamlogon_cache_store(TALLOC_CTX *mem_ctx, const char * username, NET_USER_INFO_3 *user)
+ {
+ 	TDB_DATA 	data;
+         fstring 	keystr;
+@@ -130,6 +131,14 @@
+ 	slprintf(keystr, sizeof(keystr), "%s", sid_string_static(&user_sid));
+ 
+ 	DEBUG(10,("netsamlogon_cache_store: SID [%s]\n", keystr));
++	
++	/* only Samba fills in the username, not sure why NT doesn't */
++	/* so we fill it in since winbindd_getpwnam() makes use of it */
++	
++	if ( !user->uni_user_name.buffer ) {
++		init_unistr2( &user->uni_user_name, username, STR_TERMINATE );
++		init_uni_hdr( &user->hdr_user_name, &user->uni_user_name );
++	}
+ 		
+ 	/* Prepare data */
+ 	
+Index: nsswitch/winbindd_pam.c
+===================================================================
+--- nsswitch/winbindd_pam.c	(revision 2082)
++++ nsswitch/winbindd_pam.c	(working copy)
+@@ -283,7 +283,7 @@
+ 	}
+ 	
+ 	if (NT_STATUS_IS_OK(result)) {
+-		netsamlogon_cache_store( cli->mem_ctx, &info3 );
++		netsamlogon_cache_store( cli->mem_ctx, name_user, &info3 );
+ 		wcache_invalidate_samlogon(find_domain_from_name(name_domain), &info3);
+ 
+ 		/* Check if the user is in the right group */
+@@ -538,7 +538,7 @@
+ 	}
+ 
+ 	if (NT_STATUS_IS_OK(result)) {
+-		netsamlogon_cache_store( cli->mem_ctx, &info3 );
++		netsamlogon_cache_store( cli->mem_ctx, name_user, &info3 );
+ 		wcache_invalidate_samlogon(find_domain_from_name(name_domain), &info3);
+ 		
+ 		if (!NT_STATUS_IS_OK(result = check_info3_in_group(mem_ctx, &info3, state->request.data.auth_crap.required_membership_sid))) {
+Index: auth/auth_domain.c
+===================================================================
+--- auth/auth_domain.c	(revision 2082)
++++ auth/auth_domain.c	(working copy)
+@@ -205,7 +205,7 @@
+ 	} else {
+ 		nt_status = make_server_info_info3(mem_ctx, user_info->internal_username.str, 
+ 						   user_info->smb_name.str, domain, server_info, &info3);
+-		netsamlogon_cache_store( mem_ctx, &info3 );
++		netsamlogon_cache_store( mem_ctx, user_info->smb_name.str, &info3 );
+ 	}
+ 
+ #if 0
diff --git a/net/samba3/files/samba.schema b/net/samba3/files/samba.schema
new file mode 100644
index 000000000000..17ea2d9fd2f6
--- /dev/null
+++ b/net/samba3/files/samba.schema
@@ -0,0 +1,471 @@
+##
+## schema file for OpenLDAP 2.x
+## Schema for storing Samba user accounts and group maps in LDAP
+## OIDs are owned by the Samba Team
+##
+## Prerequisite schemas - uid         (cosine.schema)
+##                      - displayName (inetorgperson.schema)
+##                      - gidNumber   (nis.schema)
+##
+## 1.3.6.1.4.1.7165.2.1.x - attributetypes
+## 1.3.6.1.4.1.7165.2.2.x - objectclasses
+##
+## ----- READ THIS WHEN ADDING A NEW ATTRIBUTE OR OBJECT CLASS ------
+##
+## Run the 'get_next_oid' bash script in this directory to find the 
+## next available OID for attribute type and object classes.
+##
+##   $ ./get_next_oid
+##   attributetype ( 1.3.6.1.4.1.7165.2.1.XX NAME ....
+##   objectclass ( 1.3.6.1.4.1.7165.2.2.XX NAME ....
+##
+## Also ensure that new entries adhere to the declaration style
+## used throughout this file
+##
+##    <attributetype|objectclass> ( 1.3.6.1.4.1.7165.2.XX.XX NAME ....
+##                               ^ ^                        ^
+##
+## The spaces are required for the get_next_oid script (and for 
+## readability).
+##
+## ------------------------------------------------------------------
+
+########################################################################
+##                            HISTORICAL                              ##
+########################################################################
+
+##
+## Password hashes
+##
+#attributetype ( 1.3.6.1.4.1.7165.2.1.1 NAME 'lmPassword'
+#	DESC 'LanManager Passwd'
+#	EQUALITY caseIgnoreIA5Match
+#	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+
+#attributetype ( 1.3.6.1.4.1.7165.2.1.2 NAME 'ntPassword'
+#	DESC 'NT Passwd'
+#	EQUALITY caseIgnoreIA5Match
+#	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+
+##
+## Account flags in string format ([UWDX     ])
+##
+#attributetype ( 1.3.6.1.4.1.7165.2.1.4 NAME 'acctFlags'
+#	DESC 'Account Flags'
+#	EQUALITY caseIgnoreIA5Match
+#	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{16} SINGLE-VALUE )
+
+##
+## Password timestamps & policies
+##
+#attributetype ( 1.3.6.1.4.1.7165.2.1.3 NAME 'pwdLastSet'
+#	DESC 'NT pwdLastSet'
+#	EQUALITY integerMatch
+#	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+#attributetype ( 1.3.6.1.4.1.7165.2.1.5 NAME 'logonTime'
+#	DESC 'NT logonTime'
+#	EQUALITY integerMatch
+#	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+#attributetype ( 1.3.6.1.4.1.7165.2.1.6 NAME 'logoffTime'
+#	DESC 'NT logoffTime'
+#	EQUALITY integerMatch
+#	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+#attributetype ( 1.3.6.1.4.1.7165.2.1.7 NAME 'kickoffTime'
+#	DESC 'NT kickoffTime'
+#	EQUALITY integerMatch
+#	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+#attributetype ( 1.3.6.1.4.1.7165.2.1.8 NAME 'pwdCanChange'
+#	DESC 'NT pwdCanChange'
+#	EQUALITY integerMatch
+#	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+#attributetype ( 1.3.6.1.4.1.7165.2.1.9 NAME 'pwdMustChange'
+#	DESC 'NT pwdMustChange'
+#	EQUALITY integerMatch
+#	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+##
+## string settings
+##
+#attributetype ( 1.3.6.1.4.1.7165.2.1.10 NAME 'homeDrive'
+#	DESC 'NT homeDrive'
+#	EQUALITY caseIgnoreIA5Match
+#	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{4} SINGLE-VALUE )
+
+#attributetype ( 1.3.6.1.4.1.7165.2.1.11 NAME 'scriptPath'
+#	DESC 'NT scriptPath'
+#	EQUALITY caseIgnoreIA5Match
+#	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} SINGLE-VALUE )
+
+#attributetype ( 1.3.6.1.4.1.7165.2.1.12 NAME 'profilePath'
+#	DESC 'NT profilePath'
+#	EQUALITY caseIgnoreIA5Match
+#	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} SINGLE-VALUE )
+
+#attributetype ( 1.3.6.1.4.1.7165.2.1.13 NAME 'userWorkstations'
+#	DESC 'userWorkstations'
+#	EQUALITY caseIgnoreIA5Match
+#	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} SINGLE-VALUE )
+
+#attributetype ( 1.3.6.1.4.1.7165.2.1.17 NAME 'smbHome'
+#	DESC 'smbHome'
+#	EQUALITY caseIgnoreIA5Match
+#	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} )
+
+#attributetype ( 1.3.6.1.4.1.7165.2.1.18 NAME 'domain'
+#	DESC 'Windows NT domain to which the user belongs'
+#	EQUALITY caseIgnoreIA5Match
+#	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} )
+
+##
+## user and group RID
+##
+#attributetype ( 1.3.6.1.4.1.7165.2.1.14 NAME 'rid'
+#	DESC 'NT rid'
+#	EQUALITY integerMatch
+#	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+#attributetype ( 1.3.6.1.4.1.7165.2.1.15 NAME 'primaryGroupID'
+#	DESC 'NT Group RID'
+#	EQUALITY integerMatch
+#	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+##
+## The smbPasswordEntry objectclass has been depreciated in favor of the
+## sambaAccount objectclass
+##
+#objectclass ( 1.3.6.1.4.1.7165.2.2.1 NAME 'smbPasswordEntry' SUP top AUXILIARY
+#        DESC 'Samba smbpasswd entry'
+#        MUST ( uid $ uidNumber )
+#        MAY  ( lmPassword $ ntPassword $ pwdLastSet $ acctFlags ))
+
+#objectclass ( 1.3.6.1.4.1.7165.2.2.2 NAME 'sambaAccount' SUP top STRUCTURAL
+#	DESC 'Samba Account'
+#	MUST ( uid $ rid )
+#	MAY  ( cn $ lmPassword $ ntPassword $ pwdLastSet $ logonTime $
+#               logoffTime $ kickoffTime $ pwdCanChange $ pwdMustChange $ acctFlags $
+#               displayName $ smbHome $ homeDrive $ scriptPath $ profilePath $
+#               description $ userWorkstations $ primaryGroupID $ domain ))
+
+#objectclass ( 1.3.6.1.4.1.7165.2.2.3 NAME 'sambaAccount' SUP top AUXILIARY
+#	DESC 'Samba Auxiliary Account'
+#	MUST ( uid $ rid )
+#	MAY  ( cn $ lmPassword $ ntPassword $ pwdLastSet $ logonTime $
+#              logoffTime $ kickoffTime $ pwdCanChange $ pwdMustChange $ acctFlags $
+#              displayName $ smbHome $ homeDrive $ scriptPath $ profilePath $
+#              description $ userWorkstations $ primaryGroupID $ domain ))
+
+########################################################################
+##                        END OF HISTORICAL                           ##
+########################################################################
+
+#######################################################################
+##                Attributes used by Samba 3.0 schema                ##
+#######################################################################
+
+##
+## Password hashes
+##
+attributetype ( 1.3.6.1.4.1.7165.2.1.24 NAME 'sambaLMPassword'
+	DESC 'LanManager Password'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.25 NAME 'sambaNTPassword'
+	DESC 'MD4 hash of the unicode password'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+
+##
+## Account flags in string format ([UWDX     ])
+##
+attributetype ( 1.3.6.1.4.1.7165.2.1.26 NAME 'sambaAcctFlags'
+	DESC 'Account Flags'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{16} SINGLE-VALUE )
+
+##
+## Password timestamps & policies
+##
+attributetype ( 1.3.6.1.4.1.7165.2.1.27 NAME 'sambaPwdLastSet'
+	DESC 'Timestamp of the last password update'
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.28 NAME 'sambaPwdCanChange'
+	DESC 'Timestamp of when the user is allowed to update the password'
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.29 NAME 'sambaPwdMustChange'
+	DESC 'Timestamp of when the password will expire'
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.30 NAME 'sambaLogonTime'
+	DESC 'Timestamp of last logon'
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.31 NAME 'sambaLogoffTime'
+	DESC 'Timestamp of last logoff'
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.32 NAME 'sambaKickoffTime'
+	DESC 'Timestamp of when the user will be logged off automatically'
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.48 NAME 'sambaBadPasswordCount'
+	DESC 'Bad password attempt count'
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.49 NAME 'sambaBadPasswordTime'
+	DESC 'Time of the last bad password attempt'
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.55 NAME 'sambaLogonHours'
+	DESC 'Logon Hours'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{42} SINGLE-VALUE )
+
+##
+## string settings
+##
+attributetype ( 1.3.6.1.4.1.7165.2.1.33 NAME 'sambaHomeDrive'
+	DESC 'Driver letter of home directory mapping'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{4} SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.34 NAME 'sambaLogonScript'
+	DESC 'Logon script path'
+	EQUALITY caseIgnoreMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{255} SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.35 NAME 'sambaProfilePath'
+	DESC 'Roaming profile path'
+	EQUALITY caseIgnoreMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{255} SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.36 NAME 'sambaUserWorkstations'
+	DESC 'List of user workstations the user is allowed to logon to'
+	EQUALITY caseIgnoreMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{255} SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.37 NAME 'sambaHomePath'
+	DESC 'Home directory UNC path'
+	EQUALITY caseIgnoreMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.38 NAME 'sambaDomainName'
+	DESC 'Windows NT domain to which the user belongs'
+	EQUALITY caseIgnoreMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.47 NAME 'sambaMungedDial'
+	DESC ''
+	EQUALITY caseExactMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.54 NAME 'sambaPasswordHistory'
+	DESC 'Concatenated MD4 hashes of the unicode passwords used on this account'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} )
+
+##
+## SID, of any type
+##
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.20 NAME 'sambaSID'
+	DESC 'Security ID'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{64} SINGLE-VALUE )
+
+
+##
+## Primary group SID, compatible with ntSid
+##
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.23 NAME 'sambaPrimaryGroupSID'
+	DESC 'Primary Group Security ID'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{64} SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.51 NAME 'sambaSIDList'
+	DESC 'Security ID List'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{64} )
+
+##
+## group mapping attributes
+##
+attributetype ( 1.3.6.1.4.1.7165.2.1.19 NAME 'sambaGroupType'
+	DESC 'NT Group Type'
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+##
+## Store info on the domain
+##
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.21 NAME 'sambaNextUserRid'
+	DESC 'Next NT rid to give our for users'
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.22 NAME 'sambaNextGroupRid'
+	DESC 'Next NT rid to give out for groups'
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.39 NAME 'sambaNextRid'
+	DESC 'Next NT rid to give out for anything'
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.40 NAME 'sambaAlgorithmicRidBase'
+	DESC 'Base at which the samba RID generation algorithm should operate'
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.41 NAME 'sambaShareName'
+	DESC 'Share Name'
+	EQUALITY caseIgnoreMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.42 NAME 'sambaOptionName'
+	DESC 'Option Name'
+	EQUALITY caseIgnoreMatch
+	SUBSTR caseIgnoreSubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.43 NAME 'sambaBoolOption'
+	DESC 'A boolean option'
+	EQUALITY booleanMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.44 NAME 'sambaIntegerOption'
+	DESC 'An integer option'
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.45 NAME 'sambaStringOption'
+	DESC 'A string option'
+	EQUALITY caseExactIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.46 NAME 'sambaStringListOption'
+	DESC 'A string list option'
+	EQUALITY caseIgnoreMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.50 NAME 'sambaPrivName' 
+	SUP name )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.52 NAME 'sambaPrivilegeList'
+	DESC 'Privileges List'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{64} )
+
+attributetype ( 1.3.6.1.4.1.7165.2.1.53 NAME 'sambaTrustFlags'
+	DESC 'Trust Password Flags'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+
+#######################################################################
+##              objectClasses used by Samba 3.0 schema               ##
+#######################################################################
+
+## The X.500 data model (and therefore LDAPv3) says that each entry can
+## only have one structural objectclass.  OpenLDAP 2.0 does not enforce
+## this currently but will in v2.1
+
+##
+## added new objectclass (and OID) for 3.0 to help us deal with backwards
+## compatibility with 2.2 installations (e.g. ldapsam_compat)  --jerry
+##
+objectclass ( 1.3.6.1.4.1.7165.2.2.6 NAME 'sambaSamAccount' SUP top AUXILIARY
+	DESC 'Samba 3.0 Auxilary SAM Account'
+	MUST ( uid $ sambaSID )
+	MAY  ( cn $ sambaLMPassword $ sambaNTPassword $ sambaPwdLastSet $
+	       sambaLogonTime $ sambaLogoffTime $ sambaKickoffTime $
+	       sambaPwdCanChange $ sambaPwdMustChange $ sambaAcctFlags $
+               displayName $ sambaHomePath $ sambaHomeDrive $ sambaLogonScript $
+	       sambaProfilePath $ description $ sambaUserWorkstations $
+	       sambaPrimaryGroupSID $ sambaDomainName $ sambaMungedDial $
+	       sambaBadPasswordCount $ sambaBadPasswordTime $
+	       sambaPasswordHistory $ sambaLogonHours))
+
+##
+## Group mapping info
+##
+objectclass ( 1.3.6.1.4.1.7165.2.2.4 NAME 'sambaGroupMapping' SUP top AUXILIARY
+	DESC 'Samba Group Mapping'
+	MUST ( gidNumber $ sambaSID $ sambaGroupType )
+	MAY  ( displayName $ description $ sambaSIDList ))
+
+##
+## Trust password for trust relationships (any kind)
+##
+objectclass ( 1.3.6.1.4.1.7165.2.2.14 NAME 'sambaTrustPassword' SUP top STRUCTURAL
+	DESC 'Samba Trust Password'
+	MUST ( sambaDomainName $ sambaNTPassword $ sambaTrustFlags )
+	MAY ( sambaSID $ sambaPwdLastSet ))
+
+##
+## Whole-of-domain info
+##
+objectclass ( 1.3.6.1.4.1.7165.2.2.5 NAME 'sambaDomain' SUP top STRUCTURAL
+	DESC 'Samba Domain Information'
+	MUST ( sambaDomainName $ 
+	       sambaSID ) 
+	MAY ( sambaNextRid $ sambaNextGroupRid $ sambaNextUserRid $
+	      sambaAlgorithmicRidBase ) )
+
+##
+## used for idmap_ldap module
+##
+objectclass ( 1.3.6.1.4.1.7165.2.2.7 NAME 'sambaUnixIdPool' SUP top AUXILIARY
+        DESC 'Pool for allocating UNIX uids/gids'
+        MUST ( uidNumber $ gidNumber ) )
+
+
+objectclass ( 1.3.6.1.4.1.7165.2.2.8 NAME 'sambaIdmapEntry' SUP top AUXILIARY
+        DESC 'Mapping from a SID to an ID'
+        MUST ( sambaSID )
+	MAY ( uidNumber $ gidNumber ) )
+
+objectclass ( 1.3.6.1.4.1.7165.2.2.9 NAME 'sambaSidEntry' SUP top STRUCTURAL
+	DESC 'Structural Class for a SID'
+	MUST ( sambaSID ) )
+
+objectclass ( 1.3.6.1.4.1.7165.1.2.2.10 NAME 'sambaConfig' SUP top AUXILIARY
+	DESC 'Samba Configuration Section'
+	MAY ( description ) )
+
+objectclass ( 1.3.6.1.4.1.7165.2.2.11 NAME 'sambaShare' SUP top STRUCTURAL
+	DESC 'Samba Share Section'
+	MUST ( sambaShareName )
+	MAY ( description ) )
+
+objectclass ( 1.3.6.1.4.1.7165.2.2.12 NAME 'sambaConfigOption' SUP top STRUCTURAL
+	DESC 'Samba Configuration Option'
+	MUST ( sambaOptionName )
+	MAY ( sambaBoolOption $ sambaIntegerOption $ sambaStringOption $ 
+	      sambaStringListoption $ description ) )
+
+
+objectclass ( 1.3.6.1.4.1.7165.2.2.13 NAME 'sambaPrivilege' SUP top AUXILIARY
+	DESC 'Samba Privilege'
+	MUST ( sambaSID )
+	MAY ( sambaPrivilegeList ) )
+
diff --git a/net/samba3/files/smb.conf.default b/net/samba3/files/smb.conf.default
index 860441415069..317d7131a00b 100644
--- a/net/samba3/files/smb.conf.default
+++ b/net/samba3/files/smb.conf.default
@@ -3,8 +3,13 @@
 # here. Samba has a huge number of configurable options (perhaps too
 # many!) most of which are not shown in this example
 #
-# For a step by step guide on installing, configuring and using samba, 
-# read the Samba HOWTO Collection.
+# For a step to step guide on installing, configuring and using samba, 
+# read the Samba-HOWTO-Collection. This may be obtained from:
+#  http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf
+#
+# Many working examples of smb.conf files can be found in the 
+# Samba-Guide which is generated daily and can be downloaded from: 
+#  http://www.samba.org/samba/docs/Samba-Guide.pdf
 #
 # Any line which starts with a ; (semi-colon) or a # (hash) 
 # is a comment and is ignored. In this example we will use a #
@@ -17,7 +22,7 @@
 #======================= Global Settings =====================================
 [global]
 
-# workgroup = NT-Domain-Name or Workgroup-Name, eg: REDHAT4
+# workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH
    workgroup = MYGROUP
 
 # server string is the equivalent of the NT Description field
@@ -25,7 +30,7 @@
 
 # Security mode. Defines in which mode Samba will operate. Possible 
 # values are share, user, server, domain and ads. Most people will want 
-# user level security. See the HOWTO Collection for details.
+# user level security. See the Samba-HOWTO-Collection for details.
    security = user
 
 # This option is important for security. It allows you to restrict
@@ -163,6 +168,7 @@
 ;  delete user from group script = /usr/sbin/deluser %u %g
 ;  delete group script = /usr/sbin/groupdel %g
 
+
 #============================ Share Definitions ==============================
 [homes]
    comment = Home Directories
diff --git a/net/samba3/pkg-plist b/net/samba3/pkg-plist
index 6a53e2d5a203..673bad109410 100644
--- a/net/samba3/pkg-plist
+++ b/net/samba3/pkg-plist
@@ -45,6 +45,7 @@ lib/samba/vfs/default_quota.so
 lib/samba/vfs/expand_msdfs.so
 lib/samba/vfs/extd_audit.so
 lib/samba/vfs/fake_perms.so
+lib/samba/vfs/full_audit.so
 %%I18N%%lib/samba/vfs/hex.so
 lib/samba/vfs/netatalk.so
 lib/samba/vfs/readonly.so
@@ -204,195 +205,10 @@ lib/samba/charset/CP850.so
 %%PORTDOCS%%%%DOCSDIR%%/Roadmap
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/WHATSNEW.txt
-%%PORTDOCS%%%%DOCSDIR%%/devel/CodingSuggestions.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/Packaging.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/architecture.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/contributing.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/debug.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/index.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/internals.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/modules.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/netbios.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/ntdomain.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/parsing.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/pr01.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/printing.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/pt01.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/pt02.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/pt03.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/pt04.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/pt05.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/pwencrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/registry.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/rpc-plugin.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/sam.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/samba.css
-%%PORTDOCS%%%%DOCSDIR%%/devel/tracing.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/unix-smb.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/vfs.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/windows-debug.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/wins.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/2000users.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/Big500users.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/DomApps.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/HA.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/appendix.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/go01.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/happy.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/AccountingNetwork.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/Charity-Network.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/Domain-WorkgroupAnnouncement.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/HostAnnouncment.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/LocalMasterAnnouncement.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/NullConnect.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/UNIX-Samba-and-LDAP.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/UserConnect.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/UserMgrNT4.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/WINREPRESSME-Capture.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/WINREPRESSME-Capture2.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/WindowsXP-NullConnection.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/WindowsXP-UserConnection.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/XP-screen001.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/acct2net.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/ch7-dual-additive-LDAP-Ok.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/ch7-dual-additive-LDAP.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/ch7-fail-overLDAP.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/ch7-singleLDAP.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/ch8-migration.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap4-net.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap5-net.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap6-net.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap7-idresol.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap7-net-A.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap7-net-Ar.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap7-net.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap7-net2-B.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap7-net2-Br.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap7-net2.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap7-net2r.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap7-netr.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap9-ADSDC.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/chap9-SambaDC.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/lam-config.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/lam-group-members.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/lam-groups.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/lam-hosts.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/lam-login.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/lam-users.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/openmag.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/wxpp001.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/wxpp004.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/wxpp006.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/wxpp007.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/wxpp008.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/wxpp010.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/wxpp011.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/wxpp012.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/wxpp013.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/images/wxpp015.png
-%%PORTDOCS%%%%DOCSDIR%%/guide/index.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/ix01.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/kerberos.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/migration.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/pr01.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/pr02.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/pr03.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/preface.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/primer.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/samba.css
-%%PORTDOCS%%%%DOCSDIR%%/guide/secure.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/simple.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/small.html
-%%PORTDOCS%%%%DOCSDIR%%/guide/unixclients.html
+%%PORTDOCS%%%%DOCSDIR%%/Samba-Developers-Guide.pdf
+%%PORTDOCS%%%%DOCSDIR%%/Samba-Guide.pdf
+%%PORTDOCS%%%%DOCSDIR%%/Samba-HOWTO-Collection.pdf
 %%PORTDOCS%%%%DOCSDIR%%/history
-%%PORTDOCS%%%%DOCSDIR%%/howto/AccessControls.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/AdvancedNetworkManagement.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/Appendix.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/Backup.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/CUPS-printing.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/ClientConfig.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/DNSDHCP.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/FastStart.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/InterdomainTrusts.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/IntroSMB.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/NT4Migration.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/NetworkBrowsing.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/Other-Clients.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/PolicyMgmt.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/Portability.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/ProfileMgmt.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/SWAT.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/SambaHA.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/ServerType.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/StandAloneServer.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/VFS.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/bugreport.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/compiling.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/diagnosis.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/domain-member.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/go01.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/groupmapping.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/10small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/11small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/12small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/13small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/14small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/1small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/2small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/3small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/4small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/5small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/6small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/7small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/8small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/9small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/a_small.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/access1.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/browsing1.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/cups1.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/cups2.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/domain.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/ethereal1.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/ethereal2.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/idmap-gid2sid.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/idmap-groups.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/idmap-sid2gid.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/idmap-sid2uid.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/idmap-store-gid2sid.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/idmap-uid2sid.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/idmap.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/idmap_winbind_no_loop.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/pdftoepsonusb.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/pdftosocket.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/images/trusts1.png
-%%PORTDOCS%%%%DOCSDIR%%/howto/index.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/install.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/integrate-ms-networks.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/introduction.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/ix01.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/locking.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/migration.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/msdfs.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/optional.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/pam.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/passdb.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/pr01.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/pr02.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/pr03.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/printing.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/problems.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/samba-bdc.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/samba-pdc.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/samba.css
-%%PORTDOCS%%%%DOCSDIR%%/howto/securing-samba.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/speed.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/troubleshooting.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/type.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/unicode.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/upgrading-to-3.0.html
-%%PORTDOCS%%%%DOCSDIR%%/howto/winbind.html
 %%PORTDOCS%%%%DOCSDIR%%/registry/FolderRedir.adm
 %%PORTDOCS%%%%DOCSDIR%%/registry/NT4-Locking.reg
 %%PORTDOCS%%%%DOCSDIR%%/registry/NT4_PlainPassword.reg
@@ -408,201 +224,205 @@ lib/samba/charset/CP850.so
 %%PORTDOCS%%%%DOCSDIR%%/registry/WinXP_SignOrSeal.reg
 %%PORTDOCS%%%%DOCSDIR%%/registry/WindowsTerminalServer.reg
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/registry
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/howto/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/howto
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/guide/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/guide
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/devel
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-share/swat/help/devel/CodingSuggestions.html
-share/swat/help/devel/Packaging.html
-share/swat/help/devel/architecture.html
-share/swat/help/devel/contributing.html
-share/swat/help/devel/debug.html
-share/swat/help/devel/index.html
-share/swat/help/devel/internals.html
-share/swat/help/devel/modules.html
-share/swat/help/devel/netbios.html
-share/swat/help/devel/ntdomain.html
-share/swat/help/devel/parsing.html
-share/swat/help/devel/pr01.html
-share/swat/help/devel/printing.html
-share/swat/help/devel/pt01.html
-share/swat/help/devel/pt02.html
-share/swat/help/devel/pt03.html
-share/swat/help/devel/pt04.html
-share/swat/help/devel/pt05.html
-share/swat/help/devel/pwencrypt.html
-share/swat/help/devel/registry.html
-share/swat/help/devel/rpc-plugin.html
-share/swat/help/devel/sam.html
-share/swat/help/devel/tracing.html
-share/swat/help/devel/unix-smb.html
-share/swat/help/devel/vfs.html
-share/swat/help/devel/windows-debug.html
-share/swat/help/devel/wins.html
+share/swat/help/Samba-Developers-Guide/CodingSuggestions.html
+share/swat/help/Samba-Developers-Guide/Packaging.html
+share/swat/help/Samba-Developers-Guide/architecture.html
+share/swat/help/Samba-Developers-Guide/contributing.html
+share/swat/help/Samba-Developers-Guide/debug.html
+share/swat/help/Samba-Developers-Guide/index.html
+share/swat/help/Samba-Developers-Guide/internals.html
+share/swat/help/Samba-Developers-Guide/modules.html
+share/swat/help/Samba-Developers-Guide/netbios.html
+share/swat/help/Samba-Developers-Guide/ntdomain.html
+share/swat/help/Samba-Developers-Guide/parsing.html
+share/swat/help/Samba-Developers-Guide/pr01.html
+share/swat/help/Samba-Developers-Guide/printing.html
+share/swat/help/Samba-Developers-Guide/pt01.html
+share/swat/help/Samba-Developers-Guide/pt02.html
+share/swat/help/Samba-Developers-Guide/pt03.html
+share/swat/help/Samba-Developers-Guide/pt04.html
+share/swat/help/Samba-Developers-Guide/pt05.html
+share/swat/help/Samba-Developers-Guide/pwencrypt.html
+share/swat/help/Samba-Developers-Guide/registry.html
+share/swat/help/Samba-Developers-Guide/rpc-plugin.html
+share/swat/help/Samba-Developers-Guide/tracing.html
+share/swat/help/Samba-Developers-Guide/unix-smb.html
+share/swat/help/Samba-Developers-Guide/vfs.html
+share/swat/help/Samba-Developers-Guide/windows-debug.html
+share/swat/help/Samba-Developers-Guide/wins.html
+share/swat/help/Samba-Guide/2000users.html
+share/swat/help/Samba-Guide/AccountingNetwork.png
+share/swat/help/Samba-Guide/Big500users.html
+share/swat/help/Samba-Guide/Charity-Network.png
+share/swat/help/Samba-Guide/DomApps.html
+share/swat/help/Samba-Guide/HA.html
+share/swat/help/Samba-Guide/HostAnnouncment.png
+share/swat/help/Samba-Guide/NullConnect.png
+share/swat/help/Samba-Guide/UNIX-Samba-and-LDAP.png
+share/swat/help/Samba-Guide/UserConnect.png
+share/swat/help/Samba-Guide/UserMgrNT4.png
+share/swat/help/Samba-Guide/WINREPRESSME-Capture.png
+share/swat/help/Samba-Guide/WINREPRESSME-Capture2.png
+share/swat/help/Samba-Guide/WindowsXP-NullConnection.png
+share/swat/help/Samba-Guide/WindowsXP-UserConnection.png
+share/swat/help/Samba-Guide/XP-screen001.png
+share/swat/help/Samba-Guide/acct2net.png
+share/swat/help/Samba-Guide/appendix.html
+share/swat/help/Samba-Guide/ch7-dual-additive-LDAP-Ok.png
+share/swat/help/Samba-Guide/ch7-dual-additive-LDAP.png
+share/swat/help/Samba-Guide/ch7-fail-overLDAP.png
+share/swat/help/Samba-Guide/ch7-singleLDAP.png
+share/swat/help/Samba-Guide/ch8-migration.png
+share/swat/help/Samba-Guide/chap4-net.png
+share/swat/help/Samba-Guide/chap5-net.png
+share/swat/help/Samba-Guide/chap6-net.png
+share/swat/help/Samba-Guide/chap7-idresol.png
+share/swat/help/Samba-Guide/chap7-net-Ar.png
+share/swat/help/Samba-Guide/chap7-net2-Br.png
+share/swat/help/Samba-Guide/chap9-ADSDC.png
+share/swat/help/Samba-Guide/chap9-SambaDC.png
+share/swat/help/Samba-Guide/go01.html
+share/swat/help/Samba-Guide/gpl.html
+share/swat/help/Samba-Guide/happy.html
+share/swat/help/Samba-Guide/index.html
+share/swat/help/Samba-Guide/ix01.html
+share/swat/help/Samba-Guide/kerberos.html
+share/swat/help/Samba-Guide/lam-config.png
+share/swat/help/Samba-Guide/lam-group-members.png
+share/swat/help/Samba-Guide/lam-groups.png
+share/swat/help/Samba-Guide/lam-hosts.png
+share/swat/help/Samba-Guide/lam-login.png
+share/swat/help/Samba-Guide/lam-users.png
+share/swat/help/Samba-Guide/migration.html
+share/swat/help/Samba-Guide/openmag.png
+share/swat/help/Samba-Guide/pr01.html
+share/swat/help/Samba-Guide/pr02.html
+share/swat/help/Samba-Guide/pr03.html
+share/swat/help/Samba-Guide/preface.html
+share/swat/help/Samba-Guide/primer.html
+share/swat/help/Samba-Guide/secure.html
+share/swat/help/Samba-Guide/simple.html
+share/swat/help/Samba-Guide/small.html
+share/swat/help/Samba-Guide/unixclients.html
+share/swat/help/Samba-Guide/wxpp001.png
+share/swat/help/Samba-Guide/wxpp004.png
+share/swat/help/Samba-Guide/wxpp006.png
+share/swat/help/Samba-Guide/wxpp007.png
+share/swat/help/Samba-Guide/wxpp008.png
+share/swat/help/Samba-HOWTO-Collection/10small.png
+share/swat/help/Samba-HOWTO-Collection/11small.png
+share/swat/help/Samba-HOWTO-Collection/12small.png
+share/swat/help/Samba-HOWTO-Collection/13small.png
+share/swat/help/Samba-HOWTO-Collection/14small.png
+share/swat/help/Samba-HOWTO-Collection/1small.png
+share/swat/help/Samba-HOWTO-Collection/2small.png
+share/swat/help/Samba-HOWTO-Collection/3small.png
+share/swat/help/Samba-HOWTO-Collection/4small.png
+share/swat/help/Samba-HOWTO-Collection/5small.png
+share/swat/help/Samba-HOWTO-Collection/6small.png
+share/swat/help/Samba-HOWTO-Collection/7small.png
+share/swat/help/Samba-HOWTO-Collection/8small.png
+share/swat/help/Samba-HOWTO-Collection/9small.png
+share/swat/help/Samba-HOWTO-Collection/AccessControls.html
+share/swat/help/Samba-HOWTO-Collection/AdvancedNetworkManagement.html
+share/swat/help/Samba-HOWTO-Collection/Appendix.html
+share/swat/help/Samba-HOWTO-Collection/Backup.html
+share/swat/help/Samba-HOWTO-Collection/CUPS-printing.html
+share/swat/help/Samba-HOWTO-Collection/ClientConfig.html
+share/swat/help/Samba-HOWTO-Collection/DNSDHCP.html
+share/swat/help/Samba-HOWTO-Collection/FastStart.html
+share/swat/help/Samba-HOWTO-Collection/InterdomainTrusts.html
+share/swat/help/Samba-HOWTO-Collection/IntroSMB.html
+share/swat/help/Samba-HOWTO-Collection/NT4Migration.html
+share/swat/help/Samba-HOWTO-Collection/NetworkBrowsing.html
+share/swat/help/Samba-HOWTO-Collection/Other-Clients.html
+share/swat/help/Samba-HOWTO-Collection/PolicyMgmt.html
+share/swat/help/Samba-HOWTO-Collection/Portability.html
+share/swat/help/Samba-HOWTO-Collection/ProfileMgmt.html
+share/swat/help/Samba-HOWTO-Collection/SWAT.html
+share/swat/help/Samba-HOWTO-Collection/SambaHA.html
+share/swat/help/Samba-HOWTO-Collection/ServerType.html
+share/swat/help/Samba-HOWTO-Collection/StandAloneServer.html
+share/swat/help/Samba-HOWTO-Collection/VFS.html
+share/swat/help/Samba-HOWTO-Collection/WME001.png
+share/swat/help/Samba-HOWTO-Collection/WME002.png
+share/swat/help/Samba-HOWTO-Collection/WME003.png
+share/swat/help/Samba-HOWTO-Collection/WME005.png
+share/swat/help/Samba-HOWTO-Collection/WME009.png
+share/swat/help/Samba-HOWTO-Collection/WME010.png
+share/swat/help/Samba-HOWTO-Collection/WME013.png
+share/swat/help/Samba-HOWTO-Collection/WME014.png
+share/swat/help/Samba-HOWTO-Collection/WXPP002.png
+share/swat/help/Samba-HOWTO-Collection/WXPP003.png
+share/swat/help/Samba-HOWTO-Collection/WXPP005.png
+share/swat/help/Samba-HOWTO-Collection/WXPP009.png
+share/swat/help/Samba-HOWTO-Collection/WXPP014.png
+share/swat/help/Samba-HOWTO-Collection/a_small.png
+share/swat/help/Samba-HOWTO-Collection/access1.png
+share/swat/help/Samba-HOWTO-Collection/browsing1.png
+share/swat/help/Samba-HOWTO-Collection/bugreport.html
+share/swat/help/Samba-HOWTO-Collection/compiling.html
+share/swat/help/Samba-HOWTO-Collection/cups1.png
+share/swat/help/Samba-HOWTO-Collection/cups2.png
+share/swat/help/Samba-HOWTO-Collection/diagnosis.html
+share/swat/help/Samba-HOWTO-Collection/domain-member.html
+share/swat/help/Samba-HOWTO-Collection/domain.png
+share/swat/help/Samba-HOWTO-Collection/ethereal1.png
+share/swat/help/Samba-HOWTO-Collection/ethereal2.png
+share/swat/help/Samba-HOWTO-Collection/go01.html
+share/swat/help/Samba-HOWTO-Collection/gpl.html
+share/swat/help/Samba-HOWTO-Collection/groupmapping.html
+share/swat/help/Samba-HOWTO-Collection/idmap-gid2sid.png
+share/swat/help/Samba-HOWTO-Collection/idmap-sid2gid.png
+share/swat/help/Samba-HOWTO-Collection/idmap-sid2uid.png
+share/swat/help/Samba-HOWTO-Collection/idmap-store-gid2sid.png
+share/swat/help/Samba-HOWTO-Collection/idmap-uid2sid.png
+share/swat/help/Samba-HOWTO-Collection/idmap_winbind_no_loop.png
+share/swat/help/Samba-HOWTO-Collection/index.html
+share/swat/help/Samba-HOWTO-Collection/install.html
+share/swat/help/Samba-HOWTO-Collection/integrate-ms-networks.html
+share/swat/help/Samba-HOWTO-Collection/introduction.html
+share/swat/help/Samba-HOWTO-Collection/ix01.html
+share/swat/help/Samba-HOWTO-Collection/locking.html
+share/swat/help/Samba-HOWTO-Collection/migration.html
+share/swat/help/Samba-HOWTO-Collection/msdfs.html
+share/swat/help/Samba-HOWTO-Collection/optional.html
+share/swat/help/Samba-HOWTO-Collection/pam.html
+share/swat/help/Samba-HOWTO-Collection/passdb.html
+share/swat/help/Samba-HOWTO-Collection/pdftoepsonusb.png
+share/swat/help/Samba-HOWTO-Collection/pdftosocket.png
+share/swat/help/Samba-HOWTO-Collection/pr01.html
+share/swat/help/Samba-HOWTO-Collection/pr02.html
+share/swat/help/Samba-HOWTO-Collection/pr03.html
+share/swat/help/Samba-HOWTO-Collection/printing.html
+share/swat/help/Samba-HOWTO-Collection/problems.html
+share/swat/help/Samba-HOWTO-Collection/samba-bdc.html
+share/swat/help/Samba-HOWTO-Collection/samba-pdc.html
+share/swat/help/Samba-HOWTO-Collection/securing-samba.html
+share/swat/help/Samba-HOWTO-Collection/speed.html
+share/swat/help/Samba-HOWTO-Collection/troubleshooting.html
+share/swat/help/Samba-HOWTO-Collection/trusts1.png
+share/swat/help/Samba-HOWTO-Collection/type.html
+share/swat/help/Samba-HOWTO-Collection/unicode.html
+share/swat/help/Samba-HOWTO-Collection/upgrading-to-3.0.html
+share/swat/help/Samba-HOWTO-Collection/w2kp001.png
+share/swat/help/Samba-HOWTO-Collection/w2kp002.png
+share/swat/help/Samba-HOWTO-Collection/w2kp003.png
+share/swat/help/Samba-HOWTO-Collection/w2kp004.png
+share/swat/help/Samba-HOWTO-Collection/w2kp005.png
+share/swat/help/Samba-HOWTO-Collection/winbind.html
+share/swat/help/Samba-HOWTO-Collection/wxpp001.png
+share/swat/help/Samba-HOWTO-Collection/wxpp004.png
+share/swat/help/Samba-HOWTO-Collection/wxpp006.png
+share/swat/help/Samba-HOWTO-Collection/wxpp007.png
+share/swat/help/Samba-HOWTO-Collection/wxpp008.png
 share/swat/help/editreg.1.html
 share/swat/help/findsmb.1.html
-share/swat/help/guide/2000users.html
-share/swat/help/guide/AccountingNetwork.png
-share/swat/help/guide/Big500users.html
-share/swat/help/guide/Charity-Network.png
-share/swat/help/guide/DomApps.html
-share/swat/help/guide/Domain-WorkgroupAnnouncement.png
-share/swat/help/guide/HA.html
-share/swat/help/guide/HostAnnouncment.png
-share/swat/help/guide/LocalMasterAnnouncement.png
-share/swat/help/guide/NullConnect.png
-share/swat/help/guide/UNIX-Samba-and-LDAP.png
-share/swat/help/guide/UserConnect.png
-share/swat/help/guide/UserMgrNT4.png
-share/swat/help/guide/WINREPRESSME-Capture.png
-share/swat/help/guide/WINREPRESSME-Capture2.png
-share/swat/help/guide/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png
-share/swat/help/guide/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png
-share/swat/help/guide/WindowsXP-NullConnection.png
-share/swat/help/guide/WindowsXP-UserConnection.png
-share/swat/help/guide/XP-screen001.png
-share/swat/help/guide/acct2net.png
-share/swat/help/guide/appendix.html
-share/swat/help/guide/ch7-dual-additive-LDAP-Ok.png
-share/swat/help/guide/ch7-dual-additive-LDAP.png
-share/swat/help/guide/ch7-fail-overLDAP.png
-share/swat/help/guide/ch7-singleLDAP.png
-share/swat/help/guide/ch8-migration.png
-share/swat/help/guide/chap4-net.png
-share/swat/help/guide/chap5-net.png
-share/swat/help/guide/chap6-net.png
-share/swat/help/guide/chap7-idresol.png
-share/swat/help/guide/chap7-net-A.png
-share/swat/help/guide/chap7-net-Ar.png
-share/swat/help/guide/chap7-net.png
-share/swat/help/guide/chap7-net2-B.png
-share/swat/help/guide/chap7-net2-Br.png
-share/swat/help/guide/chap7-net2.png
-share/swat/help/guide/chap7-net2r.png
-share/swat/help/guide/chap7-netr.png
-share/swat/help/guide/chap9-ADSDC.png
-share/swat/help/guide/chap9-SambaDC.png
-share/swat/help/guide/go01.html
-share/swat/help/guide/happy.html
-share/swat/help/guide/index.html
-share/swat/help/guide/ix01.html
-share/swat/help/guide/kerberos.html
-share/swat/help/guide/lam-config.png
-share/swat/help/guide/lam-group-members.png
-share/swat/help/guide/lam-groups.png
-share/swat/help/guide/lam-hosts.png
-share/swat/help/guide/lam-login.png
-share/swat/help/guide/lam-users.png
-share/swat/help/guide/migration.html
-share/swat/help/guide/openmag.png
-share/swat/help/guide/pr01.html
-share/swat/help/guide/pr02.html
-share/swat/help/guide/pr03.html
-share/swat/help/guide/preface.html
-share/swat/help/guide/primer.html
-share/swat/help/guide/secure.html
-share/swat/help/guide/simple.html
-share/swat/help/guide/small.html
-share/swat/help/guide/unixclients.html
-share/swat/help/guide/wxpp001.png
-share/swat/help/guide/wxpp004.png
-share/swat/help/guide/wxpp006.png
-share/swat/help/guide/wxpp007.png
-share/swat/help/guide/wxpp008.png
-share/swat/help/guide/wxpp010.png
-share/swat/help/guide/wxpp011.png
-share/swat/help/guide/wxpp012.png
-share/swat/help/guide/wxpp013.png
-share/swat/help/guide/wxpp015.png
-share/swat/help/howto/10small.png
-share/swat/help/howto/11small.png
-share/swat/help/howto/12small.png
-share/swat/help/howto/13small.png
-share/swat/help/howto/14small.png
-share/swat/help/howto/1small.png
-share/swat/help/howto/2small.png
-share/swat/help/howto/3small.png
-share/swat/help/howto/4small.png
-share/swat/help/howto/5small.png
-share/swat/help/howto/6small.png
-share/swat/help/howto/7small.png
-share/swat/help/howto/8small.png
-share/swat/help/howto/9small.png
-share/swat/help/howto/AccessControls.html
-share/swat/help/howto/AdvancedNetworkManagement.html
-share/swat/help/howto/Appendix.html
-share/swat/help/howto/Backup.html
-share/swat/help/howto/CUPS-printing.html
-share/swat/help/howto/ClientConfig.html
-share/swat/help/howto/DNSDHCP.html
-share/swat/help/howto/FastStart.html
-share/swat/help/howto/InterdomainTrusts.html
-share/swat/help/howto/IntroSMB.html
-share/swat/help/howto/NT4Migration.html
-share/swat/help/howto/NetworkBrowsing.html
-share/swat/help/howto/Other-Clients.html
-share/swat/help/howto/PolicyMgmt.html
-share/swat/help/howto/Portability.html
-share/swat/help/howto/ProfileMgmt.html
-share/swat/help/howto/SWAT.html
-share/swat/help/howto/SambaHA.html
-share/swat/help/howto/ServerType.html
-share/swat/help/howto/StandAloneServer.html
-share/swat/help/howto/VFS.html
-share/swat/help/howto/a_small.png
-share/swat/help/howto/access1.png
-share/swat/help/howto/browsing1.png
-share/swat/help/howto/bugreport.html
-share/swat/help/howto/compiling.html
-share/swat/help/howto/cups1.png
-share/swat/help/howto/cups2.png
-share/swat/help/howto/diagnosis.html
-share/swat/help/howto/domain-member.html
-share/swat/help/howto/domain.png
-share/swat/help/howto/ethereal1.png
-share/swat/help/howto/ethereal2.png
-share/swat/help/howto/go01.html
-share/swat/help/howto/groupmapping.html
-share/swat/help/howto/idmap-gid2sid.png
-share/swat/help/howto/idmap-groups.png
-share/swat/help/howto/idmap-sid2gid.png
-share/swat/help/howto/idmap-sid2uid.png
-share/swat/help/howto/idmap-store-gid2sid.png
-share/swat/help/howto/idmap-uid2sid.png
-share/swat/help/howto/idmap.png
-share/swat/help/howto/idmap_winbind_no_loop.png
-share/swat/help/howto/index.html
-share/swat/help/howto/install.html
-share/swat/help/howto/integrate-ms-networks.html
-share/swat/help/howto/introduction.html
-share/swat/help/howto/ix01.html
-share/swat/help/howto/locking.html
-share/swat/help/howto/migration.html
-share/swat/help/howto/msdfs.html
-share/swat/help/howto/optional.html
-share/swat/help/howto/pam.html
-share/swat/help/howto/passdb.html
-share/swat/help/howto/pdftoepsonusb.png
-share/swat/help/howto/pdftosocket.png
-share/swat/help/howto/pr01.html
-share/swat/help/howto/pr02.html
-share/swat/help/howto/pr03.html
-share/swat/help/howto/printing.html
-share/swat/help/howto/problems.html
-share/swat/help/howto/samba-bdc.html
-share/swat/help/howto/samba-pdc.html
-share/swat/help/howto/securing-samba.html
-share/swat/help/howto/speed.html
-share/swat/help/howto/troubleshooting.html
-share/swat/help/howto/trusts1.png
-share/swat/help/howto/type.html
-share/swat/help/howto/unicode.html
-share/swat/help/howto/upgrading-to-3.0.html
-share/swat/help/howto/winbind.html
+share/swat/help/index.html
 share/swat/help/lmhosts.5.html
 share/swat/help/log2pcap.1.html
+share/swat/help/manpages.html
 share/swat/help/mount.cifs.8.html
 share/swat/help/net.8.html
 share/swat/help/nmbd.8.html
@@ -842,10 +662,11 @@ share/swat/using_samba/toc.html
 @dirrm share/swat/include
 @dirrm share/swat/images
 @dirrm share/swat/help/images
-@dirrm share/swat/help/howto/images
-@dirrm share/swat/help/howto
-@dirrm share/swat/help/guide/images
-@dirrm share/swat/help/guide
-@dirrm share/swat/help/devel
+@dirrm share/swat/help/Samba-HOWTO-Collection/images
+@dirrm share/swat/help/Samba-HOWTO-Collection
+@dirrm share/swat/help/Samba-Guide/images
+@dirrm share/swat/help/Samba-Guide
+@dirrm share/swat/help/Samba-Developers-Guide/images
+@dirrm share/swat/help/Samba-Developers-Guide
 @dirrm share/swat/help
 @dirrm share/swat
author	lofi <lofi@FreeBSD.org>	2004-09-02 00:23:29 +0800
committer	lofi <lofi@FreeBSD.org>	2004-09-02 00:23:29 +0800
commit	ae09c2be3d473a59cc244f91e9a29420a80406da (patch)
tree	7590d2a6ea39c4e41a6844cac46cb3545f64fc77 /net
parent	d8842b21adef43e83d12a33048cb6b94835dbcf4 (diff)
download	freebsd-ports-gnome-ae09c2be3d473a59cc244f91e9a29420a80406da.tar.gz freebsd-ports-gnome-ae09c2be3d473a59cc244f91e9a29420a80406da.tar.zst freebsd-ports-gnome-ae09c2be3d473a59cc244f91e9a29420a80406da.zip