s3-rpc_server: move services into individual directories.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Thu Feb 10 22:13:17 CET 2011 on sn-devel-104

source3/Makefile.in

@@ -662,50 +662,50 @@ LIB_EVENTLOG_OBJ = lib/eventlog/eventlog.o
 
 DCE_RPC_EP_OBJ = librpc/rpc/dcerpc_ep.o
 
-RPC_LSARPC_OBJ = rpc_server/srv_lsa_nt.o \
+RPC_LSARPC_OBJ = rpc_server/lsa/srv_lsa_nt.o \
 		 librpc/gen_ndr/srv_lsa.o
 
-RPC_NETLOGON_OBJ = rpc_server/srv_netlog_nt.o \
+RPC_NETLOGON_OBJ = rpc_server/netlogon/srv_netlog_nt.o \
 		   librpc/gen_ndr/srv_netlogon.o
 
-RPC_SAMR_OBJ = rpc_server/srv_samr_nt.o \
-               rpc_server/srv_samr_util.o \
-               rpc_server/srv_samr_chgpasswd.o \
+RPC_SAMR_OBJ = rpc_server/samr/srv_samr_nt.o \
+               rpc_server/samr/srv_samr_util.o \
+               rpc_server/samr/srv_samr_chgpasswd.o \
 	       librpc/gen_ndr/srv_samr.o
 
-RPC_INITSHUTDOWN_OBJ =  librpc/gen_ndr/srv_initshutdown.o rpc_server/srv_initshutdown_nt.o
+RPC_INITSHUTDOWN_OBJ =  librpc/gen_ndr/srv_initshutdown.o rpc_server/initshutdown/srv_initshutdown_nt.o
 
-RPC_WINREG_OBJ =  rpc_server/srv_winreg_nt.o \
+RPC_WINREG_OBJ =  rpc_server/winreg/srv_winreg_nt.o \
 		  librpc/gen_ndr/srv_winreg.o
 
-RPC_DSSETUP_OBJ =  rpc_server/srv_dssetup_nt.o librpc/gen_ndr/srv_dssetup.o
+RPC_DSSETUP_OBJ =  rpc_server/dssetup/srv_dssetup_nt.o librpc/gen_ndr/srv_dssetup.o
 
-RPC_SRVSVC_OBJ = rpc_server/srv_srvsvc_nt.o \
+RPC_SRVSVC_OBJ = rpc_server/srvsvc/srv_srvsvc_nt.o \
 		 librpc/gen_ndr/srv_srvsvc.o
 
 RPC_WKSSVC_OBJ =  librpc/gen_ndr/srv_wkssvc.o \
-		  rpc_server/srv_wkssvc_nt.o
+		  rpc_server/wkssvc/srv_wkssvc_nt.o
 
-RPC_SVCCTL_OBJ =  rpc_server/srv_svcctl_nt.o \
-		  rpc_server/srv_svcctl_reg.o \
+RPC_SVCCTL_OBJ =  rpc_server/svcctl/srv_svcctl_nt.o \
+		  rpc_server/svcctl/srv_svcctl_reg.o \
 		  librpc/gen_ndr/srv_svcctl.o \
 		  services/svc_winreg_glue.o \
                   services/svc_spoolss.o services/svc_rcinit.o  \
                   services/svc_netlogon.o services/svc_winreg.o \
                   services/svc_wins.o
 
-RPC_NTSVCS_OBJ = rpc_server/srv_ntsvcs_nt.o \
+RPC_NTSVCS_OBJ = rpc_server/ntsvcs/srv_ntsvcs_nt.o \
 		 librpc/gen_ndr/srv_ntsvcs.o
 
 RPC_NETDFS_OBJ =  librpc/gen_ndr/srv_dfs.o \
-		  rpc_server/srv_dfs_nt.o
+		  rpc_server/dfs/srv_dfs_nt.o
 
