sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

r1449: Use the config system somewhat better in libcli/auth

Browse Source 
(This used to be commit 69de0d95c585c1a73072e921884cbd427c160176)
This commit is contained in:
Jelmer Vernooij 2004-07-11 12:15:58 +00:00 committed by Gerald (Jerry) Carter
parent f9ddbad006
commit 396a729686
5 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/configure.in
View File

@ -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)

9
source4/libcli/auth/gensec.c
View File

@ -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;

2
source4/libcli/auth/spnego.c
View File

@ -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);

2
source4/libcli/config.m4
View File

@ -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])

23
source4/libcli/config.mk
View File

@ -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
#################################