summaryrefslogtreecommitdiff
path: root/source4/setup
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2010-11-09 13:22:00 +0100
committerMatthias Dieter Wallnöfer <mdw@samba.org>2010-11-09 13:22:00 +0100
commitbd5039546e520b6d6897a658bc0a358f0511f7c7 (patch)
tree7114e916ba4169d1229e7fb4a7bcfa66b4cf8c6a /source4/setup
parentd1d585e208bf60729e0c064be7f419ead02875b8 (diff)
downloadsamba-bd5039546e520b6d6897a658bc0a358f0511f7c7.tar.gz
samba-bd5039546e520b6d6897a658bc0a358f0511f7c7.tar.bz2
samba-bd5039546e520b6d6897a658bc0a358f0511f7c7.zip
s4:provision - switch to "clearTextPassword" for setting passwords
This is the default password set/change attribute for s4 specific purposes (otherwise in respect to Windows it's "unicodePwd"). We move away from "userPassword" since on Windows it's not activated by default - and s4 will follow soon.
Diffstat (limited to 'source4/setup')
-rw-r--r--source4/setup/provision_dns_add.ldif2
-rw-r--r--source4/setup/provision_self_join.ldif2
-rw-r--r--source4/setup/provision_users.ldif4
3 files changed, 4 insertions, 4 deletions
diff --git a/source4/setup/provision_dns_add.ldif b/source4/setup/provision_dns_add.ldif
index a0a8187030..04898e2079 100644
--- a/source4/setup/provision_dns_add.ldif
+++ b/source4/setup/provision_dns_add.ldif
@@ -102,6 +102,6 @@ accountExpires: 9223372036854775807
sAMAccountName: dns-${HOSTNAME}
servicePrincipalName: DNS/${DNSNAME}
servicePrincipalName: DNS/${DNSDOMAIN}
-userPassword:: ${DNSPASS_B64}
+clearTextPassword:: ${DNSPASS_B64}
isCriticalSystemObject: TRUE
diff --git a/source4/setup/provision_self_join.ldif b/source4/setup/provision_self_join.ldif
index c1f553c851..7bd393ced4 100644
--- a/source4/setup/provision_self_join.ldif
+++ b/source4/setup/provision_self_join.ldif
@@ -18,7 +18,7 @@ sAMAccountName: ${NETBIOSNAME}$
# The "servicePrincipalName" updates are now handled by the "samba_spnupdate"
# script
userAccountControl: 532480
-userPassword:: ${MACHINEPASS_B64}
+clearTextPassword:: ${MACHINEPASS_B64}
objectSID: ${DOMAINSID}-${DCRID}
# Here are missing the objects for the NTFRS subscription since we don't
diff --git a/source4/setup/provision_users.ldif b/source4/setup/provision_users.ldif
index b85523b426..022f81d848 100644
--- a/source4/setup/provision_users.ldif
+++ b/source4/setup/provision_users.ldif
@@ -45,7 +45,7 @@ objectSid: ${DOMAINSID}-500
adminCount: 1
accountExpires: 9223372036854775807
sAMAccountName: Administrator
-userPassword:: ${ADMINPASS_B64}
+clearTextPassword:: ${ADMINPASS_B64}
isCriticalSystemObject: TRUE
dn: CN=Guest,CN=Users,${DOMAINDN}
@@ -70,7 +70,7 @@ adminCount: 1
accountExpires: 9223372036854775807
sAMAccountName: krbtgt
servicePrincipalName: kadmin/changepw
-userPassword:: ${KRBTGTPASS_B64}
+clearTextPassword:: ${KRBTGTPASS_B64}
isCriticalSystemObject: TRUE
# Add other groups