-RPC_SPOOLSS_OBJ = rpc_server/srv_spoolss_nt.o \
-		  rpc_server/srv_spoolss_util.o \
+RPC_SPOOLSS_OBJ = rpc_server/spoolss/srv_spoolss_nt.o \
+		  rpc_server/spoolss/srv_spoolss_util.o \
 		  librpc/gen_ndr/srv_spoolss.o
 
-RPC_EVENTLOG_OBJ = rpc_server/srv_eventlog_nt.o \
-		   rpc_server/srv_eventlog_reg.o \
+RPC_EVENTLOG_OBJ = rpc_server/eventlog/srv_eventlog_nt.o \
+		   rpc_server/eventlog/srv_eventlog_reg.o \
 		   $(LIB_EVENTLOG_OBJ) librpc/gen_ndr/srv_eventlog.o
 
 NPA_TSTREAM_OBJ = ../libcli/named_pipe_auth/npa_tstream.o \
@@ -724,9 +724,9 @@ RPC_CRYPTO = rpc_server/dcesrv_ntlmssp.o \
 RPC_PIPE_OBJ = rpc_server/srv_pipe.o rpc_server/srv_pipe_hnd.o \
 	       $(RPC_NCACN_NP) $(RPC_SERVICE) $(RPC_CRYPTO)
 
-RPC_RPCECHO_OBJ = rpc_server/srv_echo_nt.o librpc/gen_ndr/srv_echo.o
+RPC_RPCECHO_OBJ = rpc_server/echo/srv_echo_nt.o librpc/gen_ndr/srv_echo.o
 
-RPC_EPMAPPER_OBJ = rpc_server/srv_epmapper.o librpc/gen_ndr/srv_epmapper.o
+RPC_EPMAPPER_OBJ = rpc_server/epmapper/srv_epmapper.o librpc/gen_ndr/srv_epmapper.o
 
 RPC_SERVER_REGISTER_OBJ = rpc_server/srv_rpc_register.o $(DCE_RPC_EP_OBJ)
 

source3/printing/nt_printing.c

@@ -28,7 +28,7 @@
 #include "registry/reg_objects.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "../librpc/gen_ndr/ndr_spoolss.h"
-#include "rpc_server/srv_spoolss_util.h"
+#include "rpc_server/spoolss/srv_spoolss_util.h"
 #include "nt_printing.h"
 #include "secrets.h"
 #include "../librpc/gen_ndr/netlogon.h"

source3/printing/nt_printing_ads.c

@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "../librpc/gen_ndr/spoolss.h"
-#include "rpc_server/srv_spoolss_util.h"
+#include "rpc_server/spoolss/srv_spoolss_util.h"
 #include "nt_printing.h"
 #include "ads.h"
 #include "secrets.h"

source3/rpc_server/dssetup/srv_dssetup_nt.c

@@ -222,4 +222,3 @@ WERROR _dssetup_DsRoleAbortDownlevelServerUpgrade(struct pipes_struct *p,
 	p->rng_fault_state = true;
 	return WERR_NOT_SUPPORTED;
 }
-

source3/rpc_server/eventlog/srv_eventlog_reg.c

@@ -26,7 +26,7 @@
 #include "../librpc/gen_ndr/ndr_winreg_c.h"
 #include "rpc_client/cli_winreg_int.h"
 #include "rpc_client/cli_winreg.h"
-#include "rpc_server/srv_eventlog_reg.h"
+#include "rpc_server/eventlog/srv_eventlog_reg.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c

@@ -798,4 +798,3 @@ WERROR _PNP_GetServerSideDeviceInstallFlags(struct pipes_struct *p,
 	p->rng_fault_state = true;
 	return WERR_NOT_SUPPORTED;
 }
-

source3/rpc_server/samr/srv_samr_chgpasswd.c

@@ -48,7 +48,7 @@
 #include "includes.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../lib/crypto/arcfour.h"
