[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-604-g1afc7c4

Andrew Bartlett abartlet at samba.org
Mon Sep 21 13:45:40 MDT 2009


The branch, master has been updated
       via  1afc7c453c1d5f7e761e46cdc69900305a149820 (commit)
      from  8738b83a446ef667bc162b04affc17dbba7e58a8 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1afc7c453c1d5f7e761e46cdc69900305a149820
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Sep 21 12:28:38 2009 -0700

    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

-----------------------------------------------------------------------

Summary of changes:
 source4/dsdb/samdb/ldb_modules/password_hash.c |    2 +-
 source4/scripting/python/samba/provision.py    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index a04e524..a50e5b4 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 af706d0..9a41709 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"];
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list