diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-02-21 13:13:21 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:10:50 -0500 |
| commit | a62ade362ff6b4fdf949b31d99199e509cb8d643 (patch) | |
| tree | 7175a3e2f6e79bd51e4e68d8aa2026bf357a7be8 /source4/librpc | |
| parent | 600c49e772bea70682dc6ef9f6f961c94faed457 (diff) | |
| download | samba-a62ade362ff6b4fdf949b31d99199e509cb8d643.tar.gz samba-a62ade362ff6b4fdf949b31d99199e509cb8d643.tar.bz2 samba-a62ade362ff6b4fdf949b31d99199e509cb8d643.zip | |
r5487: - Allow disabling modules
- Disable all current DCOM functionality (I hope to commit
a large bunch of COM and DCOM changes later today)
- Make remact and oxidresolver depend on orpc rather then dcom
(This used to be commit f298f2a5478a905fe385b8d68318db92ee984374)
Diffstat (limited to 'source4/librpc')
| -rw-r--r-- | source4/librpc/config.mk | 16 | ||||
| -rw-r--r-- | source4/librpc/ndr/ndr_orpc.c (renamed from source4/librpc/ndr/ndr_dcom.c) | 0 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index 95d618227a..086a232343 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -200,32 +200,32 @@ INIT_OBJ_FILES = librpc/gen_ndr/ndr_protected_storage.o NOPROTO = YES REQUIRED_SUBSYSTEMS = LIBNDR -[SUBSYSTEM::NDR_DCOM_MANUAL] -INIT_OBJ_FILES = librpc/ndr/ndr_dcom.o - [SUBSYSTEM::NDR_DCOM] INIT_FUNCTION = dcerpc_dcom_init INIT_OBJ_FILES = librpc/gen_ndr/ndr_dcom.o NOPROTO = YES -REQUIRED_SUBSYSTEMS = LIBNDR NDR_DCOM_MANUAL NDR_ORPC +REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC + +[SUBSYSTEM::NDR_ORPC_MANUAL] +INIT_OBJ_FILES = librpc/ndr/ndr_orpc.o [SUBSYSTEM::NDR_ORPC] INIT_FUNCTION = dcerpc_orpc_init INIT_OBJ_FILES = librpc/gen_ndr/ndr_orpc.o NOPROTO = YES -REQUIRES_SUBSYSTEMS = LIBNDR +REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC_MANUAL [SUBSYSTEM::NDR_OXIDRESOLVER] INIT_FUNCTION = dcerpc_oxidresolver_init INIT_OBJ_FILES = librpc/gen_ndr/ndr_oxidresolver.o NOPROTO = YES -REQUIRED_SUBSYSTEMS = LIBNDR NDR_DCOM +REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC [SUBSYSTEM::NDR_REMACT] INIT_FUNCTION = dcerpc_remact_init INIT_OBJ_FILES = librpc/gen_ndr/ndr_remact.o NOPROTO = YES -REQUIRED_SUBSYSTEMS = LIBNDR NDR_DCOM +REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC [SUBSYSTEM::NDR_WZCSVC] INIT_FUNCTION = dcerpc_wzcsvc_init @@ -311,7 +311,7 @@ REQUIRED_SUBSYSTEMS = NDR_AUDIOSRV NDR_ECHO NDR_DCERPC NDR_EXCHANGE \ NDR_DSBACKUP NDR_EFS NDR_MISC NDR_LSA NDR_DFS NDR_DRSUAPI \ NDR_POLICYAGENT NDR_SAMR NDR_SPOOLSS NDR_WKSSVC NDR_SRVSVC NDR_ATSVC \ NDR_EVENTLOG NDR_EPMAPPER NDR_DBGIDL NDR_DSSETUP NDR_MSGSVC NDR_WINS \ - NDR_WINREG NDR_MGMT NDR_PROTECTED_STORAGE NDR_DCOM NDR_OXIDRESOLVER \ + NDR_WINREG NDR_MGMT NDR_PROTECTED_STORAGE NDR_OXIDRESOLVER \ NDR_REMACT NDR_WZCSVC NDR_BROWSER NDR_W32TIME NDR_SCERPC NDR_NTSVCS \ NDR_NETLOGON NDR_TRKWKS NDR_KEYSVC NDR_KRB5PAC NDR_XATTR NDR_SCHANNEL \ NDR_ROT NDR_DRSBLOBS NDR_SVCCTL NDR_NBT NDR_WINSREPL LIB_SECURITY_NDR diff --git a/source4/librpc/ndr/ndr_dcom.c b/source4/librpc/ndr/ndr_orpc.c index 2a28db4178..2a28db4178 100644 --- a/source4/librpc/ndr/ndr_dcom.c +++ b/source4/librpc/ndr/ndr_orpc.c |