-#include "rpc_server/srv_samr_util.h"
+#include "rpc_server/samr/srv_samr_util.h"
 
 #if ALLOW_CHANGE_PASSWORD
 

source3/rpc_server/samr/srv_samr_nt.c

@@ -35,7 +35,7 @@
 #include "smbd/globals.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/srv_samr.h"
-#include "rpc_server/srv_samr_util.h"
+#include "rpc_server/samr/srv_samr_util.h"
 #include "../lib/crypto/arcfour.h"
 #include "secrets.h"
 #include "rpc_client/init_lsa.h"

source3/rpc_server/samr/srv_samr_util.c

@@ -24,7 +24,7 @@
 
 #include "includes.h"
 #include "../librpc/gen_ndr/samr.h"
-#include "rpc_server/srv_samr_util.h"
+#include "rpc_server/samr/srv_samr_util.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

source3/rpc_server/spoolss/srv_spoolss_util.c

@@ -4246,4 +4246,3 @@ done:
 	TALLOC_FREE(tmp_ctx);
 	return result;
 }
-

source3/rpc_server/srv_rpc_register.c

@@ -38,8 +38,8 @@
 #include "../librpc/gen_ndr/srv_wkssvc.h"
 
 #include "printing/nt_printing_migrate.h"
-#include "rpc_server/srv_eventlog_reg.h"
-#include "rpc_server/srv_svcctl_reg.h"
+#include "rpc_server/eventlog/srv_eventlog_reg.h"
+#include "rpc_server/svcctl/srv_svcctl_reg.h"
 
 #include "librpc/rpc/dcerpc_ep.h"
 

source3/rpc_server/srvsvc/srv_srvsvc_nt.c

@@ -2817,4 +2817,3 @@ WERROR _srvsvc_NETRSERVERTRANSPORTDELEX(struct pipes_struct *p,
 	p->rng_fault_state = True;
 	return WERR_NOT_SUPPORTED;
 }
-

source3/rpc_server/svcctl/srv_svcctl_nt.c

@@ -1199,4 +1199,3 @@ WERROR _svcctl_SCSendTSMessage(struct pipes_struct *p,
 	p->rng_fault_state = True;
 	return WERR_NOT_SUPPORTED;
 }
-

source3/rpc_server/svcctl/srv_svcctl_reg.c

@@ -27,7 +27,7 @@
 #include "../librpc/gen_ndr/ndr_winreg_c.h"
 #include "rpc_client/cli_winreg_int.h"
 #include "rpc_client/cli_winreg.h"
-#include "rpc_server/srv_svcctl_reg.h"
+#include "rpc_server/svcctl/srv_svcctl_reg.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

source3/rpc_server/wkssvc/srv_wkssvc_nt.c

@@ -1017,4 +1017,3 @@ WERROR _wkssvc_NetrEnumerateComputerNames(struct pipes_struct *p,
 	p->rng_fault_state = True;
 	return WERR_NOT_SUPPORTED;
 }
-

source3/rpc_server/wscript_build

@@ -1,24 +1,24 @@
 #!/usr/bin/env python
 
