summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2011-07-07 14:59:51 +0200
committerAndreas Schneider <asn@cryptomilk.org>2011-07-07 16:50:05 +0200
commit1caa7a852c972f1e6a88538f6d10baec17842449 (patch)
treebe90d3bca06e0523f5aa2a099622895ca35df4c4
parentcd83c1d9582e3252b2c964d77aebf1d241d371a6 (diff)
downloadsamba-1caa7a852c972f1e6a88538f6d10baec17842449.tar.gz
samba-1caa7a852c972f1e6a88538f6d10baec17842449.tar.xz
samba-1caa7a852c972f1e6a88538f6d10baec17842449.zip
s3-waf: Fix linking bugs causing segfaults.
As auth_util.c is linked several times the static variables have different address on different calls. This leads to segfaults. Autobuild-User: Andreas Schneider <asn@cryptomilk.org> Autobuild-Date: Thu Jul 7 16:50:05 CEST 2011 on sn-devel-104
-rw-r--r--source3/rpc_server/wscript_build2
-rwxr-xr-xsource3/wscript_build2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build
index f0ee2d9d2c9..c3cf2f93275 100644
--- a/source3/rpc_server/wscript_build
+++ b/source3/rpc_server/wscript_build
@@ -27,7 +27,7 @@ bld.SAMBA3_SUBSYSTEM('rpc',
bld.SAMBA3_SUBSYSTEM('RPC_NCACN_NP',
source='rpc_ncacn_np.c rpc_handles.c rpc_contexts.c',
- deps='auth_sam_reply RPC_PIPE_REGISTER AUTH_COMMON npa_tstream')
+ deps='auth auth_sam_reply RPC_PIPE_REGISTER npa_tstream')
bld.SAMBA3_SUBSYSTEM('RPC_SERVICE',
source='rpc_server.c',
diff --git a/source3/wscript_build b/source3/wscript_build
index 5972196e70e..020eaaf71d2 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1129,7 +1129,7 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
LIBCLI_SAMR libcli_lsa3 LIBRPCCLI_NETLOGON
RPC_NDR_DSSETUP npa_tstream INIT_NETLOGON
RPC_NCACN_NP RPC_PIPE_REGISTER RPC_SAMR RPC_LSARPC
- PAM_ERRORS WB_REQTRANS AUTH_COMMON
+ PAM_ERRORS WB_REQTRANS auth
''',
enabled=bld.env.build_winbind,
install_path='${SBINDIR}',