svn commit: samba r3537 - in trunk/source: . include libsmb
jra at samba.org
jra at samba.org
Fri Nov 5 00:52:51 GMT 2004
Author: jra
Date: 2004-11-05 00:52:50 +0000 (Fri, 05 Nov 2004)
New Revision: 3537
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3537
Log:
Fix the build with the latest Heimdal code.
Jeremy.
Modified:
trunk/source/configure.in
trunk/source/include/includes.h
trunk/source/libsmb/clikrb5.c
Changeset:
Modified: trunk/source/configure.in
===================================================================
--- trunk/source/configure.in 2004-11-04 23:57:49 UTC (rev 3536)
+++ trunk/source/configure.in 2004-11-05 00:52:50 UTC (rev 3537)
@@ -2796,6 +2796,18 @@
LIBS="$KRB5_LIBS $LIBS"
+ AC_CACHE_CHECK([for krb5_encrypt_block type],
+ samba_cv_HAVE_KRB5_ENCRYPT_BLOCK,[
+ AC_TRY_COMPILE([#include <krb5.h>],
+ [krb5_encrypt_block block;],
+ samba_cv_HAVE_KRB5_ENCRYPT_BLOCK=yes,
+ samba_cv_HAVE_KRB5_ENCRYPT_BLOCK=no)])
+
+ if test x"$samba_cv_HAVE_KRB5_ENCRYPT_BLOCK" = x"yes"; then
+ AC_DEFINE(HAVE_KRB5_ENCRYPT_BLOCK,1,
+ [Whether the type krb5_encrypt_block exists])
+ fi
+
AC_CACHE_CHECK([for addrtype in krb5_address],
samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS,[
AC_TRY_COMPILE([#include <krb5.h>],
Modified: trunk/source/include/includes.h
===================================================================
--- trunk/source/include/includes.h 2004-11-04 23:57:49 UTC (rev 3536)
+++ trunk/source/include/includes.h 2004-11-05 00:52:50 UTC (rev 3537)
@@ -455,13 +455,9 @@
#if HAVE_GSSAPI_H
#include <gssapi.h>
-#endif
-
-#if HAVE_GSSAPI_GSSAPI_H
+#elif HAVE_GSSAPI_GSSAPI_H
#include <gssapi/gssapi.h>
-#endif
-
-#if HAVE_GSSAPI_GSSAPI_GENERIC_H
+#elif HAVE_GSSAPI_GSSAPI_GENERIC_H
#include <gssapi/gssapi_generic.h>
#endif
Modified: trunk/source/libsmb/clikrb5.c
===================================================================
--- trunk/source/libsmb/clikrb5.c 2004-11-04 23:57:49 UTC (rev 3536)
+++ trunk/source/libsmb/clikrb5.c 2004-11-05 00:52:50 UTC (rev 3537)
@@ -80,7 +80,7 @@
#error UNKNOWN_ADDRTYPE
#endif
-#if defined(HAVE_KRB5_PRINCIPAL2SALT) && defined(HAVE_KRB5_USE_ENCTYPE) && defined(HAVE_KRB5_STRING_TO_KEY)
+#if defined(HAVE_KRB5_PRINCIPAL2SALT) && defined(HAVE_KRB5_USE_ENCTYPE) && defined(HAVE_KRB5_STRING_TO_KEY) && defined(HAVE_KRB5_ENCRYPT_BLOCK)
int create_kerberos_key_from_string_direct(krb5_context context,
krb5_principal host_princ,
krb5_data *password,
More information about the samba-cvs
mailing list