-RPC_LSARPC_SRC = '''srv_lsa_nt.c ../../librpc/gen_ndr/srv_lsa.c'''
-RPC_NETLOGON_SRC = '''srv_netlog_nt.c ../../librpc/gen_ndr/srv_netlogon.c'''
-RPC_SAMR_SRC = '''srv_samr_nt.c
-               srv_samr_util.c
-               srv_samr_chgpasswd.c
+RPC_LSARPC_SRC = '''lsa/srv_lsa_nt.c ../../librpc/gen_ndr/srv_lsa.c'''
+RPC_NETLOGON_SRC = '''netlogon/srv_netlog_nt.c ../../librpc/gen_ndr/srv_netlogon.c'''
+RPC_SAMR_SRC = '''samr/srv_samr_nt.c
+               samr/srv_samr_util.c
+               samr/srv_samr_chgpasswd.c
                ../../librpc/gen_ndr/srv_samr.c'''
-RPC_INITSHUTDOWN_SRC = '''srv_initshutdown_nt.c ../../librpc/gen_ndr/srv_initshutdown.c'''
-RPC_WINREG_SRC = '''srv_winreg_nt.c ../../librpc/gen_ndr/srv_winreg.c'''
-RPC_DSSETUP_SRC = '''srv_dssetup_nt.c ../../librpc/gen_ndr/srv_dssetup.c'''
-RPC_SRVSVC_SRC = '''srv_srvsvc_nt.c ../../librpc/gen_ndr/srv_srvsvc.c'''
-RPC_WKSSVC_SRC = '''srv_wkssvc_nt.c ../../librpc/gen_ndr/srv_wkssvc.c'''
-RPC_SVCCTL_SRC = '''srv_svcctl_nt.c srv_svcctl_reg.c ../../librpc/gen_ndr/srv_svcctl.c'''
-RPC_NTSVCS_SRC = '''srv_ntsvcs_nt.c ../../librpc/gen_ndr/srv_ntsvcs.c'''
-RPC_NETDFS_SRC = '''srv_dfs_nt.c ../../librpc/gen_ndr/srv_dfs.c'''
-RPC_SPOOLSS_SRC = '''srv_spoolss_nt.c ../../librpc/gen_ndr/srv_spoolss.c
-                     srv_spoolss_util.c'''
-RPC_EVENTLOG_SRC = '''srv_eventlog_nt.c srv_eventlog_reg.c ../../librpc/gen_ndr/srv_eventlog.c'''
-RPC_RPCECHO_SRC = '''srv_echo_nt.c ../../librpc/gen_ndr/srv_echo.c'''
-RPC_EPMAPPER_SRC = '''srv_epmapper.c ../../librpc/gen_ndr/srv_epmapper.c'''
+RPC_INITSHUTDOWN_SRC = '''initshutdown/srv_initshutdown_nt.c ../../librpc/gen_ndr/srv_initshutdown.c'''
+RPC_WINREG_SRC = '''winreg/srv_winreg_nt.c ../../librpc/gen_ndr/srv_winreg.c'''
+RPC_DSSETUP_SRC = '''dssetup/srv_dssetup_nt.c ../../librpc/gen_ndr/srv_dssetup.c'''
+RPC_SRVSVC_SRC = '''srvsvc/srv_srvsvc_nt.c ../../librpc/gen_ndr/srv_srvsvc.c'''
+RPC_WKSSVC_SRC = '''wkssvc/srv_wkssvc_nt.c ../../librpc/gen_ndr/srv_wkssvc.c'''
+RPC_SVCCTL_SRC = '''svcctl/srv_svcctl_nt.c svcctl/srv_svcctl_reg.c ../../librpc/gen_ndr/srv_svcctl.c'''
+RPC_NTSVCS_SRC = '''ntsvcs/srv_ntsvcs_nt.c ../../librpc/gen_ndr/srv_ntsvcs.c'''
+RPC_NETDFS_SRC = '''dfs/srv_dfs_nt.c ../../librpc/gen_ndr/srv_dfs.c'''
+RPC_SPOOLSS_SRC = '''spoolss/srv_spoolss_nt.c ../../librpc/gen_ndr/srv_spoolss.c
+                     spoolss/srv_spoolss_util.c'''
+RPC_EVENTLOG_SRC = '''eventlog/srv_eventlog_nt.c eventlog/srv_eventlog_reg.c ../../librpc/gen_ndr/srv_eventlog.c'''
+RPC_RPCECHO_SRC = '''echo/srv_echo_nt.c ../../librpc/gen_ndr/srv_echo.c'''
+RPC_EPMAPPER_SRC = '''epmapper/srv_epmapper.c ../../librpc/gen_ndr/srv_epmapper.c'''
 
 bld.SAMBA_SUBSYSTEM('rpc',
                     source='',