svn commit: samba r3344 - in trunk/source: . libsmb

[jra at samba.org]

Author: jra
Date: 2004-10-29 00:02:26 +0000 (Fri, 29 Oct 2004)
New Revision: 3344

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

Log:
More MIT/Heimdal tests for comparing enctypes now.
Jeremy.

Modified:
   trunk/source/configure.in
   trunk/source/libsmb/clikrb5.c


Changeset:
Modified: trunk/source/configure.in
===================================================================
--- trunk/source/configure.in	2004-10-28 23:50:14 UTC (rev 3343)
+++ trunk/source/configure.in	2004-10-29 00:02:26 UTC (rev 3344)
@@ -2787,6 +2787,8 @@
   AC_CHECK_FUNC_EXT(krb5_free_keytab_entry_contents, $KRB5_LIBS)
   AC_CHECK_FUNC_EXT(krb5_kt_free_entry, $KRB5_LIBS)
   AC_CHECK_FUNC_EXT(krb5_krbhst_get_addrinfo, $KRB5_LIBS)
+  AC_CHECK_FUNC_EXT(krb5_c_enctype_compare, $KRB5_LIBS)
+  AC_CHECK_FUNC_EXT(krb5_enctypes_compatible_keys, $KRB5_LIBS)
 
   LIBS="$LIBS $KRB5_LIBS"
   

Modified: trunk/source/libsmb/clikrb5.c
===================================================================
--- trunk/source/libsmb/clikrb5.c	2004-10-28 23:50:14 UTC (rev 3343)
+++ trunk/source/libsmb/clikrb5.c	2004-10-29 00:02:26 UTC (rev 3344)
@@ -262,6 +262,20 @@
 #endif
 }
 
+krb5_boolean kerberos_compatible_enctypes(krb5_context context,
+				  krb5_enctype enctype1,
+				  krb5_enctype enctype2)
+{
+#if defined(HAVE_KRB5_C_ENCTYPE_COMPARE)
+	krb5_boolean similar = 0;
+
+	krb5_c_enctype_compare(context, enctype1, enctype2, &similar);
+	return similar;
+#elif defined(HAVE_KRB5_ENCTYPES_COMPATIBLE_KEYS)
+	return krb5_enctypes_compatible_keys(context, enctype1, enctype2);
+#endif
+}
+
 static BOOL ads_cleanup_expired_creds(krb5_context context, 
 				      krb5_ccache  ccache,
 				      krb5_creds  *credsp)