diff options
author | Andrew Bartlett <abartlet@samba.org> | 2006-08-28 05:26:42 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:16:50 -0500 |
commit | 2b99336a56a47838510f9b8a01aab05363c424b6 (patch) | |
tree | c2e31d695d2e80e8db3bc964a27186812c03bd94 /source4/setup | |
parent | 9356831484fcba09d0d4f522ff78f9c30d86c99e (diff) | |
download | samba-2b99336a56a47838510f9b8a01aab05363c424b6.tar.gz samba-2b99336a56a47838510f9b8a01aab05363c424b6.tar.bz2 samba-2b99336a56a47838510f9b8a01aab05363c424b6.zip |
r17876: Require one less patch for the LDAP backend to work.
This lets the modules or backend generate the host and domain GUID,
rather than the randguid() function. These can still be specified
from the command line.
Andrew Bartlett
(This used to be commit 32996ca9d62568006f8bee85a1f2f37c64c04fb5)
Diffstat (limited to 'source4/setup')
-rw-r--r-- | source4/setup/provision_basedn_modify.ldif | 4 | ||||
-rw-r--r-- | source4/setup/provision_users.ldif | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/source4/setup/provision_basedn_modify.ldif b/source4/setup/provision_basedn_modify.ldif index d8765a3c0a..ca02975a0e 100644 --- a/source4/setup/provision_basedn_modify.ldif +++ b/source4/setup/provision_basedn_modify.ldif @@ -9,9 +9,6 @@ dnsDomain: ${DNSDOMAIN} replace: dc dc: ${RDN_DC} - -replace: objectGUID -objectGUID: ${DOMAINGUID} -- replace: forceLogoff forceLogoff: 9223372036854775808 - @@ -79,4 +76,5 @@ replace: subRefs subRefs: CN=Configuration,${BASEDN} subRefs: CN=Schema,CN=Configuration,${BASEDN} - +${DOMAINGUID_MOD} diff --git a/source4/setup/provision_users.ldif b/source4/setup/provision_users.ldif index 5cd5991c41..10830dde0b 100644 --- a/source4/setup/provision_users.ldif +++ b/source4/setup/provision_users.ldif @@ -71,7 +71,6 @@ privilege: SeRemoteInteractiveLogonRight dn: CN=${NETBIOSNAME},CN=Domain Controllers,${BASEDN} objectClass: computer cn: ${NETBIOSNAME} -objectGUID: ${HOSTGUID} userAccountControl: 532480 localPolicyFlags: 0 primaryGroupID: 516 @@ -89,7 +88,7 @@ servicePrincipalName: HOST/${DNSNAME}/${REALM} servicePrincipalName: HOST/${NETBIOSNAME}/${REALM} servicePrincipalName: HOST/${DNSNAME}/${DOMAIN} servicePrincipalName: HOST/${NETBIOSNAME}/${DOMAIN} - +${HOSTGUID_ADD} dn: CN=Users,CN=Builtin,${BASEDN} objectClass: top |