diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-01-15 06:59:56 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:51:11 -0500 |
| commit | c96b5723869eca3155db2e2185354bb95d61c566 (patch) | |
| tree | fe6a7a3b371369c9aa5826f687c13071bf0110fe | |
| parent | 491a720354a53b2828454a92e3f4bd8f5bd28f1c (diff) | |
| download | samba-c96b5723869eca3155db2e2185354bb95d61c566.tar.gz samba-c96b5723869eca3155db2e2185354bb95d61c566.tar.bz2 samba-c96b5723869eca3155db2e2185354bb95d61c566.zip | |
r12943: 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
(This used to be commit ffe9042e15cebbc7ff1bac90ec39835753d6caa7)
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/samldb.c | 2 | ||||
| -rw-r--r-- | source4/setup/provision.ldif | 2 | ||||
| -rw-r--r-- | source4/setup/provision_users.ldif | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c index 7bf25994e2..c10a96a6ad 100644 --- a/source4/dsdb/samdb/ldb_modules/samldb.c +++ b/source4/dsdb/samdb/ldb_modules/samldb.c @@ -116,8 +116,6 @@ static int samldb_allocate_next_rid(struct ldb_context *ldb, TALLOC_CTX *mem_ctx return 1; } - (*id)++; - return 0; } diff --git a/source4/setup/provision.ldif b/source4/setup/provision.ldif index 2fc0022c81..d87938910c 100644 --- a/source4/setup/provision.ldif +++ b/source4/setup/provision.ldif @@ -19,7 +19,7 @@ maxPwdAge: -37108517437440 minPwdAge: 0 minPwdLength: 7 modifiedCountAtLastProm: 0 -nextRid: 1001 +nextRid: 1000 pwdProperties: 1 pwdHistoryLength: 24 objectSid: ${DOMAINSID} diff --git a/source4/setup/provision_users.ldif b/source4/setup/provision_users.ldif index ffb0139378..dfb31783e4 100644 --- a/source4/setup/provision_users.ldif +++ b/source4/setup/provision_users.ldif @@ -85,7 +85,6 @@ objectGUID: ${HOSTGUID} userAccountControl: 532480 localPolicyFlags: 0 primaryGroupID: 516 -objectSid: ${DOMAINSID}-1000 accountExpires: 9223372036854775807 sAMAccountName: ${NETBIOSNAME}$ sAMAccountType: 805306369 |