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

29 files changed, 101 insertions, 107 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 8ad74c45060..b632d5d0bef 100644
--- a/source3/Makefile.in
+++ b/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)
 
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 68be518b960..67c2d8732c4 100644
--- a/source3/printing/nt_printing.c
+++ b/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"
diff --git a/source3/printing/nt_printing_ads.c b/source3/printing/nt_printing_ads.c
index 6f71ce08b1e..b375d94c2b1 100644
--- a/source3/printing/nt_printing_ads.c
+++ b/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"
diff --git a/source3/rpc_server/srv_dfs_nt.c b/source3/rpc_server/dfs/srv_dfs_nt.c
index 940f79d195c..17b90505d6e 100644
--- a/source3/rpc_server/srv_dfs_nt.c
+++ b/source3/rpc_server/dfs/srv_dfs_nt.c
@@ -239,7 +239,7 @@ static bool init_reply_dfs_info_3(TALLOC_CTX *mem_ctx, struct junction_map* j, s
 	for(ii=0;ii<j->referral_count;ii++) {
 		char* p;
 		char *path = NULL;
- 		struct dfs_StorageInfo* stor = &(dfs3->stores[ii]);
+		struct dfs_StorageInfo* stor = &(dfs3->stores[ii]);
 		struct referral* ref = &(j->referral_list[ii]);
 
 		path = talloc_strdup(mem_ctx, ref->alternate_path);
diff --git a/source3/rpc_server/srv_dssetup_nt.c b/source3/rpc_server/dssetup/srv_dssetup_nt.c
index cbc08c0880e..53a3bdd8c4c 100644
--- a/source3/rpc_server/srv_dssetup_nt.c
+++ b/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;
 }
-
diff --git a/source3/rpc_server/srv_echo_nt.c b/source3/rpc_server/echo/srv_echo_nt.c
index ef6204f4c42..47952ef0b88 100644
--- a/source3/rpc_server/srv_echo_nt.c
+++ b/source3/rpc_server/echo/srv_echo_nt.c
@@ -1,20 +1,20 @@
-/* 
+/*
  *  Unix SMB/CIFS implementation.
  *  RPC Pipe client / server routines for rpcecho
  *  Copyright (C) Tim Potter                   2003
  *  Copyright (C) Jelmer Vernooij              2006
  *  Copyright (C) Gerald (Jerry) Carter        2007
- *  
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 3 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
@@ -33,7 +33,7 @@ void _echo_AddOne(struct pipes_struct *p, struct echo_AddOne *r )
 {
 	DEBUG(10, ("_echo_AddOne\n"));
 
-	*r->out.out_data = r->in.in_data + 1;	
+	*r->out.out_data = r->in.in_data + 1;
 }
 
 /* Echo back an array of data */
@@ -42,14 +42,14 @@ void _echo_EchoData(struct pipes_struct *p, struct echo_EchoData *r)
 {
 	DEBUG(10, ("_echo_EchoData\n"));
 
-	if ( r->in.len == 0 ) {		
+	if ( r->in.len == 0 ) {
 		r->out.out_data = NULL;
 		return;
 	}
 
 	r->out.out_data = TALLOC_ARRAY(p->mem_ctx, uint8, r->in.len);
 	memcpy( r->out.out_data, r->in.in_data, r->in.len );
-	return;	
+	return;
 }
 
 /* Sink an array of data */
@@ -59,7 +59,7 @@ void _echo_SinkData(struct pipes_struct *p, struct echo_SinkData *r)
 	DEBUG(10, ("_echo_SinkData\n"));
 
 	/* My that was some yummy data! */
-	return;	
+	return;
 }
 
 /* Source an array of data */
@@ -71,17 +71,17 @@ void _echo_SourceData(struct pipes_struct *p, struct echo_SourceData *r)
 	DEBUG(10, ("_echo_SourceData\n"));
 
 	if ( r->in.len == 0 ) {
-		r->out.data = NULL;		
+		r->out.data = NULL;
 		return;
 	}
 
 	r->out.data = TALLOC_ARRAY(p->mem_ctx, uint8, r->in.len );
 
-	for (i = 0; i < r->in.len; i++ ) {		
+	for (i = 0; i < r->in.len; i++ ) {
 		r->out.data[i] = i & 0xff;
 	}
-	
-	return;	
+
+	return;
 }
 
 void _echo_TestCall(struct pipes_struct *p, struct echo_TestCall *r)
diff --git a/source3/rpc_server/srv_epmapper.c b/source3/rpc_server/epmapper/srv_epmapper.c
index 5bfb176b84a..5bfb176b84a 100644
--- a/source3/rpc_server/srv_epmapper.c
+++ b/source3/rpc_server/epmapper/srv_epmapper.c
diff --git a/source3/rpc_server/srv_eventlog_nt.c b/source3/rpc_server/eventlog/srv_eventlog_nt.c
index ff8a49526e3..ff8a49526e3 100644
--- a/source3/rpc_server/srv_eventlog_nt.c
+++ b/source3/rpc_server/eventlog/srv_eventlog_nt.c
diff --git a/source3/rpc_server/srv_eventlog_reg.c b/source3/rpc_server/eventlog/srv_eventlog_reg.c
index 7336c31c76c..8e85abf488d 100644
--- a/source3/rpc_server/srv_eventlog_reg.c
+++ b/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
diff --git a/source3/rpc_server/srv_eventlog_reg.h b/source3/rpc_server/eventlog/srv_eventlog_reg.h
index 02c27926473..02c27926473 100644
--- a/source3/rpc_server/srv_eventlog_reg.h
+++ b/source3/rpc_server/eventlog/srv_eventlog_reg.h
diff --git a/source3/rpc_server/srv_initshutdown_nt.c b/source3/rpc_server/initshutdown/srv_initshutdown_nt.c
index 225f7b3b9be..e19ed284bfb 100644
--- a/source3/rpc_server/srv_initshutdown_nt.c
+++ b/source3/rpc_server/initshutdown/srv_initshutdown_nt.c
@@ -1,4 +1,4 @@
-/* 
+/*
  *  Unix SMB/CIFS implementation.
  *  RPC Pipe client / server routines
  *  Copyright (C) Andrew Tridgell               1992-1997.
@@ -8,12 +8,12 @@
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 3 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
@@ -41,9 +41,9 @@ WERROR _initshutdown_Init(struct pipes_struct *p, struct initshutdown_Init *r)
 	s.in.do_reboot = r->in.do_reboot;
 	s.in.reason = 0;
 
-	/* thunk down to _winreg_InitiateSystemShutdownEx() 
+	/* thunk down to _winreg_InitiateSystemShutdownEx()
 	   (just returns a status) */
-	
+
 	return _winreg_InitiateSystemShutdownEx( p, &s );
 }
 
diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/lsa/srv_lsa_nt.c
index 53baba31cac..985d8df6a95 100644
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/lsa/srv_lsa_nt.c
@@ -1776,7 +1776,7 @@ NTSTATUS _lsa_OpenAccount(struct pipes_struct *p,
 	}
 
 	/* des_access is for the account here, not the policy
- 	 * handle - so don't check against policy handle. */
+	 * handle - so don't check against policy handle. */
 
 	/* Work out max allowed. */
 	map_max_allowed_access(p->server_info->security_token,
@@ -2148,10 +2148,10 @@ NTSTATUS _lsa_AddAccountRights(struct pipes_struct *p,
 
 	/*
 	 * From the MS DOCs. If the sid doesn't exist, ask for LSA_POLICY_CREATE_ACCOUNT
- 	 * on the policy handle. If it does, ask for
- 	 * LSA_ACCOUNT_ADJUST_PRIVILEGES|LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS|LSA_ACCOUNT_VIEW,
- 	 * on the account sid. We don't check here so just use the latter. JRA.
- 	 */
+	 * on the policy handle. If it does, ask for
+	 * LSA_ACCOUNT_ADJUST_PRIVILEGES|LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS|LSA_ACCOUNT_VIEW,
+	 * on the account sid. We don't check here so just use the latter. JRA.
+	 */
 
 	status = access_check_object(psd, p->server_info->security_token,
 				     SEC_PRIV_INVALID, SEC_PRIV_INVALID, 0,
@@ -2221,7 +2221,7 @@ NTSTATUS _lsa_RemoveAccountRights(struct pipes_struct *p,
 	 * From the MS DOCs. We need
 	 * LSA_ACCOUNT_ADJUST_PRIVILEGES|LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS|LSA_ACCOUNT_VIEW
 	 * and DELETE on the account sid.
- 	 */
+	 */
 
 	status = access_check_object(psd, p->server_info->security_token,
 				     SEC_PRIV_INVALID, SEC_PRIV_INVALID, 0,
diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/netlogon/srv_netlog_nt.c
index b55c74adfc4..b55c74adfc4 100644
--- a/source3/rpc_server/srv_netlog_nt.c
+++ b/source3/rpc_server/netlogon/srv_netlog_nt.c
diff --git a/source3/rpc_server/srv_ntsvcs_nt.c b/source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c
index 4933cb31a53..ad1ba937461 100644
--- a/source3/rpc_server/srv_ntsvcs_nt.c
+++ b/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;
 }
-
diff --git a/source3/rpc_server/srv_samr_chgpasswd.c b/source3/rpc_server/samr/srv_samr_chgpasswd.c
index d31215b321b..85a63a56308 100644
--- a/source3/rpc_server/srv_samr_chgpasswd.c
+++ b/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
 
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c
index 4e6d94d9578..7a698944259 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/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"
@@ -2368,7 +2368,7 @@ NTSTATUS _samr_OpenUser(struct pipes_struct *p,
 
 	/* check that the SID exists in our domain. */
 	if (ret == False) {
-        	return NT_STATUS_NO_SUCH_USER;
+		return NT_STATUS_NO_SUCH_USER;
 	}
 
 	/* If we did the rid admins hack above, allow access. */
@@ -3749,8 +3749,8 @@ NTSTATUS _samr_QueryDomainInfo(struct pipes_struct *p,
 		case 13:
 			status = query_dom_info_13(p->mem_ctx, &dom_info->info13);
 			break;
-        	default:
-            		return NT_STATUS_INVALID_INFO_CLASS;
+		default:
+			return NT_STATUS_INVALID_INFO_CLASS;
 	}
 
 	if (!NT_STATUS_IS_OK(status)) {
@@ -4753,7 +4753,7 @@ static NTSTATUS set_user_info_21(struct samr_UserInfo21 *id21,
 	/* write the change out */
 	if(!NT_STATUS_IS_OK(status = pdb_update_sam_account(pwd))) {
 		return status;
- 	}
+	}
 
 	return NT_STATUS_OK;
 }
@@ -4873,7 +4873,7 @@ static bool set_user_info_pw(uint8 *pass, const char *rhost, struct samu *pwd)
 				&len,
 				CH_UTF16)) {
 		return False;
- 	}
+	}
 
 	if (!pdb_set_plaintext_passwd (pwd, plaintext_buf)) {
 		return False;
@@ -4939,7 +4939,7 @@ static NTSTATUS set_user_info_24(TALLOC_CTX *mem_ctx,
 	status = pdb_update_sam_account(pwd);
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
- 	}
+	}
 
 	return NT_STATUS_OK;
 }
@@ -4981,7 +4981,7 @@ static NTSTATUS set_user_info_25(TALLOC_CTX *mem_ctx,
 	/* write the change out */
 	if(!NT_STATUS_IS_OK(status = pdb_update_sam_account(pwd))) {
 		return status;
- 	}
+	}
 
 	/*
 	 * We need to "pdb_update_sam_account" before the unix primary group
@@ -5193,7 +5193,7 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p,
 	if (!ret) {
 		TALLOC_FREE(pwd);
 		return NT_STATUS_NO_SUCH_USER;
- 	}
+	}
 
 	/* ================ BEGIN Privilege BLOCK ================ */
 
@@ -6558,7 +6558,7 @@ NTSTATUS _samr_SetDomainInfo(struct pipes_struct *p,
 	switch (r->in.level) {
 		case 1:
 			status = set_dom_info_1(p->mem_ctx, &r->in.info->info1);
-            		break;
+			break;
 		case 3:
 			status = set_dom_info_3(p->mem_ctx, &r->in.info->info3);
 			break;
diff --git a/source3/rpc_server/srv_samr_util.c b/source3/rpc_server/samr/srv_samr_util.c
index 8bbcc1a5ee3..6fc4ade3cf5 100644
--- a/source3/rpc_server/srv_samr_util.c
+++ b/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
diff --git a/source3/rpc_server/srv_samr_util.h b/source3/rpc_server/samr/srv_samr_util.h
index e8985415593..e8985415593 100644
--- a/source3/rpc_server/srv_samr_util.h
+++ b/source3/rpc_server/samr/srv_samr_util.h
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index e2fc670d50b..d2552ae47b0 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -2406,7 +2406,7 @@ static WERROR getprinterdata_printer_server(TALLOC_CTX *mem_ctx,
 	}
 
 
-   	if (!StrCaseCmp(value, "DefaultSpoolDirectory")) {
+	if (!StrCaseCmp(value, "DefaultSpoolDirectory")) {
 		*type = REG_SZ;
 
 		data->string = talloc_strdup(mem_ctx, "C:\\PRINTERS");
@@ -4647,7 +4647,7 @@ WERROR _spoolss_EnumPrinters(struct pipes_struct *p,
 	}
 
 	*r->out.needed	= SPOOLSS_BUFFER_UNION_ARRAY(p->mem_ctx,
-						     spoolss_EnumPrinters, 
+						     spoolss_EnumPrinters,
 						     *r->out.info, r->in.level,
 						     *r->out.count);
 	*r->out.info	= SPOOLSS_BUFFER_OK(*r->out.info, NULL);
@@ -4757,7 +4757,7 @@ WERROR _spoolss_GetPrinter(struct pipes_struct *p,
 		return result;
 	}
 
-	*r->out.needed	= SPOOLSS_BUFFER_UNION(spoolss_PrinterInfo, 
+	*r->out.needed	= SPOOLSS_BUFFER_UNION(spoolss_PrinterInfo,
 					       r->out.info, r->in.level);
 	r->out.info	= SPOOLSS_BUFFER_OK(r->out.info, NULL);
 
@@ -5589,7 +5589,7 @@ WERROR _spoolss_GetPrinterDriver2(struct pipes_struct *p,
 		return result;
 	}
 
-	*r->out.needed	= SPOOLSS_BUFFER_UNION(spoolss_DriverInfo, 
+	*r->out.needed	= SPOOLSS_BUFFER_UNION(spoolss_DriverInfo,
 					       r->out.info, r->in.level);
 	r->out.info	= SPOOLSS_BUFFER_OK(r->out.info, NULL);
 
@@ -7088,7 +7088,7 @@ WERROR _spoolss_EnumJobs(struct pipes_struct *p,
 	}
 
 	*r->out.needed	= SPOOLSS_BUFFER_UNION_ARRAY(p->mem_ctx,
-						     spoolss_EnumJobs, 
+						     spoolss_EnumJobs,
 						     *r->out.info, r->in.level,
 						     *r->out.count);
 	*r->out.info	= SPOOLSS_BUFFER_OK(*r->out.info, NULL);
@@ -7420,7 +7420,7 @@ WERROR _spoolss_EnumPrinterDrivers(struct pipes_struct *p,
 	}
 
 	*r->out.needed	= SPOOLSS_BUFFER_UNION_ARRAY(p->mem_ctx,
-						     spoolss_EnumPrinterDrivers, 
+						     spoolss_EnumPrinterDrivers,
 						     *r->out.info, r->in.level,
 						     *r->out.count);
 	*r->out.info	= SPOOLSS_BUFFER_OK(*r->out.info, NULL);
@@ -7474,7 +7474,7 @@ WERROR _spoolss_EnumForms(struct pipes_struct *p,
 	}
 
 	*r->out.needed	= SPOOLSS_BUFFER_UNION_ARRAY(p->mem_ctx,
-						     spoolss_EnumForms, 
+						     spoolss_EnumForms,
 						     *r->out.info, r->in.level,
 						     *r->out.count);
 	*r->out.info	= SPOOLSS_BUFFER_OK(*r->out.info, NULL);
@@ -7520,7 +7520,7 @@ WERROR _spoolss_GetForm(struct pipes_struct *p,
 		return result;
 	}
 
-	*r->out.needed	= SPOOLSS_BUFFER_UNION(spoolss_FormInfo, 
+	*r->out.needed	= SPOOLSS_BUFFER_UNION(spoolss_FormInfo,
 					       r->out.info, r->in.level);
 	r->out.info	= SPOOLSS_BUFFER_OK(r->out.info, NULL);
 
@@ -7768,7 +7768,7 @@ WERROR _spoolss_EnumPorts(struct pipes_struct *p,
 	}
 
 	*r->out.needed	= SPOOLSS_BUFFER_UNION_ARRAY(p->mem_ctx,
-						     spoolss_EnumPorts, 
+						     spoolss_EnumPorts,
 						     *r->out.info, r->in.level,
 						     *r->out.count);
 	*r->out.info	= SPOOLSS_BUFFER_OK(*r->out.info, NULL);
@@ -8189,7 +8189,7 @@ WERROR _spoolss_GetPrinterDriverDirectory(struct pipes_struct *p,
 		return werror;
 	}
 
-	*r->out.needed	= SPOOLSS_BUFFER_UNION(spoolss_DriverDirectoryInfo, 
+	*r->out.needed	= SPOOLSS_BUFFER_UNION(spoolss_DriverDirectoryInfo,
 					       r->out.info, r->in.level);
 	r->out.info	= SPOOLSS_BUFFER_OK(r->out.info, NULL);
 
@@ -8319,8 +8319,8 @@ WERROR _spoolss_EnumPrinterData(struct pipes_struct *p,
 
 		/*
 		 * See the section "Dynamically Typed Query Parameters"
- 		 * in MS-RPRN.
- 		 */
+		 * in MS-RPRN.
+		 */
 
 		if (r->out.data && val->data && val->data->data &&
 				val->data_length && r->in.data_offered) {
@@ -8784,7 +8784,7 @@ WERROR _spoolss_EnumPrintProcDataTypes(struct pipes_struct *p,
 	}
 
 	*r->out.needed	= SPOOLSS_BUFFER_UNION_ARRAY(p->mem_ctx,
-						     spoolss_EnumPrintProcDataTypes, 
+						     spoolss_EnumPrintProcDataTypes,
 						     *r->out.info, r->in.level,
 						     *r->out.count);
 	*r->out.info	= SPOOLSS_BUFFER_OK(*r->out.info, NULL);
@@ -8957,7 +8957,7 @@ WERROR _spoolss_EnumMonitors(struct pipes_struct *p,
 	}
 
 	*r->out.needed	= SPOOLSS_BUFFER_UNION_ARRAY(p->mem_ctx,
-						     spoolss_EnumMonitors, 
+						     spoolss_EnumMonitors,
 						     *r->out.info, r->in.level,
 						     *r->out.count);
 	*r->out.info	= SPOOLSS_BUFFER_OK(*r->out.info, NULL);
@@ -9607,7 +9607,7 @@ WERROR _spoolss_EnumPrinterDataEx(struct pipes_struct *p,
 	}
 
 	*r->out.needed	= SPOOLSS_BUFFER_ARRAY(p->mem_ctx,
-					       spoolss_EnumPrinterDataEx, 
+					       spoolss_EnumPrinterDataEx,
 					       *r->out.info,
 					       *r->out.count);
 	*r->out.info	= SPOOLSS_BUFFER_OK(*r->out.info, NULL);
diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/spoolss/srv_spoolss_util.c
index db575746f81..9d654ec20cf 100644
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_util.c
@@ -4246,4 +4246,3 @@ done:
 	TALLOC_FREE(tmp_ctx);
 	return result;
 }
-
diff --git a/source3/rpc_server/srv_spoolss_util.h b/source3/rpc_server/spoolss/srv_spoolss_util.h
index d425bd1bbaf..d425bd1bbaf 100644
--- a/source3/rpc_server/srv_spoolss_util.h
+++ b/source3/rpc_server/spoolss/srv_spoolss_util.h
diff --git a/source3/rpc_server/srv_rpc_register.c b/source3/rpc_server/srv_rpc_register.c
index 8cb6e8e3347..634adfdd782 100644
--- a/source3/rpc_server/srv_rpc_register.c
+++ b/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"
 
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index d5858ca4187..cd4ada1b90d 100644
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -138,8 +138,8 @@ static void enum_file_fn( const struct share_mode_entry *e,
                           const char *sharepath, const char *fname,
 			  void *private_data )
 {
- 	struct file_enum_count *fenum =
- 		(struct file_enum_count *)private_data;
+	struct file_enum_count *fenum =
+		(struct file_enum_count *)private_data;
 
 	struct srvsvc_NetFileInfo3 *f;
 	int i = fenum->ctr3->count;
@@ -2817,4 +2817,3 @@ WERROR _srvsvc_NETRSERVERTRANSPORTDELEX(struct pipes_struct *p,
 	p->rng_fault_state = True;
 	return WERR_NOT_SUPPORTED;
 }
-
diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/svcctl/srv_svcctl_nt.c
index b6984d0c5f1..a7af089e7e3 100644
--- a/source3/rpc_server/srv_svcctl_nt.c
+++ b/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;
 }
-
diff --git a/source3/rpc_server/srv_svcctl_reg.c b/source3/rpc_server/svcctl/srv_svcctl_reg.c
index ca6a68a2fd1..84c5f434ee0 100644
--- a/source3/rpc_server/srv_svcctl_reg.c
+++ b/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
diff --git a/source3/rpc_server/srv_svcctl_reg.h b/source3/rpc_server/svcctl/srv_svcctl_reg.h
index ab12a03b7bd..ab12a03b7bd 100644
--- a/source3/rpc_server/srv_svcctl_reg.h
+++ b/source3/rpc_server/svcctl/srv_svcctl_reg.h
diff --git a/source3/rpc_server/srv_winreg_nt.c b/source3/rpc_server/winreg/srv_winreg_nt.c
index 91f050a0998..379fe57c388 100644
--- a/source3/rpc_server/srv_winreg_nt.c
+++ b/source3/rpc_server/winreg/srv_winreg_nt.c
@@ -525,7 +525,7 @@ WERROR _winreg_InitiateSystemShutdownEx(struct pipes_struct *p,
 	int ret = -1;
 	bool can_shutdown = false;
 
- 	shutdown_script = talloc_strdup(p->mem_ctx, lp_shutdown_script());
+	shutdown_script = talloc_strdup(p->mem_ctx, lp_shutdown_script());
 	if (!shutdown_script) {
 		return WERR_NOMEM;
 	}
diff --git a/source3/rpc_server/srv_wkssvc_nt.c b/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
index 3926ceb27a2..4cbf70c80f5 100644
--- a/source3/rpc_server/srv_wkssvc_nt.c
+++ b/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
@@ -1,4 +1,4 @@
-/* 
+/*
  *  Unix SMB/CIFS implementation.
  *  RPC Pipe client / server routines
  *
@@ -10,12 +10,12 @@
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 3 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
@@ -1017,4 +1017,3 @@ WERROR _wkssvc_NetrEnumerateComputerNames(struct pipes_struct *p,
 	p->rng_fault_state = True;
 	return WERR_NOT_SUPPORTED;
 }
-
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build
index 8534141a1aa..2eb5b3af0a3 100644
--- a/source3/rpc_server/wscript_build
+++ b/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='',