summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/auth/config.mk4
-rw-r--r--source4/librpc/config.mk97
-rw-r--r--source4/rpc_server/config.mk2
3 files changed, 50 insertions, 53 deletions
diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 3d2ccf0571..99e590faa1 100644
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -31,7 +31,7 @@ INIT_OBJ_FILES = \
auth/auth_winbind.o
REQUIRED_SUBSYSTEMS = \
LIB_WINBIND_CLIENT \
- NDR_NETLOGON NDR
+ NDR_NETLOGON NDR_RAW
# End MODULE auth_winbind
#######################
@@ -43,7 +43,7 @@ SUBSYSTEM = AUTH
INIT_OBJ_FILES = \
auth/auth_domain.o
REQUIRED_SUBSYSTEMS = \
- NDR_NETLOGON NDR
+ NDR_NETLOGON NDR_RAW
# End MODULE auth_winbind
#######################
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index c961dc421a..6d3cfcb8eb 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -21,9 +21,6 @@ REQUIRED_SUBSYSTEMS = LIBCOMPRESSION
# End SUBSYSTEM NDR_COMPRESSION
################################################
-[SUBSYSTEM::NDR]
-REQUIRED_SUBSYSTEMS = NDR_RAW
-
################################################
# Start SUBSYSTEM RPC_RAW
[SUBSYSTEM::RPC_RAW]
@@ -44,67 +41,67 @@ REQUIRED_SUBSYSTEMS = SOCKET
INIT_FUNCTION = dcerpc_audiosrv_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_audiosrv.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_DCERPC]
INIT_FUNCTION = dcerpc_dcerpc_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_dcerpc.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_ECHO]
INIT_FUNCTION = dcerpc_echo_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_echo.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_EXCHANGE]
INIT_FUNCTION = dcerpc_exchange_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_exchange.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_DSBACKUP]
INIT_FUNCTION = dcerpc_dsbackup_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_dsbackup.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_EFS]
INIT_FUNCTION = dcerpc_efs_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_efs.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_MISC]
INIT_FUNCTION = dcerpc_misc_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_misc.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_ROT]
INIT_FUNCTION = dcerpc_rot_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_rot.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_LSA]
INIT_FUNCTION = dcerpc_lsa_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_lsa.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_DFS]
INIT_FUNCTION = dcerpc_dfs_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_dfs.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_DRSUAPI]
INIT_FUNCTION = dcerpc_drsuapi_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_drsuapi.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR NDR_DRSUAPI_PRINT NDR_COMPRESSION
+REQUIRED_SUBSYSTEMS = NDR_RAW NDR_DRSUAPI_PRINT NDR_COMPRESSION
[SUBSYSTEM::NDR_DRSUAPI_PRINT]
INIT_OBJ_FILES = librpc/ndr/ndr_drsuapi.o
@@ -113,31 +110,31 @@ INIT_OBJ_FILES = librpc/ndr/ndr_drsuapi.o
INIT_FUNCTION = dcerpc_drsblobs_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_drsblobs.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_POLICYAGENT]
INIT_FUNCTION = dcerpc_policyagent_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_policyagent.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_UNIXINFO]
INIT_FUNCTION = dcerpc_unixinfo_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_unixinfo.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_SAMR]
INIT_FUNCTION = dcerpc_samr_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_samr.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_SPOOLSS]
INIT_FUNCTION = dcerpc_spoolss_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_spoolss.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR NDR_SPOOLSS_BUF
+REQUIRED_SUBSYSTEMS = NDR_RAW NDR_SPOOLSS_BUF
[SUBSYSTEM::NDR_SPOOLSS_BUF]
INIT_OBJ_FILES = librpc/ndr/ndr_spoolss_buf.o
@@ -146,91 +143,91 @@ INIT_OBJ_FILES = librpc/ndr/ndr_spoolss_buf.o
INIT_FUNCTION = dcerpc_wkssvc_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_wkssvc.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_SRVSVC]
INIT_FUNCTION = dcerpc_srvsvc_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_srvsvc.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR NDR_SVCCTL
+REQUIRED_SUBSYSTEMS = NDR_RAW NDR_SVCCTL
[SUBSYSTEM::NDR_SVCCTL]
INIT_FUNCTION = dcerpc_svcctl_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_svcctl.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_ATSVC]
INIT_FUNCTION = dcerpc_atsvc_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_atsvc.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_EVENTLOG]
INIT_FUNCTION = dcerpc_eventlog_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_eventlog.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_EPMAPPER]
INIT_FUNCTION = dcerpc_epmapper_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_epmapper.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_DBGIDL]
INIT_FUNCTION = dcerpc_dbgidl_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_dbgidl.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_DSSETUP]
INIT_FUNCTION = dcerpc_dssetup_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_dssetup.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_MSGSVC]
INIT_FUNCTION = dcerpc_msgsvc_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_msgsvc.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_WINS]
INIT_FUNCTION = dcerpc_wins_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_wins.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_WINREG]
INIT_FUNCTION = dcerpc_winreg_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_winreg.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR NDR_INITSHUTDOWN
+REQUIRED_SUBSYSTEMS = NDR_RAW NDR_INITSHUTDOWN
[SUBSYSTEM::NDR_INITSHUTDOWN]
INIT_FUNCTION = dcerpc_initshutdown_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_initshutdown.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_MGMT]
INIT_FUNCTION = dcerpc_mgmt_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_mgmt.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_PROTECTED_STORAGE]
INIT_FUNCTION = dcerpc_protected_storage_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_protected_storage.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_DCOM]
INIT_FUNCTION = dcerpc_dcom_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_dcom.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR NDR_ORPC
+REQUIRED_SUBSYSTEMS = NDR_RAW NDR_ORPC
[SUBSYSTEM::NDR_ORPC_MANUAL]
INIT_OBJ_FILES = librpc/ndr/ndr_orpc.o
@@ -239,97 +236,97 @@ INIT_OBJ_FILES = librpc/ndr/ndr_orpc.o
INIT_FUNCTION = dcerpc_orpc_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_orpc.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR NDR_ORPC_MANUAL
+REQUIRED_SUBSYSTEMS = NDR_RAW NDR_ORPC_MANUAL
[SUBSYSTEM::NDR_OXIDRESOLVER]
INIT_FUNCTION = dcerpc_oxidresolver_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_oxidresolver.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR NDR_ORPC
+REQUIRED_SUBSYSTEMS = NDR_RAW NDR_ORPC
[SUBSYSTEM::NDR_REMACT]
INIT_FUNCTION = dcerpc_remact_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_remact.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR NDR_ORPC
+REQUIRED_SUBSYSTEMS = NDR_RAW NDR_ORPC
[SUBSYSTEM::NDR_WZCSVC]
INIT_FUNCTION = dcerpc_wzcsvc_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_wzcsvc.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_BROWSER]
INIT_FUNCTION = dcerpc_browser_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_browser.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_W32TIME]
INIT_FUNCTION = dcerpc_w32time_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_w32time.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_SCERPC]
INIT_FUNCTION = dcerpc_scerpc_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_scerpc.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_NTSVCS]
INIT_FUNCTION = dcerpc_ntsvcs_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_ntsvcs.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_NETLOGON]
INIT_FUNCTION = dcerpc_netlogon_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_netlogon.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR NDR_SAMR
+REQUIRED_SUBSYSTEMS = NDR_RAW NDR_SAMR
[SUBSYSTEM::NDR_TRKWKS]
INIT_FUNCTION = dcerpc_trkwks_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_trkwks.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_KEYSVC]
INIT_FUNCTION = dcerpc_keysvc_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_keysvc.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_KRB5PAC]
INIT_FUNCTION = dcerpc_krb5pac_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_krb5pac.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_XATTR]
INIT_FUNCTION = dcerpc_xattr_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_xattr.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_SCHANNEL]
INIT_FUNCTION = dcerpc_schannel_init
INIT_OBJ_FILES = librpc/gen_ndr/ndr_schannel.o
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
[SUBSYSTEM::NDR_NBT]
INIT_OBJ_FILES = librpc/gen_ndr/ndr_nbt.o
INIT_FUNCTION = dcerpc_nbt_init
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR NDR_MISC
+REQUIRED_SUBSYSTEMS = NDR_RAW NDR_MISC
[SUBSYSTEM::NDR_WINSREPL]
INIT_OBJ_FILES = librpc/gen_ndr/ndr_winsrepl.o
INIT_FUNCTION = dcerpc_winsrepl_init
NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR NDR_NBT
+REQUIRED_SUBSYSTEMS = NDR_RAW NDR_NBT
[SUBSYSTEM::NDR_ALL]
diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk
index ce30a404e6..c6407e3e53 100644
--- a/source4/rpc_server/config.mk
+++ b/source4/rpc_server/config.mk
@@ -210,7 +210,7 @@ ADD_OBJ_FILES = \
rpc_server/handles.o
REQUIRED_SUBSYSTEMS = \
LIBCLI_AUTH \
- NDR
+ NDR_RAW
#
# End SUBSYSTEM DCERPC
################################################