summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-10-21 17:12:31 +1100
committerAndrew Tridgell <tridge@samba.org>2010-10-21 19:03:27 +1100
commit56640a8501625d29745269fcddc1980c6b751a2a (patch)
tree542598bd28bfe0293bf587eddfd3ab08e9a8816b /source4
parent1748d10e47c1000c56594a103c35b7962b5a5da2 (diff)
downloadsamba-56640a8501625d29745269fcddc1980c6b751a2a.tar.gz
samba-56640a8501625d29745269fcddc1980c6b751a2a.tar.bz2
samba-56640a8501625d29745269fcddc1980c6b751a2a.zip
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>
Diffstat (limited to 'source4')
-rw-r--r--source4/ntvfs/ipc/rap_server.c1
-rw-r--r--source4/ntvfs/wscript_build2
-rw-r--r--source4/rpc_server/srvsvc/dcesrv_srvsvc.c1
-rw-r--r--source4/rpc_server/wkssvc/dcesrv_wkssvc.c1
-rw-r--r--source4/rpc_server/wscript_build10
5 files changed, 12 insertions, 3 deletions
diff --git a/source4/ntvfs/ipc/rap_server.c b/source4/ntvfs/ipc/rap_server.c
index 126c78ca93..dbd1fccfea 100644
--- 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 48810f5dd3..4948d2f984 100644
--- 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 41d89a9f56..611916c52c 100644
--- 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 b4fa69c43f..0b553ef2d0 100644
--- 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 a041003f5e..4fcdcef0c6 100644
--- 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'
)