tstream: make npa_tstream a private library

this prevents symbol duplication of the npa_tstream symbols

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

diff --git a/libcli/named_pipe_auth/wscript_build b/libcli/named_pipe_auth/wscript_build
index c97893bb1f299ea6f263f79ee8decd77e9b9dff6..53fbd84ab6905de603dcf2f1e2ebed94167848dd 100644 (file)
--- 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 8685268478f0f717f7eef9d5525e25af931da668..b709b5f80b272793270670961d180ac9842ddc0b 100755 (executable)
--- 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 d020465f1b1ed10f8700ad49bb017c6c232c3dcf..43a6cd647f9561830bbbce9ce459a0b46e84c99d 100644 (file)
--- 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 9d6688981235c592a1fe69f40f93468aa05595d4..082ab6de468389339effc18273f607857e03536b 100644 (file)
--- 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
        )