sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

Fist part of fixes to make us compile with Heimdal. Don't explicitly

Browse Source 
detect for now, I still have vague hopes of hiding the differences
between MIT and Heimdal with a compatibility layer....
Jeremy.
(This used to be commit 54d83de8a2)
This commit is contained in:
Jeremy Allison 2003-01-16 02:39:49 +00:00
parent a84f1e7535
commit 7dd7d3a96a
4 changed files with 282 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

402
source3/configure vendored
View File

File diff suppressed because it is too large Load Diff

8
source3/configure.in
View File

@ -2032,12 +2032,15 @@ fi
# now check for gssapi headers. This is also done here to allow for # now check for gssapi headers. This is also done here to allow for
# different kerberos include paths # different kerberos include paths
AC_CHECK_HEADERS(gssapi/gssapi_generic.h gssapi/gssapi.h) AC_CHECK_HEADERS(gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h)
################################################################## ##################################################################
# we might need the k5crypto and com_err libraries on some systems # we might need the k5crypto and com_err libraries on some systems
AC_CHECK_LIB(com_err, _et_list, [LIBS="$LIBS -lcom_err"]) AC_CHECK_LIB(com_err, _et_list, [LIBS="$LIBS -lcom_err"])
AC_CHECK_LIB(k5crypto, krb5_encrypt_data, [LIBS="$LIBS -lk5crypto"]) AC_CHECK_LIB(k5crypto, krb5_encrypt_data, [LIBS="$LIBS -lk5crypto"])
# Heimdal checks.
AC_CHECK_LIB(crypto, des_set_key, [LIBS="$LIBS -lcrypto"])
AC_CHECK_LIB(asn1, copy_Authenticator, [LIBS="$LIBS -lasn1 -lroken"])
######################################################## ########################################################
# now see if we can find the krb5 libs in standard paths # now see if we can find the krb5 libs in standard paths
@ -2049,6 +2052,9 @@ fi
# now see if we can find the gssapi libs in standard paths # now see if we can find the gssapi libs in standard paths
AC_CHECK_LIB(gssapi_krb5, gss_display_status, [LIBS="$LIBS -lgssapi_krb5"; AC_CHECK_LIB(gssapi_krb5, gss_display_status, [LIBS="$LIBS -lgssapi_krb5";
AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])]) AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])])
# Heimdal checks.
AC_CHECK_LIB(gssapi, gss_display_status, [LIBS="$LIBS -lgssapi";
AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])])
fi fi
######################################################## ########################################################

14
source3/include/config.h.in
View File

@ -1,4 +1,4 @@
/* include/config.h.in. Generated automatically from configure.in by autoheader 2.13. */ /* include/config.h.in. Generated automatically from configure.in by autoheader. */
/* Define if type char is unsigned and you are not using gcc. */ /* Define if type char is unsigned and you are not using gcc. */
#ifndef __CHAR_UNSIGNED__ #ifndef __CHAR_UNSIGNED__
@ -896,6 +896,9 @@
/* Define if you have the <grp.h> header file. */ /* Define if you have the <grp.h> header file. */
#undef HAVE_GRP_H #undef HAVE_GRP_H
/* Define if you have the <gssapi.h> header file. */
#undef HAVE_GSSAPI_H
/* Define if you have the <gssapi/gssapi.h> header file. */ /* Define if you have the <gssapi/gssapi.h> header file. */
#undef HAVE_GSSAPI_GSSAPI_H #undef HAVE_GSSAPI_GSSAPI_H
@ -1256,9 +1259,6 @@
/* Whether we have CUPS */ /* Whether we have CUPS */
#undef HAVE_CUPS #undef HAVE_CUPS
/* Whether we have dlopen() */
#undef HAVE_DLOPEN
/* Whether the compiler supports immediate structures */ /* Whether the compiler supports immediate structures */
#undef HAVE_IMMEDIATE_STRUCTURES #undef HAVE_IMMEDIATE_STRUCTURES
@ -1313,9 +1313,6 @@
/* Whether the system has connect() */ /* Whether the system has connect() */
#undef HAVE_CONNECT #undef HAVE_CONNECT
/* Whether the system has yp_get_default_domain() */
#undef HAVE_YP_GET_DEFAULT_DOMAIN
/* Whether stat64() is available */ /* Whether stat64() is available */
#undef HAVE_STAT64 #undef HAVE_STAT64
@ -1610,6 +1607,9 @@
/* Whether GSSAPI is available */ /* Whether GSSAPI is available */
#undef HAVE_GSSAPI #undef HAVE_GSSAPI
/* Whether GSSAPI is available */
#undef HAVE_GSSAPI
/* Whether ldap is available */ /* Whether ldap is available */
#undef HAVE_LDAP #undef HAVE_LDAP

4
source3/include/includes.h
View File

@ -412,6 +412,10 @@
#undef HAVE_LDAP #undef HAVE_LDAP
#endif #endif
#if HAVE_GSSAPI_H
#include <gssapi.h>
#endif
#if HAVE_GSSAPI_GSSAPI_H #if HAVE_GSSAPI_GSSAPI_H
#include <gssapi/gssapi.h> #include <gssapi/gssapi.h>
#endif #endif