summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2005-05-16 03:17:54 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:16:46 -0500
commitd44193098720b0b81f7f7add884c9ece92bf32b1 (patch)
treec201c78290bbd40fd487504bc9c984ec458db4d8 /source4
parentbc6312f74d19a0e561acc186c2e185e140bd22c5 (diff)
downloadsamba-d44193098720b0b81f7f7add884c9ece92bf32b1.tar.gz
samba-d44193098720b0b81f7f7add884c9ece92bf32b1.tar.bz2
samba-d44193098720b0b81f7f7add884c9ece92bf32b1.zip
r6810: Rename auth/{ntlmssp,gensec,kerberos} mk and m4 files to be called
config.mk and config.m4 to be consistent with the rest of Samba. (This used to be commit f377c71e4f0d60684326906dfb65e4581294ec34)
Diffstat (limited to 'source4')
-rw-r--r--source4/auth/gensec/config.m4 (renamed from source4/auth/gensec/gensec.m4)4
-rw-r--r--source4/auth/gensec/config.mk (renamed from source4/auth/gensec/gensec.mk)0
-rw-r--r--source4/auth/kerberos/config.m4 (renamed from source4/auth/kerberos/kerberos.m4)1
-rw-r--r--source4/auth/kerberos/config.mk (renamed from source4/auth/kerberos/kerberos.mk)0
-rw-r--r--source4/auth/ntlmssp/config.mk (renamed from source4/auth/ntlmssp/ntlmssp.mk)0
-rw-r--r--source4/build/smb_build/main.pm6
-rw-r--r--source4/configure.in4
7 files changed, 10 insertions, 5 deletions
diff --git a/source4/auth/gensec/gensec.m4 b/source4/auth/gensec/config.m4
index 4565ce0b97..1af0a1d9c8 100644
--- a/source4/auth/gensec/gensec.m4
+++ b/source4/auth/gensec/config.m4
@@ -1,8 +1,12 @@
SMB_MODULE_DEFAULT(gensec_krb5, NOT)
SMB_MODULE_DEFAULT(gensec_gssapi, NOT)
+SMB_MODULE_DEFAULT(gensec_gsskrb5, NOT)
if test x"$SMB_EXT_LIB_ENABLE_KRB5" = x"YES"; then
# krb5 is now disabled at runtime, not build time
SMB_MODULE_DEFAULT(gensec_krb5, STATIC)
SMB_MODULE_DEFAULT(gensec_gssapi, STATIC)
+ if test x"$samba_cv_GSS_C_DCE_STYLE" = x"yes"; then
+ SMB_MODULE_DEFAULT(gensec_gsskrb5, STATIC)
+ fi
fi
diff --git a/source4/auth/gensec/gensec.mk b/source4/auth/gensec/config.mk
index f8d1928585..f8d1928585 100644
--- a/source4/auth/gensec/gensec.mk
+++ b/source4/auth/gensec/config.mk
diff --git a/source4/auth/kerberos/kerberos.m4 b/source4/auth/kerberos/config.m4
index 6bfe486dd6..b78f96a877 100644
--- a/source4/auth/kerberos/kerberos.m4
+++ b/source4/auth/kerberos/config.m4
@@ -491,3 +491,4 @@ if test x"$with_krb5_support" != x"no"; then
fi
SMB_EXT_LIB(KRB5,[${KRB5_LIBS}],[${KRB5_CFLAGS}],[${KRB5_CPPFLAGS}],[${KRB5_LDFLAGS}])
+
diff --git a/source4/auth/kerberos/kerberos.mk b/source4/auth/kerberos/config.mk
index 38c8862747..38c8862747 100644
--- a/source4/auth/kerberos/kerberos.mk
+++ b/source4/auth/kerberos/config.mk
diff --git a/source4/auth/ntlmssp/ntlmssp.mk b/source4/auth/ntlmssp/config.mk
index 551c211d71..551c211d71 100644
--- a/source4/auth/ntlmssp/ntlmssp.mk
+++ b/source4/auth/ntlmssp/config.mk
diff --git a/source4/build/smb_build/main.pm b/source4/build/smb_build/main.pm
index 8057fa2095..a1943f581a 100644
--- a/source4/build/smb_build/main.pm
+++ b/source4/build/smb_build/main.pm
@@ -46,9 +46,9 @@ sub smb_build_main($)
"winbind/config.mk",
"nbt_server/config.mk",
"cldap_server/config.mk",
- "auth/gensec/gensec.mk",
- "auth/kerberos/kerberos.mk",
- "auth/ntlmssp/ntlmssp.mk",
+ "auth/gensec/config.mk",
+ "auth/kerberos/config.mk",
+ "auth/ntlmssp/config.mk",
"libcli/auth/config.mk",
"libcli/ldap/config.mk",
"libcli/config.mk",
diff --git a/source4/configure.in b/source4/configure.in
index 9186d225c3..0aff3be8c5 100644
--- a/source4/configure.in
+++ b/source4/configure.in
@@ -20,8 +20,8 @@ SMB_INCLUDE_M4(lib/ldb/config.m4)
SMB_INCLUDE_M4(lib/events/config.m4)
SMB_INCLUDE_M4(lib/cmdline/config.m4)
SMB_INCLUDE_M4(param/config.m4)
-SMB_INCLUDE_M4(auth/kerberos/kerberos.m4)
-SMB_INCLUDE_M4(auth/gensec/gensec.m4)
+SMB_INCLUDE_M4(auth/kerberos/config.m4)
+SMB_INCLUDE_M4(auth/gensec/config.m4)
SMB_INCLUDE_M4(libcli/config.m4)
SMB_INCLUDE_M4(smbd/process_model.m4)
SMB_INCLUDE_M4(lib/registry/config.m4)