[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-1105-gc49145b

[Andrew Bartlett]

The branch, master has been updated
       via  c49145b1ab18bd859ce925b08e9698d9218f6de8 (commit)
       via  29ef1b2325ac5b80a52abfbd30346636695f4247 (commit)
      from  9b261a1211de2bfef22af64d4717b44c5ed2bfb8 (commit)

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


- Log -----------------------------------------------------------------
commit c49145b1ab18bd859ce925b08e9698d9218f6de8
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Aug 19 13:26:34 2009 +1000

    s4:ldb Use length-limited printf to avoid walking off end of strings
    
    This should ensure the debug messages do not have random characters at
    their ends.
    
    Andrew Bartlett

commit 29ef1b2325ac5b80a52abfbd30346636695f4247
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Aug 18 12:08:37 2009 +1000

    s4:kerberos Use MIT compatible names for these enc types
    
    This is a small start on (ie, the only trivial part of) the work shown in:
    http://k5wiki.kerberos.org/wiki/Projects/Samba4_Port#Samba.27s_use_of_Heimdal_symbols.2C_with_MIT_differences
    (a table of all Kerberos symbols used in Samba4, and notes on where
    they differ from those provided with MIT Kerberos)
    
    Andrew Bartlett

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

Summary of changes:
 source4/auth/kerberos/kerberos_util.c    |    2 +-
 source4/kdc/hdb-samba4.c                 |    4 ++--
 source4/lib/ldb/common/attrib_handlers.c |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/auth/kerberos/kerberos_util.c b/source4/auth/kerberos/kerberos_util.c
index 0567565..3f8b593 100644
--- a/source4/auth/kerberos/kerberos_util.c
+++ b/source4/auth/kerberos/kerberos_util.c
@@ -184,7 +184,7 @@ static krb5_error_code salt_principal_from_credentials(TALLOC_CTX *parent_ctx,
 				return EINVAL;
 			}
 			ret = krb5_keyblock_init(smb_krb5_context->krb5_context,
-						 ETYPE_ARCFOUR_HMAC_MD5,
+						 ENCTYPE_ARCFOUR_HMAC,
 						 mach_pwd->hash, sizeof(mach_pwd->hash), 
 						 &keyblock);
 			
diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c
index e39366c..d782254 100644
--- a/source4/kdc/hdb-samba4.c
+++ b/source4/kdc/hdb-samba4.c
@@ -333,7 +333,7 @@ static krb5_error_code hdb_samba4_message2entry_keys(krb5_context context,
 		key.salt = NULL; /* No salt for this enc type */
 
 		ret = krb5_keyblock_init(context,
-					 ENCTYPE_ARCFOUR_HMAC_MD5,
+					 ENCTYPE_ARCFOUR_HMAC,
 					 hash->hash, sizeof(hash->hash), 
 					 &key.key);
 		if (ret) {
@@ -839,7 +839,7 @@ static krb5_error_code hdb_samba4_trust_message2entry(krb5_context context, HDB
 		}
 		
 		ret = krb5_keyblock_init(context,
-					 ENCTYPE_ARCFOUR_HMAC_MD5,
+					 ENCTYPE_ARCFOUR_HMAC,
 					 password_hash.hash, sizeof(password_hash.hash), 
 					 &key.key);
 		
diff --git a/source4/lib/ldb/common/attrib_handlers.c b/source4/lib/ldb/common/attrib_handlers.c
index 3ea9857..53795fd 100644
--- a/source4/lib/ldb/common/attrib_handlers.c
+++ b/source4/lib/ldb/common/attrib_handlers.c
@@ -62,7 +62,7 @@ int ldb_handler_fold(struct ldb_context *ldb, void *mem_ctx,
 
 	out->data = (uint8_t *)ldb_casefold(ldb, mem_ctx, (const char *)(in->data), in->length);
 	if (out->data == NULL) {
-		ldb_debug(ldb, LDB_DEBUG_ERROR, "ldb_handler_fold: unable to casefold string [%s]", in->data);
+		ldb_debug(ldb, LDB_DEBUG_ERROR, "ldb_handler_fold: unable to casefold string [%.*s]", (int)in->length, (const char *)in->data);
 		return -1;
 	}
 


-- 
Samba Shared Repository