s4-rpc_server: split out DCERPC_SHARE as a separate subsystem

this avoids a problem with -Wl,-no-undefined in the ntvfs layer

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

diff --git a/source4/ntvfs/ipc/rap_server.c b/source4/ntvfs/ipc/rap_server.c
index 126c78ca9327cd04b91c5f5c092b771ee3dce70b..dbd1fccfea8bcce877bebfb19c23af945dfa58ea 100644 (file)
--- a/source4/ntvfs/ipc/rap_server.c
+++ b/source4/ntvfs/ipc/rap_server.c
@@ -24,6 +24,7 @@
 #include "libcli/raw/interfaces.h"
 #include "librpc/gen_ndr/srvsvc.h"
 #include "rpc_server/common/common.h"
+#include "rpc_server/common/share.h"
 #include "param/param.h"
 #include "ntvfs/ipc/ipc.h"
 #include "ntvfs/ipc/proto.h"

diff --git a/source4/ntvfs/wscript_build b/source4/ntvfs/wscript_build
index 48810f5dd3a7fb1a9012386311b5ae9a7098b13d..4948d2f984120302e08c78d610aa78d3d94b34c1 100644 (file)
--- a/source4/ntvfs/wscript_build
+++ b/source4/ntvfs/wscript_build
@@ -49,7 +49,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'
+       deps='NDR_NAMED_PIPE_AUTH NAMED_PIPE_AUTH_TSTREAM gssapi CREDENTIALS DCERPC_SHARE'
        )
 
 

diff --git a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
index 41d89a9f56638886a7df11763a98acc8fbcb53bc..611916c52c944596c097c54fca273f0232b073e4 100644 (file)
--- a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
+++ b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
@@ -24,6 +24,7 @@
 #include "rpc_server/dcerpc_server.h"
 #include "librpc/gen_ndr/ndr_srvsvc.h"
 #include "rpc_server/common/common.h"
+#include "rpc_server/common/share.h"
 #include "auth/auth.h"
 #include "libcli/security/security.h"
 #include "system/time.h"

diff --git a/source4/rpc_server/wkssvc/dcesrv_wkssvc.c b/source4/rpc_server/wkssvc/dcesrv_wkssvc.c
index b4fa69c43f86a242244072f353e4b84ce9eed4cf..0b553ef2d07fa9fd209ae0fc0627df9e2a5fee38 100644 (file)
--- a/source4/rpc_server/wkssvc/dcesrv_wkssvc.c
+++ b/source4/rpc_server/wkssvc/dcesrv_wkssvc.c
@@ -23,6 +23,7 @@
 #include "rpc_server/dcerpc_server.h"
 #include "librpc/gen_ndr/ndr_wkssvc.h"
 #include "rpc_server/common/common.h"
+#include "rpc_server/common/share.h"
 #include "param/param.h"
 
 /*

diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index a041003f5e3d410ded7407b9ba3350ce06c7fc38..4fcdcef0c67b180549bb419abbfe77f0a7755c2f 100644 (file)
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -1,11 +1,17 @@
 #!/usr/bin/env python
 
+bld.SAMBA_SUBSYSTEM('DCERPC_SHARE',
+       source='common/server_info.c common/share_info.c',
+       autoproto='common/share.h',
+       deps='ldb'
+       )
+
 bld.SAMBA_SUBSYSTEM('DCERPC_COMMON',
-       source='common/server_info.c common/share_info.c common/forward.c',
+       source='common/forward.c',
        autoproto='common/proto.h',
        public_headers='common/common.h',
        header_path='dcerpc_server',
-       deps='ldb dcerpc_server'
+       deps='ldb DCERPC_SHARE'
        )