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 /source4/auth | |
| 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 'source4/auth')
| -rw-r--r-- | source4/auth/gensec/gensec_gssapi.c | 4 | ||||
| -rw-r--r-- | source4/auth/kerberos/krb5_init_context.c | 1 | ||||
| -rwxr-xr-x | source4/auth/kerberos/wscript_build | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c index efd8443760..31964731d5 100644 --- a/source4/auth/gensec/gensec_gssapi.c +++ b/source4/auth/gensec/gensec_gssapi.c @@ -24,6 +24,7 @@ #include "includes.h" #include "lib/events/events.h" #include "system/kerberos.h" +#include "system/gssapi.h" #include "auth/kerberos/kerberos.h" #include "librpc/gen_ndr/krb5pac.h" #include "auth/auth.h" @@ -37,9 +38,6 @@ #include "auth/gensec/gensec_toplevel_proto.h" #include "param/param.h" #include "auth/session_proto.h" -#include <gssapi/gssapi.h> -#include <gssapi/gssapi_krb5.h> -#include <gssapi/gssapi_spnego.h> #include "gensec_gssapi.h" #include "lib/util/util_net.h" #include "auth/kerberos/pac_utils.h" diff --git a/source4/auth/kerberos/krb5_init_context.c b/source4/auth/kerberos/krb5_init_context.c index 4125f39548..e90f8a6e19 100644 --- a/source4/auth/kerberos/krb5_init_context.c +++ b/source4/auth/kerberos/krb5_init_context.c @@ -22,6 +22,7 @@ #include "includes.h" #include "system/kerberos.h" +#include "system/gssapi.h" #include <tevent.h> #include "auth/kerberos/kerberos.h" #include "lib/socket/socket.h" diff --git a/source4/auth/kerberos/wscript_build b/source4/auth/kerberos/wscript_build index 2ba6d56410..1a9b544465 100755 --- a/source4/auth/kerberos/wscript_build +++ b/source4/auth/kerberos/wscript_build @@ -2,7 +2,7 @@ bld.SAMBA_SUBSYSTEM('KRB_INIT_CTX', source='krb5_init_context.c', - deps='krb5samba' + deps='gssapi krb5samba' ) bld.SAMBA_LIBRARY('authkrb5', |