diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-04-06 14:29:34 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-04-06 08:12:19 +0200 |
| commit | 5adf85e6afa949f8e636327bb3446aa4f41948a7 (patch) | |
| tree | 1cadcf16b8564956c48bbcb837e8145e8d867614 | |
| parent | a8da13cd5c7b5fa7cf3c6f9b3afce066f085e67c (diff) | |
| download | samba-5adf85e6afa949f8e636327bb3446aa4f41948a7.tar.gz samba-5adf85e6afa949f8e636327bb3446aa4f41948a7.tar.bz2 samba-5adf85e6afa949f8e636327bb3446aa4f41948a7.zip | |
tstream: make npa_tstream a private library
this prevents symbol duplication of the npa_tstream symbols
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | libcli/named_pipe_auth/wscript_build | 9 | ||||
| -rwxr-xr-x | source3/wscript_build | 4 | ||||
| -rw-r--r-- | source4/ntvfs/wscript_build | 2 | ||||
| -rw-r--r-- | source4/smbd/wscript_build | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/libcli/named_pipe_auth/wscript_build b/libcli/named_pipe_auth/wscript_build index c97893bb1f..53fbd84ab6 100644 --- a/libcli/named_pipe_auth/wscript_build +++ b/libcli/named_pipe_auth/wscript_build @@ -1,8 +1,9 @@ #!/usr/bin/env python -bld.SAMBA_SUBSYSTEM('NAMED_PIPE_AUTH_TSTREAM', - source='npa_tstream.c', - public_deps='NDR_NAMED_PIPE_AUTH tevent LIBTSOCKET' - ) +bld.SAMBA_LIBRARY('npa_tstream', + source='npa_tstream.c', + private_library=True, + public_deps='NDR_NAMED_PIPE_AUTH tevent LIBTSOCKET' + ) diff --git a/source3/wscript_build b/source3/wscript_build index 8685268478..b709b5f80b 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -860,7 +860,7 @@ bld.SAMBA3_LIBRARY('smbd_base', PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY3 REGFIO LIB_SMBCONF REG_FULL FNAME_UTIL LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS - RPC_NDR_SRVSVC NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON INIT_SAMR + RPC_NDR_SRVSVC npa_tstream INIT_NETLOGON INIT_SAMR LIBCLI_SMB_COMMON RPC_SERVER ''', private_library=True, @@ -1030,7 +1030,7 @@ bld.SAMBA3_BINARY('winbindd/winbindd', LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info TOKEN_UTIL LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON - RPC_NDR_DSSETUP NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON + RPC_NDR_DSSETUP npa_tstream INIT_NETLOGON RPC_NCACN_NP RPC_PIPE_REGISTER RPC_SAMR RPC_LSARPC PAM_ERRORS WB_REQTRANS AUTH_COMMON ''', diff --git a/source4/ntvfs/wscript_build b/source4/ntvfs/wscript_build index d020465f1b..43a6cd647f 100644 --- a/source4/ntvfs/wscript_build +++ b/source4/ntvfs/wscript_build @@ -52,7 +52,7 @@ bld.SAMBA_MODULE('ntvfs_ipc', autoproto='ipc/proto.h', subsystem='ntvfs', init_function='ntvfs_ipc_init', - deps='NDR_NAMED_PIPE_AUTH NAMED_PIPE_AUTH_TSTREAM gssapi credentials DCERPC_SHARE' + deps='NDR_NAMED_PIPE_AUTH npa_tstream gssapi credentials DCERPC_SHARE' ) diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build index 9d66889812..082ab6de46 100644 --- a/source4/smbd/wscript_build +++ b/source4/smbd/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_LIBRARY('service', source='service.c service_stream.c service_named_pipe.c service_task.c', autoproto='service_proto.h', - deps='tevent MESSAGING samba_socket RPC_NDR_IRPC NDR_NAMED_PIPE_AUTH NAMED_PIPE_AUTH_TSTREAM gssapi credentials LIBTSOCKET LIBSAMBA_TSOCKET process_model', + deps='tevent MESSAGING samba_socket RPC_NDR_IRPC NDR_NAMED_PIPE_AUTH npa_tstream gssapi credentials LIBTSOCKET LIBSAMBA_TSOCKET process_model', private_library=True ) |