diff options
Diffstat (limited to 'source4')
| -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 | ||||
| -rw-r--r-- | source4/heimdal_build/wscript_configure | 1 | ||||
| -rw-r--r-- | source4/ntvfs/ipc/vfs_ipc.c | 2 |
5 files changed, 5 insertions, 5 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', diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure index e64128f44a..1c03b34106 100644 --- a/source4/heimdal_build/wscript_configure +++ b/source4/heimdal_build/wscript_configure @@ -147,6 +147,7 @@ conf.define('HAVE_KRB5_PDU_NONE_DECL', 1) conf.define('HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96', 1) conf.define('HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96', 1) conf.define('HAVE_KRB5_KRB5_PRINCIPAL_GET_NUM_COMP', 1) +conf.define('HAVE_GSSAPI_GSSAPI_SPNEGO_H', 1) heimdal_includedirs = [] heimdal_libdirs = [] diff --git a/source4/ntvfs/ipc/vfs_ipc.c b/source4/ntvfs/ipc/vfs_ipc.c index 8097a67ab9..a1651b0f02 100644 --- a/source4/ntvfs/ipc/vfs_ipc.c +++ b/source4/ntvfs/ipc/vfs_ipc.c @@ -38,7 +38,7 @@ #include "lib/socket/socket.h" #include "auth/credentials/credentials.h" #include "auth/credentials/credentials_krb5.h" -#include <gssapi/gssapi.h> +#include "system/gssapi.h" #include "system/locale.h" /* this is the private structure used to keep the state of an open |