summaryrefslogtreecommitdiff
path: root/source4/auth
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-09-26 15:15:50 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:38:58 -0500
commite337caeed1459f876449611ae1684616d0ea8f55 (patch)
tree172bc1ed142701b20975771e3d788a0fb9aea034 /source4/auth
parent98a7da234869576c0b4b41ede9fd64a022c3ec58 (diff)
downloadsamba-e337caeed1459f876449611ae1684616d0ea8f55.tar.gz
samba-e337caeed1459f876449611ae1684616d0ea8f55.tar.bz2
samba-e337caeed1459f876449611ae1684616d0ea8f55.zip
r10509: Some more sconscript fixes. Now getting to link stage for smbclient
(This used to be commit 6df956edbab7ad5e72b2f20e74ab0f0d62528932)
Diffstat (limited to 'source4/auth')
-rw-r--r--source4/auth/SConscript24
-rw-r--r--source4/auth/gensec/SConscript5
-rw-r--r--source4/auth/kerberos/SConscript6
3 files changed, 20 insertions, 15 deletions
diff --git a/source4/auth/SConscript b/source4/auth/SConscript
index a14fc2f48d..7b1358b908 100644
--- a/source4/auth/SConscript
+++ b/source4/auth/SConscript
@@ -15,16 +15,26 @@ if hostenv['configure']:
proto_files = []
hostenv.StaticLibrary('pam_errors.c')
-proto_files += ['pam_errors.c']
+proto_files += ['pam_errors.c', 'auth_sam.c']
auth_files = ['auth.c','auth_util.c','auth_sam_reply.c','ntlm_check.c']
proto_files += auth_files
hostenv.StaticLibrary('auth',auth_files)
-hostenv.proto_headers += hostenv.CProtoHeader('proto.h', proto_files)
-
-hostenv.StaticLibrary('gensec_ntlmssp',
- ['ntlmssp/ntlmssp_parse.c', 'ntlmssp/ntlmssp.c',
+ntlmssp_files = ['ntlmssp/ntlmssp_parse.c', 'ntlmssp/ntlmssp.c',
'ntlmssp/ntlmssp_sign.c','ntlmssp/ntlmssp_client.c',
- 'ntlmssp/ntlmssp_server.c'])
+ 'ntlmssp/ntlmssp_server.c']
+proto_files += ntlmssp_files
+hostenv.StaticLibrary('gensec_ntlmssp', ntlmssp_files)
+
+kerberos_files = ['kerberos/kerberos.c','kerberos/clikrb5.c',
+ 'kerberos/kerberos_verify.c','kerberos/kerberos_util.c',
+ 'kerberos/kerberos_pac.c','kerberos/gssapi_parse.c',
+ 'kerberos/krb5_init_context.c']
+
+proto_files += kerberos_files
+
+hostenv.StaticLibrary('kerberos', kerberos_files)
+
+hostenv.proto_headers += hostenv.CProtoHeader('proto.h', proto_files)
-SConscript(dirs=['kerberos','gensec'])
+SConscript(dirs=['gensec'])
diff --git a/source4/auth/gensec/SConscript b/source4/auth/gensec/SConscript
index 404f70e77c..3c90d2b4eb 100644
--- a/source4/auth/gensec/SConscript
+++ b/source4/auth/gensec/SConscript
@@ -1,13 +1,14 @@
Import('hostenv')
gensec_files = ['gensec.c', 'gensec_krb5.c', 'gensec_gssapi.c', 'spnego.c',
- 'schannel.c', 'schannel_sign.c', 'schannel_state.c']
+ 'spnego_parse.c', 'schannel.c', 'schannel_sign.c',
+ 'schannel_state.c']
hostenv.proto_headers += hostenv.CProtoHeader('proto.h', gensec_files)
hostenv.StaticLibrary('gensec',['gensec.c'])
hostenv.StaticLibrary('gensec_krb5',['gensec_krb5.c'])
hostenv.StaticLibrary('gensec_gssapi',['gensec_gssapi.c'])
-hostenv.StaticLibrary('gensec_spnego',['spnego.c'])
+hostenv.StaticLibrary('gensec_spnego',['spnego.c','spnego_parse.c'])
hostenv.StaticLibrary('gensec_schannel',['schannel.c','schannel_sign.c'])
hostenv.StaticLibrary('schanneldb',['schannel_state.c'])
diff --git a/source4/auth/kerberos/SConscript b/source4/auth/kerberos/SConscript
deleted file mode 100644
index 8272f1c24a..0000000000
--- a/source4/auth/kerberos/SConscript
+++ /dev/null
@@ -1,6 +0,0 @@
-Import('hostenv')
-
-hostenv.StaticLibrary('kerberos',
- ['kerberos.c','clikrb5.c','kerberos_verify.c',
- 'kerberos_util.c','kerberos_pac.c','gssapi_parse.c',
- 'krb5_init_context.c'])