diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-27 19:50:13 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:04 -0500 |
| commit | 620d759f49f4b648d0fa4a84e67f1cecbbdd0f06 (patch) | |
| tree | 15a768135a197cdd7b3acd369c029ce9248e9012 /source4/rpc_server | |
| parent | 710ea949886dd57c66dc6d397e0ea41c89736107 (diff) | |
| download | samba-620d759f49f4b648d0fa4a84e67f1cecbbdd0f06.tar.gz samba-620d759f49f4b648d0fa4a84e67f1cecbbdd0f06.tar.bz2 samba-620d759f49f4b648d0fa4a84e67f1cecbbdd0f06.zip | |
r15298: Fix the build using a few hacks in the build system.
Recursive dependencies are now forbidden (the build system
will bail out if there are any).
I've split up auth_sam.c into auth_sam.c and sam.c. Andrew,
please rename sam.c / move its contents to whatever/wherever you think suits
best.
(This used to be commit 6646384aaf3e7fa2aa798c3e564b94b0617ec4d0)
Diffstat (limited to 'source4/rpc_server')
| -rw-r--r-- | source4/rpc_server/config.mk | 10 | ||||
| -rw-r--r-- | source4/rpc_server/netlogon/dcerpc_netlogon.c | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk index c187cfdb49..b85700528c 100644 --- a/source4/rpc_server/config.mk +++ b/source4/rpc_server/config.mk @@ -123,7 +123,7 @@ PUBLIC_DEPENDENCIES = \ [MODULE::dcerpc_winreg] INIT_FUNCTION = dcerpc_server_winreg_init SUBSYSTEM = dcerpc_server -OUTPUT_TYPE = MERGEDOBJ +OUTPUT_TYPE = INTEGRATED OBJ_FILES = \ winreg/rpc_winreg.o PUBLIC_DEPENDENCIES = \ @@ -141,7 +141,8 @@ OBJ_FILES = \ PUBLIC_DEPENDENCIES = \ DCERPC_COMMON \ SCHANNELDB \ - NDR_NETLOGON + NDR_NETLOGON \ + auth_sam # End MODULE dcerpc_netlogon ################################################ @@ -164,7 +165,7 @@ PUBLIC_DEPENDENCIES = \ [MODULE::dcerpc_spoolss] INIT_FUNCTION = dcerpc_server_spoolss_init SUBSYSTEM = dcerpc_server -OUTPUT_TYPE = MERGEDOBJ +OUTPUT_TYPE = INTEGRATED OBJ_FILES = \ spoolss/dcesrv_spoolss.o PUBLIC_DEPENDENCIES = \ @@ -218,8 +219,7 @@ OBJ_FILES = \ PUBLIC_DEPENDENCIES = \ LIBCLI_AUTH \ LIBNDR \ - dcerpc \ - service + dcerpc # # End SUBSYSTEM DCERPC ################################################ diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c index 9f1b84f77e..dc9537e66c 100644 --- a/source4/rpc_server/netlogon/dcerpc_netlogon.c +++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c @@ -25,6 +25,7 @@ #include "rpc_server/dcerpc_server.h" #include "rpc_server/common/common.h" #include "lib/ldb/include/ldb.h" +#include "auth/auth_sam.h" #include "auth/auth.h" #include "dsdb/samdb/samdb.h" #include "rpc_server/samr/proto.h" |