svn commit: samba r15511 - in branches/SAMBA_4_0/source: auth/kerberos dsdb/samdb/ldb_modules include

[abartlet at samba.org]

Author: abartlet
Date: 2006-05-08 09:24:07 +0000 (Mon, 08 May 2006)
New Revision: 15511

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15511

Log:
Using this name causes less warnings on the IBM checker, due to using
the original, rather than equivilant, enum type.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/auth/kerberos/kerberos_util.c
   branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c
   branches/SAMBA_4_0/source/include/ads.h


Changeset:
Modified: branches/SAMBA_4_0/source/auth/kerberos/kerberos_util.c
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/kerberos_util.c	2006-05-08 08:27:22 UTC (rev 15510)
+++ branches/SAMBA_4_0/source/auth/kerberos/kerberos_util.c	2006-05-08 09:24:07 UTC (rev 15511)
@@ -181,7 +181,7 @@
 			return EINVAL;
 		}
 		ret = krb5_keyblock_init(smb_krb5_context->krb5_context,
-					 ENCTYPE_ARCFOUR_HMAC,
+					 ETYPE_ARCFOUR_HMAC_MD5,
 					 mach_pwd->hash, sizeof(mach_pwd->hash), 
 					 &keyblock);
 		
@@ -410,7 +410,7 @@
 			return EINVAL;
 		}
 		ret = krb5_keyblock_init(smb_krb5_context->krb5_context,
-					 ENCTYPE_ARCFOUR_HMAC,
+					 ETYPE_ARCFOUR_HMAC_MD5,
 					 mach_pwd->hash, sizeof(mach_pwd->hash), 
 					 &entry.keyblock);
 		if (ret) {
@@ -434,7 +434,9 @@
 			return ret;
 		}
 		
-		krb5_enctype_to_string(smb_krb5_context->krb5_context, ENCTYPE_ARCFOUR_HMAC, &enctype_string);
+		krb5_enctype_to_string(smb_krb5_context->krb5_context, 
+				       ETYPE_ARCFOUR_HMAC_MD5,
+				       &enctype_string);
 		DEBUG(5, ("Added %s(kvno %d) to keytab (%s)\n", 
 			  cli_credentials_get_principal(machine_account, mem_ctx),
 			  cli_credentials_get_kvno(machine_account),

Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c	2006-05-08 08:27:22 UTC (rev 15510)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c	2006-05-08 09:24:07 UTC (rev 15511)
@@ -491,7 +491,7 @@
 			size_t len;
 			struct ldb_val val;
 			
-			if (keys[i].key.keytype == ENCTYPE_ARCFOUR_HMAC) {
+			if (keys[i].key.keytype == ETYPE_ARCFOUR_HMAC_MD5) {
 				/* We might end up doing this below:
 				 * This ensures we get the unicode
 				 * conversion right.  This should also
@@ -548,9 +548,9 @@
 		key.salt = NULL; /* No salt for this enc type */
 
 		krb5_ret = krb5_keyblock_init(smb_krb5_context->krb5_context,
-					 ENCTYPE_ARCFOUR_HMAC,
-					 ntPwdHash->hash, sizeof(ntPwdHash->hash), 
-					 &key.key);
+					      ETYPE_ARCFOUR_HMAC_MD5,
+					      ntPwdHash->hash, sizeof(ntPwdHash->hash), 
+					      &key.key);
 		if (krb5_ret) {
 			return LDB_ERR_OPERATIONS_ERROR;
 		}

Modified: branches/SAMBA_4_0/source/include/ads.h
===================================================================
--- branches/SAMBA_4_0/source/include/ads.h	2006-05-08 08:27:22 UTC (rev 15510)
+++ branches/SAMBA_4_0/source/include/ads.h	2006-05-08 09:24:07 UTC (rev 15511)
@@ -197,11 +197,6 @@
 /* Kerberos environment variable names */
 #define KRB5_ENV_CCNAME "KRB5CCNAME"
 
-/* Heimdal uses a slightly different name */
-#if defined(HAVE_ENCTYPE_ARCFOUR_HMAC_MD5)
-#define ENCTYPE_ARCFOUR_HMAC ENCTYPE_ARCFOUR_HMAC_MD5
-#endif
-
 #define INSTANCE_TYPE_IS_NC_HEAD	0x00000001
 #define INSTANCE_TYPE_UNINSTANT		0x00000002
 #define INSTANCE_TYPE_WRITE		0x00000004