svn commit: samba r12943 - in branches/SAMBA_4_0/source: dsdb/samdb/ldb_modules setup

[abartlet at samba.org]

Author: abartlet
Date: 2006-01-15 06:59:56 +0000 (Sun, 15 Jan 2006)
New Revision: 12943

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12943

Log:
Generate a SID for the domain join account using the modules, rather
than a hardcoded SID.

Fix the samldb module to return the what *was* the nextrid, rather
than the new nextrid (that is for next time).

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c
   branches/SAMBA_4_0/source/setup/provision.ldif
   branches/SAMBA_4_0/source/setup/provision_users.ldif


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c	2006-01-15 06:43:43 UTC (rev 12942)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c	2006-01-15 06:59:56 UTC (rev 12943)
@@ -116,8 +116,6 @@
 		return 1;
 	}
 
-	(*id)++;
-
 	return 0;
 }
 

Modified: branches/SAMBA_4_0/source/setup/provision.ldif
===================================================================
--- branches/SAMBA_4_0/source/setup/provision.ldif	2006-01-15 06:43:43 UTC (rev 12942)
+++ branches/SAMBA_4_0/source/setup/provision.ldif	2006-01-15 06:59:56 UTC (rev 12943)
@@ -19,7 +19,7 @@
 minPwdAge: 0
 minPwdLength: 7
 modifiedCountAtLastProm: 0
-nextRid: 1001
+nextRid: 1000
 pwdProperties: 1
 pwdHistoryLength: 24
 objectSid: ${DOMAINSID}

Modified: branches/SAMBA_4_0/source/setup/provision_users.ldif
===================================================================
--- branches/SAMBA_4_0/source/setup/provision_users.ldif	2006-01-15 06:43:43 UTC (rev 12942)
+++ branches/SAMBA_4_0/source/setup/provision_users.ldif	2006-01-15 06:59:56 UTC (rev 12943)
@@ -85,7 +85,6 @@
 userAccountControl: 532480
 localPolicyFlags: 0
 primaryGroupID: 516
-objectSid: ${DOMAINSID}-1000
 accountExpires: 9223372036854775807
 sAMAccountName: ${NETBIOSNAME}$
 sAMAccountType: 805306369