latest pre-3.0.7 patches

7 files changed, 1000 insertions, 3 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index ac71c3d901f0..ee364986ba69 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-fs/samba
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.98 2004/08/26 09:23:00 mglauche Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.99 2004/09/01 09:36:26 satya Exp $
+
+*samba-3.0.6-r3 (01 Sep 2004)
+
+  01 Sep 2004; Christian Andreetta <satya@gentoo.org>
+  +files/samba-3.0.6-homes-reuse_v2.patch, +files/samba-3.0.6-samba.schema,
+  +files/samba-3.0.6-winbind_getpwnam_v1.patch, files/smb.conf.example-samba3,
+  +samba-3.0.6-r3.ebuild:
+  adding latest Jerry Carter patches (bug #62476)
 
 *samba-3.0.6-r2 (26 Aug 2004)
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index bdea58c35762..40b6990135a1 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -2,10 +2,11 @@ MD5 7d7c900829bc2bdf39895d5890a0d20d samba-3.0.4-r1.ebuild 11146
 MD5 55c08f2d48b50d7af452664decd8793a samba-3.0.6-r2.ebuild 13989
 MD5 b8ef78eeab7e9982b8c3459e1792747f samba-3.0.6-r1.ebuild 13867
 MD5 045d2504d92e3846f34e35c094721c44 samba-3.0.6.ebuild 13730
+MD5 ac6b15edce4d210c2ccaeef885d94582 samba-3.0.6-r3.ebuild 14195
 MD5 3351b25b7b1bd6afa22023463a51ceb8 samba-3.0.5-r1.ebuild 13685
 MD5 633511d04d7a7d7702c17089c85ba697 samba-3.0.1-r1.ebuild 11333
 MD5 df4f73693b725799675e37ba3f90643f samba-3.0.2a-r2.ebuild 12249
-MD5 a373b570ac1a988e5adeead1ae784a7e ChangeLog 19096
+MD5 5844793499b61850f5d3e43d2eb934c1 ChangeLog 19413
 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
 MD5 4505c7b9cd715168b75a4dfb5c4ac294 samba-3.0.5.ebuild 11142
 MD5 ccc96fcdc7493be42da52364061c6c17 files/winbind-init 484
@@ -18,6 +19,7 @@ MD5 7ee5edc70bf80888c776f5808f865996 files/nsswitch.conf-wins 392
 MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291
 MD5 83b384d6b47ecbf20525cc9a7baaa77a files/samba-init 1093
 MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
+MD5 e5dbea6345ee39a97bc8783f5772bf49 files/samba-3.0.6-winbind_getpwnam_v1.patch 2521
 MD5 f402c2c4103f4c13ac3cc5fa165940db files/nonroot-bind.diff 757
 MD5 5d3129a0f6bcbec6ec91d217881a34e1 files/nsswitch.conf-winbind 298
 MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126
@@ -30,15 +32,18 @@ MD5 43a38a5331805a2fa61e899f18413ccd files/digest-samba-3.0.5 203
 MD5 d83497b5a50e8d6bd9c93b1c661634bb files/digest-samba-3.0.6 203
 MD5 8ea7b443dd580aaaaf7e9e896eba54f2 files/samba-3.0.x-smbumount-uid32.patch 425
 MD5 bf268fdddc8ef677b6fa78661a094eac files/samba.schema 16044
+MD5 bf268fdddc8ef677b6fa78661a094eac files/samba-3.0.6-samba.schema 16044
 MD5 f3a4b3b0a8162ae87779846d7e6adbbf files/digest-samba-3.0.1-r1 202
 MD5 a86336201c2eced7a6e5a5138514e2f7 files/digest-samba-3.0.4-r1 203
 MD5 4356a18128f7107bb7a2270bea78b3aa files/digest-samba-3.0.5-r1 203
 MD5 d83497b5a50e8d6bd9c93b1c661634bb files/digest-samba-3.0.6-r1 203
 MD5 d83497b5a50e8d6bd9c93b1c661634bb files/digest-samba-3.0.6-r2 203
-MD5 8c1f1e3655e12b85102ce257f3efad62 files/smb.conf.example-samba3 20762
+MD5 d83497b5a50e8d6bd9c93b1c661634bb files/digest-samba-3.0.6-r3 203
+MD5 4dcf82c5fc109b5ce55140ba8a839137 files/smb.conf.example-samba3 20704
 MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921
 MD5 3685eadb817d185b06476eca6c0c15c4 files/smbusers 204
 MD5 09195dd8ab25ce77ac51c0c05b4ab93c files/system-auth-winbind 869
+MD5 579303048a39e504238ff8e658413452 files/samba-3.0.6-homes-reuse_v2.patch 2411
 MD5 990fe15ff8a0e79f39069fff6475536d files/samba-3.0.2a-smbprint.patch 1224
 MD5 6acf6a5e92ff2cfc5f09b88f5d01b63e files/samba-svc 975
 MD5 b6cdc1468e45f92f19873e0c6c5b6e94 files/samba.pam 332
diff --git a/net-fs/samba/files/digest-samba-3.0.6-r3 b/net-fs/samba/files/digest-samba-3.0.6-r3
new file mode 100644
index 000000000000..670161d9a3d8
--- /dev/null
+++ b/net-fs/samba/files/digest-samba-3.0.6-r3
@@ -0,0 +1,3 @@
+MD5 c8dc06e2bcf63513c2e8d849f6352d8a samba-3.0.6.tar.gz 14947376
+MD5 5f173d549014985d681478897135915b samba-vscan-0.3.5.tar.bz2 161982
+MD5 4bfa0e5328b8420b98d91a046117b7c5 smbldap-tools-0.8.5.tgz 269327
diff --git a/net-fs/samba/files/samba-3.0.6-homes-reuse_v2.patch b/net-fs/samba/files/samba-3.0.6-homes-reuse_v2.patch
new file mode 100644
index 000000000000..e8d39b60b4d7
--- /dev/null
+++ b/net-fs/samba/files/samba-3.0.6-homes-reuse_v2.patch
@@ -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-fs/samba/files/samba-3.0.6-samba.schema b/net-fs/samba/files/samba-3.0.6-samba.schema
new file mode 100644
index 000000000000..17ea2d9fd2f6
--- /dev/null
+++ b/net-fs/samba/files/samba-3.0.6-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-fs/samba/files/samba-3.0.6-winbind_getpwnam_v1.patch b/net-fs/samba/files/samba-3.0.6-winbind_getpwnam_v1.patch
new file mode 100644
index 000000000000..484c9e775d36
--- /dev/null
+++ b/net-fs/samba/files/samba-3.0.6-winbind_getpwnam_v1.patch
@@ -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-fs/samba/samba-3.0.6-r3.ebuild b/net-fs/samba/samba-3.0.6-r3.ebuild
new file mode 100644
index 000000000000..a7f34342757d
--- /dev/null
+++ b/net-fs/samba/samba-3.0.6-r3.ebuild
@@ -0,0 +1,375 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.6-r3.ebuild,v 1.1 2004/09/01 09:36:26 satya Exp $
+
+inherit eutils flag-o-matic
+
+IUSE="kerberos mysql postgres xml xml2 acl cups ldap pam readline python doc"
+IUSE="${IUSE} oav"
+
+DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX"
+HOMEPAGE="http://www.samba.org/
+	http://www.openantivirus.org/projects.php
+	http://samba.idealx.org"
+
+SMBLDAP_TOOLS_VER=0.8.5
+VSCAN_VER=0.3.5
+# all vscan modules are being installed
+#VSCAN_MODS="oav sophos fprotd fsav trend icap mksd kavp clamav nai" 
+
+_CVS="-${PV/_/}"
+S=${WORKDIR}/${PN}${_CVS}
+
+SRC_URI="mirror://samba/${PN}${_CVS}.tar.gz
+	oav? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2
+	ldap? http://samba.idealx.org/dist/smbldap-tools-${SMBLDAP_TOOLS_VER}.tgz"
+
+_COMMON_DEPS="dev-libs/popt
+	readline? sys-libs/readline
+	ldap? ( kerberos? ( virtual/krb5 ) )
+	mysql? ( dev-db/mysql sys-libs/zlib )
+	postgres? ( dev-db/postgresql sys-libs/zlib )
+	xml? ( dev-libs/libxml2 sys-libs/zlib )
+	xml2? ( dev-libs/libxml2 sys-libs/zlib )
+	acl? sys-apps/acl
+	cups? net-print/cups
+	ldap? ( net-nds/openldap dev-perl/Crypt-SmbHash )
+	pam? sys-libs/pam
+	python? dev-lang/python"
+DEPEND="sys-devel/autoconf
+	>=sys-apps/sed-4
+	${_COMMON_DEPS}"
+#IDEALX scripts are now using Net::LDAP
+RDEPEND="ldap? dev-perl/perl-ldap ${_COMMON_DEPS}"
+
+# some archs are removed due to dependency tree integrity for ldap and
+#   dev-perl/Crypt-SmbHash flags
+#   should be: KEYWORDS="~arm ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~arm ~mips ~sparc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+src_unpack() {
+	local i
+	unpack ${A} || die
+	cd ${S} || die
+	# Clean up CVS ---------------------------------------------------------
+	find . -name .cvsignore | xargs rm -f
+	find . -name CVS | xargs rm -rf
+	# Add patch(es) --------------------------------------------------------
+	# This patchset fixes Samba bugs #1315, #1319 and #1345
+	# courtesy of Gerald Carter (jerry@samba.org)
+	# they are hopefully fixed in this version !
+	# epatch ${FILESDIR}/samba-3.0.x.patch
+	#Next one is from eger@cc.gatech.edu
+	epatch ${FILESDIR}/samba-3.0.x-python-setup.patch || die
+	#bug #44743 ------------------------------------------------------------
+	if [ ${ARCH} = "amd64" -o ${ARCH} = "ppc" -o ${ARCH} = "ppc64" ]; then
+		cd ${S} && epatch ${FILESDIR}/samba-3.0.x-smbumount-uid32.patch
+	fi
+	#Fix for bug #27858 ----------------------------------------------------
+	if [ ${ARCH} = "sparc" -o ${ARCH} = "ppc" -o ${ARCH} = "ppc64" ]; then
+		cd ${S}/source/include && epatch ${FILESDIR}/samba-2.2.8-statfs.patch
+	fi
+	#Bug #36200; sys-kernel/linux-headers dependent ------------------------
+	sed -i -e 's:#define LINUX_QUOTAS_2:#define LINUX_QUOTAS_1:' \
+		-e 's:<linux/quota.h>:<sys/quota.h>:' \
+		${S}/source/smbd/quotas.c
+	#samba 3.0.6: bugs 61055 and 62476 -------------------------------------
+	cd ${S}/source || die
+	epatch ${FILESDIR}/samba-3.0.6-homes-reuse_v2.patch || die
+	epatch ${FILESDIR}/samba-3.0.6-winbind_getpwnam_v1.patch || die
+	cp ${FILESDIR}/samba-3.0.6-samba.schema ${S}/examples/LDAP/samba.schema
+	cd ${S} || die
+	# examples: to be copied as docs ---------------------------------------
+	rm -rf ${S}/examples.ORIG
+	cp -a ${S}/examples ${S}/examples.ORIG
+	# Prep samba-vscan source.
+	use oav && cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} ${S}/examples/VFS
+	#-----------------------------------------------------------------------
+	cd ${S}/source
+	echo "Running autoconf ..."
+	autoconf || die
+}
+
+src_compile() {
+	local i
+	local myconf
+	local mymods
+	#mymods="nisplussam" #this is deprecated...
+	#-----------------------------------------------------------------------
+	use xml || use xml2 && mymods="xml,${mymods}"
+	use mysql && mymods="mysql,${mymods}"
+	use postgres && mymods="pgsql,${mymods}"
+	[ -n "${mymods}" ] && myconf="--with-expsam=${mymods}"
+	use acl \
+		&& myconf="${myconf} --with-acl-support" \
+		|| myconf="${myconf} --without-acl-support"
+	use pam \
+		&& myconf="${myconf} --with-pam --with-pam_smbpass" \
+		|| myconf="${myconf} --without-pam --without-pam_smbpass"
+	use cups \
+		&& myconf="${myconf} --enable-cups" \
+		|| myconf="${myconf} --disable-cups"
+	use ldap \
+		&& myconf="${myconf} --with-ldap" \
+		|| myconf="${myconf} --without-ldap"
+	#this is for old samba 2.x compat
+	#myconf="${myconf} --with-ldapsam"
+	myconf="${myconf} --without-ldapsam"
+	use python \
+		&& myconf="${myconf} --with-python=yes" \
+		|| myconf="${myconf} --with-python=no"
+	use readline \
+		&& myconf="${myconf} --with-readline" \
+		|| myconf="${myconf} --without-readline"
+	#Fix #57063 ------------------------------------------------------------
+	# too cautious for some archs: maybe -O2 is sufficient on some of them
+	strip-flags
+	if [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]; then
+		replace-flags -O? -O1
+	else
+		replace-flags -O? -O1
+	fi
+	#-----------------------------------------------------------------------
+	if [ "${ARCH}" != "amd64" ]; then
+		use kerberos && use ldap \
+			&& myconf="${myconf} --with-ads" \
+			|| myconf="${myconf} --without-ads"
+	else
+		myconf="${myconf} --without-ads"
+	fi
+	#-----------------------------------------------------------------------
+	#default_{static,shared}_modules|source/configure
+	#/usr/lib/samba/auth/.............      AUTH_MODULES
+	#/usr/lib/samba/charset/		CHARSET_MODULES
+	#/usr/lib/samba/pdb/..............      PDB_MODULES
+	#/usr/lib/samba/rpc/		    RPC_MODULES
+	#/usr/lib/samba/vfs/..............      VFS_MODULES|source/Makefile
+	#/usr/lib/samba/lowcase.dat
+	#/usr/lib/samba/upcase.dat
+	#/usr/lib/samba/valid.dat
+	#-----------------------------------------------------------------------
+	for info_var in myconf CFLAGS CFLAGS; do
+		einfo "${info_var} is: ${!info_var}"
+	done
+	cd ${S}/source
+	./configure \
+		--prefix=/usr \
+		--libdir=/usr/lib/samba \
+		--with-libdir=/usr/lib/samba \
+		--with-swatdir=/usr/share/doc/${PF}/swat \
+		--localstatedir=/var \
+		--with-piddir=/var/run/samba \
+		--with-lockdir=/var/cache/samba \
+		--with-logfilebase=/var/log/samba \
+		--sysconfdir=/etc/samba \
+		--with-configdir=/etc/samba \
+		--with-privatedir=/etc/samba/private \
+		\
+		--enable-static \
+		--enable-shared \
+		--with-manpages-langs=en \
+		--without-spinlocks \
+		--with-libsmbclient \
+		--with-automount \
+		--with-smbmount \
+		--with-winbind \
+		--with-quotas \
+		--with-syslog \
+		--with-idmap \
+		--host=${CHOST} \
+		${myconf} || die
+	# Show install dirs ----------------------------------------------------
+	einfo "Dir conf:"
+	make showlayout
+	# serialized headers make ----------------------------------------------
+	make proto
+	# Compile main SAMBA pieces --------------------------------------------
+	einfo "make everything" && emake everything || die "SAMBA make everything error"
+	einfo "make rpctorture" && emake rpctorture || ewarn "rpctorture didn't build"
+	# Build mount.cifs -----------------------------------------------------
+	einfo "mount.cifs"
+	cd ${S}/source
+	gcc ${CFLAGS} client/mount.cifs.c -o bin/mount.cifs
+	assert "mount.cifs compile problem"
+	# build smbget ---------------------------------------------------------
+	einfo "smbget"
+	emake bin/smbget; assert "smbget compile error"
+	# Build selected samba-vscan plugins -----------------------------------
+	if use oav; then
+		cd ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}
+		./configure --prefix=/usr --libdir=/usr/lib/samba
+		assert "bad ${PN}-vscan-${VSCAN_VER} ./configure"
+		emake #${VSCAN_MODS}
+	fi
+	# Build mkntpasswd from the smbldap-tools ------------------------------
+	# Attention: usage of dev-perl/Crypt-SmbHash for smbldap-tool > 0.8.5
+	if use ldap; then
+		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
+		if [ -f mkntpwd.tar.gz ]; then
+			tar --no-same-owner -zxf mkntpwd.tar.gz
+			cd mkntpwd
+			VISUAL="" make || die "mkntpwd compile problem"
+		fi
+	fi
+}
+
+src_install() {
+	local extra_bins="debug2html smbfilter talloctort mount.cifs smbget"
+	#smbsh editreg
+	extra_bins="${extra_bins} smbtorture msgtest masktest locktest \
+		locktest2 nsstest vfstest rpctorture"
+	# ----------------------------------------------------------------------
+	cd ${S}/source
+	make DESTDIR=${D} install-everything
+	# Extra binary files, testing/torture progs ----------------------------
+	exeinto /usr/bin
+	for i in ${extra_bins}; do
+		[ -x ${S}/source/bin/${i} ] && doexe ${S}/source/bin/${i} && \
+		einfo "Extra binaries: ${i}"
+	done
+	# Installing these setuid-root allows users to (un)mount smbfs/cifs ----
+	for i in /usr/bin/smbumount /usr/bin/smbmnt /usr/bin/mount.cifs; do
+		fperms 4111 ${i} || die "No perms: ${i}"
+		einfo "suid: ${i}"
+	done
+	# Nsswitch extensions. Make link for wins and winbind resolvers --------
+	exeinto /lib
+	for i in wins winbind; do
+		doexe ${S}/source/nsswitch/libnss_${i}.so
+		( cd ${D}/lib; ln -s libnss_${i}.so libnss_${i}.so.2 )
+	done
+	exeinto /lib/security
+	doexe ${S}/source/nsswitch/pam_winbind.so
+	use pam && doexe ${S}/source/bin/pam_smbpass.so
+	# mount backend --------------------------------------------------------
+	dodir /sbin
+	dosym ../usr/bin/smbmount /sbin/mount.smbfs
+	dosym ../usr/bin/mount.cifs /sbin/mount.cifs
+	# bug #46389: samba doesn't create symlink anymore
+	# beaviour seems to be changed in 3.0.6, see bug #61046 
+	dosym /usr/lib/samba/libsmbclient.so /usr/lib/libsmbclient.so.0
+	dosym /usr/lib/samba/libsmbclient.so /usr/lib/libsmbclient.so
+	# make the smb backend symlink for cups printing support..
+	if use cups; then
+		dodir /usr/lib/cups/backend
+		dosym /usr/bin/smbspool /usr/lib/cups/backend/smb
+	fi
+	# Install IDEALX scripts for LDAP backend administration ---------------
+	if use ldap; then
+		# corrections as per bug #41796
+		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
+		exeinto /usr/share/samba/scripts; doexe smbldap-*
+		exeinto /etc/samba ; doexe smbldap_tools.pm
+		insinto /etc/smbldap-tools ; doins *.conf
+		fperms 644 /etc/smbldap-tools/smbldap.conf
+		fperms 600 /etc/smbldap-tools/smbldap_bind.conf
+		eval `perl '-V:installarchlib'`
+		dodir ${installarchlib}
+		#dosym /etc/samba/smbldap_conf.pm ${installarchlib}
+		#dosym /etc/samba/smbldap_conf.pm /usr/share/samba/scripts
+		dosym /etc/samba/smbldap_tools.pm ${installarchlib}
+		dosym /etc/samba/smbldap_tools.pm /usr/share/samba/scripts
+		if [ -f mkntpwd/mkntpwd ]; then
+			exeinto /usr/sbin ; doexe mkntpwd/mkntpwd
+		fi
+	fi
+	# VFS plugin modules ---------------------------------------------------
+	if use oav; then
+		#exeinto /usr/lib/samba/vfs
+		#doexe ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}/vscan-*.so
+		cd ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}
+		make install DESTDIR=${D} || die "VFS: vscan error"
+		insinto /etc/samba
+		doins ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}/openantivirus/*conf
+	fi
+	# Python extensions ----------------------------------------------------
+	if use python; then
+		cd ${S}/source
+		python python/setup.py install --root=${D} || die
+	fi
+	# General config files -------------------------------------------------
+	insinto /etc/samba
+	touch ${D}/etc/samba/smb.conf
+	doins ${FILESDIR}/smbusers
+	newins ${FILESDIR}/smb.conf.example-samba3 smb.conf.example
+	doins ${FILESDIR}/lmhosts
+	doins ${FILESDIR}/recycle.conf
+	insinto /etc/pam.d
+	newins ${FILESDIR}/samba.pam samba
+	doins ${FILESDIR}/system-auth-winbind
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/swat.xinetd swat
+	exeinto /etc/init.d; newexe ${FILESDIR}/samba-init samba
+	insinto /etc/conf.d; newins ${FILESDIR}/samba-conf samba
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins ${S}/examples/LDAP/samba.schema
+	fi
+	# dirs -----------------------------------------------------------------
+	diropts -m0700
+	dodir /etc/samba/private
+	touch ${D}/etc/samba/private/.keep
+	diropts -m1777
+	dodir /var/spool/samba
+	touch ${D}/var/spool/samba/.keep
+	diropts -m0755
+	dodir /var/{log,run,cache}/samba
+	dodir /var/lib/samba/{netlogon,profiles}
+	dodir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
+	touch ${D}/var/{log,run,cache}/samba/.keep
+	touch ${D}/var/lib/samba/{netlogon,profiles}/.keep
+	touch ${D}/var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}/.keep
+	# docs -----------------------------------------------------------------
+	docinto ""
+	dodoc ${S}/COPYING ${S}/Manifest ${S}/README ${S}/Roadmap ${S}/WHATSNEW.txt
+	docinto examples
+	dodoc ${FILESDIR}/nsswitch.conf-{wins,winbind}
+	cp -a ${S}/examples.ORIG/* ${D}/usr/share/doc/${PF}/examples
+	if use oav; then
+		docinto ${PN}-vscan-${VSCAN_VER}
+		cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER}
+		dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
+		dodoc */*.conf
+	fi
+	if use ldap; then
+		docinto smbldap-tools-${SMBLDAP_TOOLS_VER}
+		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
+		dodoc CONTRIBUTORS COPYING ChangeLog FILES INFRA INSTALL README TODO
+	fi
+	if ! use doc; then
+		rm -rf ${D}/usr/share/doc/${PF}/swat/help/{guide,howto,devel}
+		rm -rf ${D}/usr/share/doc/${PF}/swat/using_samba
+	fi
+	chown -R root:root ${D}/usr/share/doc/${PF}
+	# moving manpages ------------------------------------------------------
+	mv ${D}/usr/man ${D}/usr/share/man
+}
+
+pkg_postinst() {
+	# touch /etc/samba/smb.conf so that people installing samba just
+	# to mount smb shares don't get annoying warnings all the time..
+	#[ ! -e ${ROOT}/etc/samba/smb.conf ] && touch ${ROOT}/etc/samba/smb.conf
+
+	ewarn ""
+	ewarn "If you are upgrading from a Samba version prior to 3.0.2, and you"
+	ewarn "use Samba's password database, you must run the following command:"
+	ewarn ""
+	ewarn "  pdbedit --force-initialized-passwords"
+	ewarn ""
+	ewarn "LIBs location change: /usr/lib/samba/*"
+	ewarn "   (due to ldap/vfs external tools assumptions)"
+	ewarn ""
+	if use ldap; then
+		ewarn "If you are upgrading from prior to 3.0.2, and you are using LDAP"
+		ewarn "    for Samba authentication, you must check the sambaPwdLastSet"
+		ewarn "    attribute on all accounts, and ensure it is not 0."
+		einfo "WARNING: smbldap-tools changes"
+		einfo "    smbldap-tools conf changed to /etc/smbldap-tools"
+		einfo "    /usr/shared/samba/scripts: some script names changed"
+		einfo "    dev-perl/Crypt-SmbHash: new pwd hash validation/conversion system"
+		einfo ""
+	fi
+}
+