diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-12-30 08:36:25 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:49:01 -0500 |
| commit | 1c027f35d70b0719ba671034e897834b4bed9c4f (patch) | |
| tree | 9db018f51c590ce53d701cf8211c4d1229ebbc3d /source4/setup | |
| parent | 7ad708924b2ffa7447135a767084b881590b0a64 (diff) | |
| download | samba-1c027f35d70b0719ba671034e897834b4bed9c4f.tar.gz samba-1c027f35d70b0719ba671034e897834b4bed9c4f.tar.bz2 samba-1c027f35d70b0719ba671034e897834b4bed9c4f.zip | |
r12598: Make the 'objectClass' part of the templating process actually work.
We need to add to the multivalued objectClass, not ignore it because
the user has already specified a value.
Also rename the template again.
This was caught by more stringent tests in the unicodePwd module, but
breaks MMC. A later commit will sort the objectClass.
Andrew Bartlett
(This used to be commit 0aaff059ba76c7eee86f37bfd74735c1c365d55f)
Diffstat (limited to 'source4/setup')
| -rw-r--r-- | source4/setup/provision_templates.ldif | 6 | ||||
| -rw-r--r-- | source4/setup/provision_users.ldif | 10 |
2 files changed, 4 insertions, 12 deletions
diff --git a/source4/setup/provision_templates.ldif b/source4/setup/provision_templates.ldif index 6305b498f4..7b0fe1994c 100644 --- a/source4/setup/provision_templates.ldif +++ b/source4/setup/provision_templates.ldif @@ -38,11 +38,13 @@ logonCount: 0 sAMAccountType: 0x30000000 objectCategory: CN=Person,CN=Schema,CN=Configuration,${BASEDN} -dn: CN=TemplateServer,CN=Templates,${BASEDN} +dn: CN=TemplateComputer,CN=Templates,${BASEDN} objectClass: top +objectClass: person +objectClass: organizationalPerson objectClass: Template objectClass: userTemplate -cn: TemplateServer +cn: TemplateComputer instanceType: 4 userAccountControl: 0x1002 badPwdCount: 0 diff --git a/source4/setup/provision_users.ldif b/source4/setup/provision_users.ldif index 5ec29869d8..c002923268 100644 --- a/source4/setup/provision_users.ldif +++ b/source4/setup/provision_users.ldif @@ -1,7 +1,4 @@ dn: CN=Administrator,CN=Users,${BASEDN} -objectClass: top -objectClass: person -objectClass: organizationalPerson objectClass: user cn: Administrator description: Built-in account for administering the computer/domain @@ -22,9 +19,6 @@ unicodePwd: ${ADMINPASS} unixName: ${ROOT} dn: CN=Guest,CN=Users,${BASEDN} -objectClass: top -objectClass: person -objectClass: organizationalPerson objectClass: user cn: Guest description: Built-in account for guest access to the computer/domain @@ -83,10 +77,6 @@ privilege: SeRemoteInteractiveLogonRight dn: CN=${NETBIOSNAME},OU=Domain Controllers,${BASEDN} -objectClass: top -objectClass: person -objectClass: organizationalPerson -objectClass: user objectClass: computer cn: ${NETBIOSNAME} uSNCreated: 1 |