summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-02-23 00:31:35 +0100
committerGünther Deschner <gd@samba.org>2011-02-23 02:16:23 +0100
commit67e72f52047a69050235f9ed1b85d87712b494f7 (patch)
treeccd8ce8c87c240d165bfe4750601946c408444e4
parent5f6790bc74beab4ea9cd1de014ada21840cb8c3b (diff)
downloadsamba-67e72f52047a69050235f9ed1b85d87712b494f7.tar.gz
samba-67e72f52047a69050235f9ed1b85d87712b494f7.tar.bz2
samba-67e72f52047a69050235f9ed1b85d87712b494f7.zip
s3-waf: move some parts of auth to AUTH_COMMON to avoid duplicate symbols with winbindd.
Guenther Autobuild-User: Günther Deschner <gd@samba.org> Autobuild-Date: Wed Feb 23 02:16:23 CET 2011 on sn-devel-104
-rw-r--r--source3/auth/wscript_build20
-rw-r--r--source3/wscript_build11
2 files changed, 15 insertions, 16 deletions
diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build
index 21e8058269..8bf2051526 100644
--- a/source3/auth/wscript_build
+++ b/source3/auth/wscript_build
@@ -2,7 +2,7 @@
AUTH_BUILTIN_SRC = 'auth_builtin.c'
AUTH_DOMAIN_SRC = 'auth_domain.c'
-AUTH_SAM_SRC = 'auth_sam.c check_samsec.c'
+AUTH_SAM_SRC = 'auth_sam.c'
AUTH_SERVER_SRC = 'auth_server.c'
AUTH_UNIX_SRC = 'auth_unix.c'
AUTH_WINBIND_SRC = 'auth_winbind.c'
@@ -10,11 +10,7 @@ AUTH_WBC_SRC = 'auth_wbc.c'
AUTH_SCRIPT_SRC = 'auth_script.c'
AUTH_NETLOGOND_SRC = 'auth_netlogond.c'
-AUTH_SRC = '''auth.c auth_util.c
- server_info.c
- server_info_sam.c
- user_info.c
- user_util.c
+AUTH_SRC = '''auth.c
user_krb5.c
auth_compat.c auth_ntlmssp.c'''
@@ -22,9 +18,19 @@ bld.SAMBA3_SUBSYSTEM('TOKEN_UTIL',
source='token_util.c',
vars=locals())
+bld.SAMBA3_SUBSYSTEM('AUTH_COMMON',
+ source='''auth_util.c
+ user_util.c
+ check_samsec.c
+ server_info.c
+ server_info_sam.c
+ user_info.c
+ user_util.c''',
+ vars=locals())
+
bld.SAMBA3_SUBSYSTEM('auth',
source=AUTH_SRC,
- deps='''PLAINTEXT_AUTH SLCACHE DCUTIL TOKEN_UTIL''',
+ deps='''PLAINTEXT_AUTH SLCACHE DCUTIL TOKEN_UTIL AUTH_COMMON''',
vars=locals())
bld.SAMBA3_MODULE('auth_sam',
diff --git a/source3/wscript_build b/source3/wscript_build
index 06c55c7395..425ca92d89 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -352,14 +352,7 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
winbindd/winbindd_pam_logoff.c
winbindd/winbindd_pam_chauthtok.c
winbindd/winbindd_pam_auth_crap.c
- winbindd/winbindd_pam_chng_pswd_auth_crap.c
- auth/auth_util.c
- auth/user_util.c
- auth/check_samsec.c
- auth/server_info.c
- auth/server_info_sam.c
- auth/user_info.c
- auth/user_util.c'''
+ winbindd/winbindd_pam_chng_pswd_auth_crap.c'''
WINBINDD_SRC = '''${WINBINDD_SRC1}
${TDB_VALIDATE_SRC}'''
@@ -1053,7 +1046,7 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON
RPC_NDR_DSSETUP NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON
RPC_NCACN_NP RPC_PIPE_REGISTER RPC_SAMR RPC_LSARPC
- PAM_ERRORS WB_REQTRANS
+ PAM_ERRORS WB_REQTRANS AUTH_COMMON
''',
enabled=bld.env.build_winbind,
install_path='${SBINDIR}',