diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-09-21 12:28:38 -0700 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-09-21 12:28:38 -0700 |
| commit | 1afc7c453c1d5f7e761e46cdc69900305a149820 (patch) | |
| tree | a7ec12da94b14d00019a7f9cdbc8d8d843199ec7 | |
| parent | 8738b83a446ef667bc162b04affc17dbba7e58a8 (diff) | |
| download | samba-1afc7c453c1d5f7e761e46cdc69900305a149820.tar.gz samba-1afc7c453c1d5f7e761e46cdc69900305a149820.tar.bz2 samba-1afc7c453c1d5f7e761e46cdc69900305a149820.zip | |
s4:kerberos Fix the salt to match Windows 2008.
The previous commit changed the wrong end - we must fix our server,
not our client.
Andrew Bartlett
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/password_hash.c | 2 | ||||
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c index a04e52469d..a50e5b4a66 100644 --- a/source4/dsdb/samdb/ldb_modules/password_hash.c +++ b/source4/dsdb/samdb/ldb_modules/password_hash.c @@ -248,7 +248,7 @@ static int setup_kerberos_keys(struct setup_password_fields_io *io) char *name; char *saltbody; - name = talloc_strdup(io->ac, io->u.sAMAccountName); + name = strlower_talloc(io->ac, io->u.sAMAccountName); if (!name) { ldb_oom(ldb); return LDB_ERR_OPERATIONS_ERROR; diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index af706d08dd..9a41709830 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -687,7 +687,7 @@ def secretsdb_self_join(secretsdb, domain, dnsdomain = realm.lower() msg["objectClass"] = ["top", "primaryDomain", "kerberosSecret"] msg["realm"] = realm - msg["saltPrincipal"] = "host/%s.%s@%s" % (netbiosname, dnsdomain.lower(), realm.upper()) + msg["saltPrincipal"] = "host/%s.%s@%s" % (netbiosname.lower(), dnsdomain.lower(), realm.upper()) msg["msDS-KeyVersionNumber"] = [str(key_version_number)] msg["privateKeytab"] = ["secrets.keytab"]; |