diff options
| author | Alexander Bokovoy <ab@samba.org> | 2012-04-24 19:37:13 +0300 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2012-04-25 00:18:32 +0200 |
| commit | 594e3161810ba5a57ce5a3c88a8cd89b11d04650 (patch) | |
| tree | 85f2a84c3ff5260722027db8fa940d30e5de5f2d /source3 | |
| parent | 2d01099acc77d433f06f36f854f27fd9f1e43f05 (diff) | |
| download | samba-594e3161810ba5a57ce5a3c88a8cd89b11d04650.tar.gz samba-594e3161810ba5a57ce5a3c88a8cd89b11d04650.tar.bz2 samba-594e3161810ba5a57ce5a3c88a8cd89b11d04650.zip | |
lib/replace: split out GSSAPI from lib/replace/system/kerberos.h into lib/replace/system/gssapi.h
With waf build include directories are defined by dependencies specified to subsystems.
Without proper dependency <gssapi/gssapi.h> cannot be found for embedded Heimdal builds
when there are no system-wide gssapi/gssapi.h available.
Split out GSSAPI header includes in a separate replacement header and use that explicitly
where needed.
Autobuild-User: Alexander Bokovoy <ab@samba.org>
Autobuild-Date: Wed Apr 25 00:18:33 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/configure.in | 2 | ||||
| -rw-r--r-- | source3/libads/ads_status.c | 1 | ||||
| -rw-r--r-- | source3/libads/sasl.c | 1 | ||||
| -rwxr-xr-x | source3/wscript_build | 4 |
4 files changed, 6 insertions, 2 deletions
diff --git a/source3/configure.in b/source3/configure.in index 70bdfc7b63..0253e076dc 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -3568,6 +3568,8 @@ if test x"$with_ads_support" != x"no"; then if test x"$have_gssapi" != xyes ; then AC_MSG_WARN([Samba cannot be supported without GSSAPI]) use_ads=no + else + AC_DEFINE(HAVE_LIBGSSAPI, , [Whether the platform has GSSAPI support]) fi AC_CHECK_FUNC_EXT(krb5_set_real_time, $KRB5_LIBS) diff --git a/source3/libads/ads_status.c b/source3/libads/ads_status.c index 919e5d34dc..fc489a9f00 100644 --- a/source3/libads/ads_status.c +++ b/source3/libads/ads_status.c @@ -22,6 +22,7 @@ #include "includes.h" #include "smb_krb5.h" +#include "system/gssapi.h" #include "smb_ldap.h" #include "libads/ads_status.h" diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c index 02fd7545e5..42d65b63d4 100644 --- a/source3/libads/sasl.c +++ b/source3/libads/sasl.c @@ -23,6 +23,7 @@ #include "auth_generic.h" #include "ads.h" #include "smb_krb5.h" +#include "system/gssapi.h" #ifdef HAVE_LDAP diff --git a/source3/wscript_build b/source3/wscript_build index ddd33467cc..b9bb6ad524 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -782,7 +782,7 @@ bld.SAMBA3_LIBRARY('util_cmdline', bld.SAMBA3_SUBSYSTEM('KRBCLIENT', source=KRBCLIENT_SRC, - public_deps='krb5samba k5crypto LIBTSOCKET CLDAP LIBNMB', + public_deps='krb5samba k5crypto gssapi LIBTSOCKET CLDAP LIBNMB', vars=locals()) bld.SAMBA3_SUBSYSTEM('samba3util', @@ -875,7 +875,7 @@ bld.SAMBA3_LIBRARY('ads', bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER', source=LIBADS_SERVER_SRC, - deps='SERVER_MUTEX ndr-krb5pac krb5samba', + deps='SERVER_MUTEX ndr-krb5pac krb5samba gssapi', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBADS_PRINTER', |