summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--auth/gensec/spnego.c2
-rw-r--r--source3/Makefile.in11
-rw-r--r--source3/configure.in3
3 files changed, 11 insertions, 5 deletions
diff --git a/auth/gensec/spnego.c b/auth/gensec/spnego.c
index 073496b8df..15fd8dae1d 100644
--- a/auth/gensec/spnego.c
+++ b/auth/gensec/spnego.c
@@ -30,6 +30,8 @@
#include "param/param.h"
#include "lib/util/asn1.h"
+#undef strcasecmp
+
_PUBLIC_ NTSTATUS gensec_spnego_init(void);
enum spnego_state_position {
diff --git a/source3/Makefile.in b/source3/Makefile.in
index b92097c223..96c58c84dc 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -552,6 +552,8 @@ LIBSMB_ERR_OBJ = $(LIBSMB_ERR_OBJ0) $(LIBSMB_ERR_OBJ1) \
$(SECRETS_OBJ)
LIBSMB_OBJ0 = \
+ ../lib/util/asn1.o \
+ ../libcli/auth/spnego_parse.o \
../libcli/auth/ntlm_check.o \
libsmb/ntlmssp.o \
libsmb/ntlmssp_wrap.o \
@@ -559,6 +561,7 @@ LIBSMB_OBJ0 = \
../auth/gensec/gensec.o \
../auth/gensec/gensec_start.o \
../auth/gensec/gensec_util.o \
+ ../auth/gensec/spnego.o \
../auth/credentials/credentials.o \
../auth/credentials/credentials_samba3.o \
../auth/ntlmssp/ntlmssp.o \
@@ -592,8 +595,6 @@ SCHANNEL_OBJ = ../libcli/auth/credentials.o \
LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
libsmb/clikrb5.o ../libcli/auth/krb5_wrap.o libsmb/clispnego.o \
- ../libcli/auth/spnego_parse.o \
- ../lib/util/asn1.o \
libsmb/reparse_symlink.o \
libsmb/clisymlink.o \
libsmb/clirap.o libsmb/clierror.o libsmb/climessage.o \
@@ -1068,7 +1069,7 @@ PDBEDIT_OBJ = utils/pdbedit.o $(PASSWD_UTIL_OBJ) $(PARAM_OBJ) $(PASSDB_OBJ) \
$(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) \
$(LIBCLI_LDAP_NDR_OBJ) \
$(DRSUAPI_OBJ) $(LIBNDR_GEN_OBJ0) \
- $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) ../lib/util/asn1.o
+ $(POPT_LIB_OBJ) $(SMBLDAP_OBJ)
SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ1)
@@ -1345,7 +1346,7 @@ WINBIND_WINS_NSS_OBJ = ../nsswitch/wins.o $(PARAM_OBJ) \
$(LIB_NONSMBD_OBJ) $(LIBSMB_ERR_OBJ) $(LIBNMB_OBJ)
PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
- pam_smbpass/pam_smb_acct.o pam_smbpass/support.o ../lib/util/asn1.o
+ pam_smbpass/pam_smb_acct.o pam_smbpass/support.o
PAM_SMBPASS_OBJ = $(PAM_SMBPASS_OBJ_0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
$(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) \
$(DRSUAPI_OBJ) $(LIBNDR_GEN_OBJ0) \
@@ -1525,7 +1526,7 @@ TDBTORTURE_OBJ = @tdbdir@/tools/tdbtorture.o $(LIBREPLACE_OBJ) \
NTLM_AUTH_OBJ1 = utils/ntlm_auth.o utils/ntlm_auth_diagnostics.o
NTLM_AUTH_OBJ = ${NTLM_AUTH_OBJ1} $(LIBSAMBA_OBJ) $(POPT_LIB_OBJ) \
- ../lib/util/asn1.o ../libcli/auth/spnego_parse.o libsmb/clikrb5.o ../libcli/auth/krb5_wrap.o libads/kerberos.o \
+ libsmb/clikrb5.o ../libcli/auth/krb5_wrap.o libads/kerberos.o \
libsmb/samlogon_cache.o \
$(LIBADS_SERVER_OBJ) \
$(PASSDB_OBJ) $(GROUPDB_OBJ) \
diff --git a/source3/configure.in b/source3/configure.in
index c0ddc27d0e..e59d1e59b9 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -7167,6 +7167,9 @@ AC_ZLIB([ZLIB_OBJS=""], [
CFLAGS="-I../lib/zlib $CFLAGS"
])
+AC_DEFINE(STATIC_gensec_MODULES, [gensec_spnego_init,NULL],[gensec modules])
+AC_DEFINE(STATIC_gensec_MODULES_PROTO, [_MODULE_PROTO(gensec_spnego_init)],[gensec protos])
+
AC_ARG_ENABLE(dmalloc, [AS_HELP_STRING([--enable-dmalloc], [Enable heap debugging [default=no]])])
if test "x$enable_dmalloc" = xyes