summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-07-11 12:15:58 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:56:57 -0500
commit396a729686644838468d06c2b011c33705e731cb (patch)
tree8ad2fe87c6001f8b474108e9ecfa1d648c385fdf
parentf9ddbad0067606cf2aca0ee62e701ed21491cdec (diff)
downloadsamba-396a729686644838468d06c2b011c33705e731cb.tar.gz
samba-396a729686644838468d06c2b011c33705e731cb.tar.bz2
samba-396a729686644838468d06c2b011c33705e731cb.zip
r1449: Use the config system somewhat better in libcli/auth
(This used to be commit 69de0d95c585c1a73072e921884cbd427c160176)
-rw-r--r--source4/configure.in2
-rw-r--r--source4/libcli/auth/gensec.c9
-rw-r--r--source4/libcli/auth/spnego.c2
-rw-r--r--source4/libcli/config.m42
-rw-r--r--source4/libcli/config.mk23
5 files changed, 5 insertions, 33 deletions
diff --git a/source4/configure.in b/source4/configure.in
index 803ed57bbd..a86a99f49d 100644
--- a/source4/configure.in
+++ b/source4/configure.in
@@ -18,6 +18,8 @@ SMB_INCLUDE_M4(lib/tdb/config.m4)
SMB_INCLUDE_M4(lib/ldb/config.m4)
SMB_INCLUDE_M4(lib/cmdline/config.m4)
SMB_INCLUDE_M4(param/config.m4)
+SMB_INCLUDE_M4(libcli/auth/config.m4)
+SMB_INCLUDE_M4(libcli/auth/gensec.m4)
SMB_INCLUDE_M4(libcli/config.m4)
SMB_INCLUDE_M4(librpc/config.m4)
SMB_INCLUDE_M4(libcli/libsmb.m4)
diff --git a/source4/libcli/auth/gensec.c b/source4/libcli/auth/gensec.c
index 83738109c6..f4abfd00e5 100644
--- a/source4/libcli/auth/gensec.c
+++ b/source4/libcli/auth/gensec.c
@@ -498,7 +498,7 @@ BOOL gensec_init(void)
static BOOL initialised;
NTSTATUS status;
- /* this is *completly* the wrong way to do this */
+ /* this is *completely* the wrong way to do this */
if (initialised) {
return True;
}
@@ -508,12 +508,7 @@ BOOL gensec_init(void)
return False;
}
- /* FIXME: Perhaps panic if a basic backend, such as NTLMSSP, fails to initialise? */
- gensec_ntlmssp_init();
-#if 0
- gensec_krb5_init();
-#endif
- gensec_spnego_init();
+ static_init_gensec;
gensec_dcerpc_schannel_init();
initialised = True;
diff --git a/source4/libcli/auth/spnego.c b/source4/libcli/auth/spnego.c
index c9d0c6f97d..7e0cda42ba 100644
--- a/source4/libcli/auth/spnego.c
+++ b/source4/libcli/auth/spnego.c
@@ -579,7 +579,7 @@ static const struct gensec_security_ops gensec_spnego_security_ops = {
.end = gensec_spnego_end
};
-NTSTATUS gensec_spengo_init(void)
+NTSTATUS gensec_spnego_init(void)
{
NTSTATUS ret;
ret = register_backend("gensec", &gensec_spnego_security_ops);
diff --git a/source4/libcli/config.m4 b/source4/libcli/config.m4
index c926d7dae6..41f7ad6812 100644
--- a/source4/libcli/config.m4
+++ b/source4/libcli/config.m4
@@ -46,7 +46,5 @@ SMB_SUBSYSTEM(LIBCLI_NMB,[],
libcli/nmblib.o
libcli/namequery.o])
-SMB_SUBSYSTEM_MK(LIBCLI_AUTH,libcli/config.mk)
-
SMB_SUBSYSTEM(LIBCLI,[],[],[],
[LIBCLI_RAW LIBCLI_UTILS LIBCLI_AUTH LIBCLI_NMB])
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 0894ac7174..e69de29bb2 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -1,23 +0,0 @@
-#################################
-# Start SUBSYSTEM LIBCLI_AUTH
-[SUBSYSTEM::LIBCLI_AUTH]
-ADD_OBJ_FILES = \
- libcli/auth/spnego.o \
- libcli/auth/spnego_parse.o \
- libcli/auth/ntlmssp.o \
- libcli/auth/ntlmssp_parse.o \
- libcli/auth/ntlmssp_sign.o \
- libcli/auth/schannel.o \
- libcli/auth/credentials.o \
- libcli/auth/session.o \
- libcli/auth/ntlm_check.o \
- libcli/auth/kerberos.o \
- libcli/auth/kerberos_verify.o \
- libcli/auth/clikrb5.o \
- libcli/auth/gensec.o \
- libcli/auth/gensec_ntlmssp.o
-REQUIRED_SUBSYSTEMS = \
- AUTH SCHANNELDB
-# End SUBSYSTEM LIBCLI_AUTH
-#################################
-