Cleaned up srvsvc constants a bit.

(This used to be commit ca61f68d5ca8791bea34732bd358cfb63273fc5c)

4 files changed, 43 insertions, 43 deletions

diff --git a/source3/include/rpc_srvsvc.h b/source3/include/rpc_srvsvc.h
index 5ebb41036e..6c5f6b819c 100644
--- a/source3/include/rpc_srvsvc.h
+++ b/source3/include/rpc_srvsvc.h
@@ -23,24 +23,23 @@
 #ifndef _RPC_SRVSVC_H /* _RPC_SRVSVC_H */
 #define _RPC_SRVSVC_H 
 
-
 /* srvsvc pipe */
-#define SRV_NETCONNENUM        0x08
-#define SRV_NETFILEENUM        0x09
-#define SRV_NETSESSENUM        0x0c
-#define SRV_NET_SHARE_ADD      0x0e
-#define SRV_NETSHAREENUM_ALL   0x0f
-#define SRV_NET_SHARE_GET_INFO 0x10
-#define SRV_NET_SHARE_SET_INFO 0x11
-#define SRV_NET_SHARE_DEL      0x12
-#define SRV_NET_SRV_GET_INFO   0x15
-#define SRV_NET_SRV_SET_INFO   0x16
-#define SRV_NET_DISK_ENUM      0x17
-#define SRV_NET_REMOTE_TOD     0x1c
-#define SRV_NET_NAME_VALIDATE  0x21
-#define SRV_NETSHAREENUM       0x24
-#define SRV_NETFILEQUERYSECDESC 0x27
-#define SRV_NETFILESETSECDESC	0x28
+#define SRV_NET_CONN_ENUM          0x08
+#define SRV_NET_FILE_ENUM          0x09
+#define SRV_NET_SESS_ENUM          0x0c
+#define SRV_NET_SHARE_ADD          0x0e
+#define SRV_NET_SHARE_ENUM_ALL     0x0f
+#define SRV_NET_SHARE_GET_INFO     0x10
+#define SRV_NET_SHARE_SET_INFO     0x11
+#define SRV_NET_SHARE_DEL          0x12
+#define SRV_NET_SRV_GET_INFO       0x15
+#define SRV_NET_SRV_SET_INFO       0x16
+#define SRV_NET_DISK_ENUM          0x17
+#define SRV_NET_REMOTE_TOD         0x1c
+#define SRV_NET_NAME_VALIDATE      0x21
+#define SRV_NET_SHARE_ENUM         0x24
+#define SRV_NET_FILE_QUERY_SECDESC 0x27
+#define SRV_NET_FILE_SET_SECDESC   0x28
 
 #define MAX_SERVER_DISK_ENTRIES 15
 
@@ -831,4 +830,5 @@ typedef struct r_net_file_set_secdesc
 {
 	WERROR status;
 } SRV_R_NET_FILE_SET_SECDESC;
+
 #endif /* _RPC_SRVSVC_H */
diff --git a/source3/libsmb/cli_srvsvc.c b/source3/libsmb/cli_srvsvc.c
index 302b45960e..f3d012434e 100644
--- a/source3/libsmb/cli_srvsvc.c
+++ b/source3/libsmb/cli_srvsvc.c
@@ -95,7 +95,7 @@ WERROR cli_srvsvc_net_share_enum(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 	/* Marshall data and send request */
 
 	if (!srv_io_q_net_share_enum("", &q, &qbuf, 0) ||
-	    !rpc_api_pipe_req(cli, SRV_NETSHAREENUM_ALL, &qbuf, &rbuf))
+	    !rpc_api_pipe_req(cli, SRV_NET_SHARE_ENUM_ALL, &qbuf, &rbuf))
 		goto done;
 
 	/* Unmarshall response */
diff --git a/source3/rpc_client/cli_srvsvc.c b/source3/rpc_client/cli_srvsvc.c
index 024e711789..c2b2e9f163 100644
--- a/source3/rpc_client/cli_srvsvc.c
+++ b/source3/rpc_client/cli_srvsvc.c
@@ -43,7 +43,7 @@ BOOL do_srv_net_srv_conn_enum(struct cli_state *cli,
 	prs_init(&data, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL);
 	prs_init(&rdata, 0, cli->mem_ctx, UNMARSHALL);
 
-	/* create and send a MSRPC command with api SRV_NETCONNENUM */
+	/* create and send a MSRPC command with api SRV_NET_CONN_ENUM */
 
 	DEBUG(4,("SRV Net Server Connection Enum(%s, %s), level %d, enum:%8x\n",
 				server_name, qual_name, switch_value, get_enum_hnd(hnd)));
@@ -67,7 +67,7 @@ BOOL do_srv_net_srv_conn_enum(struct cli_state *cli,
 	}
 
 	/* send the data on \PIPE\ */
-	if(!rpc_api_pipe_req(cli, SRV_NETCONNENUM, &data, &rdata)) {
+	if(!rpc_api_pipe_req(cli, SRV_NET_CONN_ENUM, &data, &rdata)) {
 		prs_mem_free(&data);
 		prs_mem_free(&rdata);
 		return False;
@@ -123,7 +123,7 @@ BOOL do_srv_net_srv_sess_enum(struct cli_state *cli,
 	prs_init(&data, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL);
 	prs_init(&rdata, 0, cli->mem_ctx, UNMARSHALL);
 
-	/* create and send a MSRPC command with api SRV_NETSESSENUM */
+	/* create and send a MSRPC command with api SRV_NET_SESS_ENUM */
 
 	DEBUG(4,("SRV Net Session Enum (%s), level %d, enum:%8x\n",
 				server_name, switch_value, get_enum_hnd(hnd)));
@@ -147,7 +147,7 @@ BOOL do_srv_net_srv_sess_enum(struct cli_state *cli,
 	}
 
 	/* send the data on \PIPE\ */
-	if (!rpc_api_pipe_req(cli, SRV_NETSESSENUM, &data, &rdata)) {
+	if (!rpc_api_pipe_req(cli, SRV_NET_SESS_ENUM, &data, &rdata)) {
 		prs_mem_free(&data);
 		prs_mem_free(&rdata);
 		return False;
@@ -200,7 +200,7 @@ BOOL do_srv_net_srv_share_enum(struct cli_state *cli,
 	prs_init(&data, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL);
 	prs_init(&rdata, 0, cli->mem_ctx, UNMARSHALL);
 
-	/* create and send a MSRPC command with api SRV_NETSHAREENUM */
+	/* create and send a MSRPC command with api SRV_NET_SHARE_ENUM */
 
 	DEBUG(4,("SRV Get Share Info (%s), level %d, enum:%8x\n",
 				server_name, switch_value, get_enum_hnd(hnd)));
@@ -217,7 +217,7 @@ BOOL do_srv_net_srv_share_enum(struct cli_state *cli,
 	}
 
 	/* send the data on \PIPE\ */
-	if (!rpc_api_pipe_req(cli, SRV_NETSHAREENUM, &data, &rdata)) {
+	if (!rpc_api_pipe_req(cli, SRV_NET_SHARE_ENUM, &data, &rdata)) {
 		prs_mem_free(&data);
 		prs_mem_free(&rdata);
 		return False;
@@ -271,7 +271,7 @@ BOOL do_srv_net_srv_file_enum(struct cli_state *cli,
 	prs_init(&data, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL);
 	prs_init(&rdata, 0, cli->mem_ctx, UNMARSHALL);
 
-	/* create and send a MSRPC command with api SRV_NETFILEENUM */
+	/* create and send a MSRPC command with api SRV_NET_FILE_ENUM */
 
 	DEBUG(4,("SRV Get File Info (%s), level %d, enum:%8x\n",
 				server_name, switch_value, get_enum_hnd(hnd)));
@@ -297,7 +297,7 @@ BOOL do_srv_net_srv_file_enum(struct cli_state *cli,
 	}
 
 	/* send the data on \PIPE\ */
-	if (!rpc_api_pipe_req(cli, SRV_NETFILEENUM, &data, &rdata)) {
+	if (!rpc_api_pipe_req(cli, SRV_NET_FILE_ENUM, &data, &rdata)) {
 		prs_mem_free(&data);
 		prs_mem_free(&rdata);
 		return False;
diff --git a/source3/rpc_server/srv_srvsvc.c b/source3/rpc_server/srv_srvsvc.c
index ee4ec8aa0a..b09df1e204 100644
--- a/source3/rpc_server/srv_srvsvc.c
+++ b/source3/rpc_server/srv_srvsvc.c
@@ -494,23 +494,23 @@ static BOOL api_srv_net_file_set_secdesc(pipes_struct *p)
 
 struct api_struct api_srv_cmds[] =
 {
-	{ "SRV_NETCONNENUM"       , SRV_NETCONNENUM       , api_srv_net_conn_enum    },
-	{ "SRV_NETSESSENUM"       , SRV_NETSESSENUM       , api_srv_net_sess_enum    },
-	{ "SRV_NETSHAREENUM_ALL"  , SRV_NETSHAREENUM_ALL  , api_srv_net_share_enum_all   },
-	{ "SRV_NETSHAREENUM"      , SRV_NETSHAREENUM      , api_srv_net_share_enum   },
-	{ "SRV_NET_SHARE_ADD"     , SRV_NET_SHARE_ADD     , api_srv_net_share_add },
-	{ "SRV_NET_SHARE_DEL"     , SRV_NET_SHARE_DEL     , api_srv_net_share_del },
-	{ "SRV_NET_SHARE_GET_INFO", SRV_NET_SHARE_GET_INFO, api_srv_net_share_get_info },
-	{ "SRV_NET_SHARE_SET_INFO", SRV_NET_SHARE_SET_INFO, api_srv_net_share_set_info },
-	{ "SRV_NETFILEENUM"       , SRV_NETFILEENUM       , api_srv_net_file_enum    },
-	{ "SRV_NET_SRV_GET_INFO"  , SRV_NET_SRV_GET_INFO  , api_srv_net_srv_get_info },
-	{ "SRV_NET_SRV_SET_INFO"  , SRV_NET_SRV_SET_INFO  , api_srv_net_srv_set_info },
-	{ "SRV_NET_REMOTE_TOD"    , SRV_NET_REMOTE_TOD    , api_srv_net_remote_tod   },
-	{ "SRV_NET_DISK_ENUM"     , SRV_NET_DISK_ENUM     , api_srv_net_disk_enum    },
-	{ "SRV_NET_NAME_VALIDATE" , SRV_NET_NAME_VALIDATE , api_srv_net_name_validate},
-	{ "SRV_NETFILEQUERYSECDESC",SRV_NETFILEQUERYSECDESC,api_srv_net_file_query_secdesc},
-	{ "SRV_NETFILESETSECDESC" , SRV_NETFILESETSECDESC , api_srv_net_file_set_secdesc},
-	{ NULL                    , 0                     , NULL                     }
+	{ "SRV_NET_CONN_ENUM"       ,  SRV_NET_CONN_ENUM       ,   api_srv_net_conn_enum    },
+	{ "SRV_NET_SESS_ENUM"       ,  SRV_NET_SESS_ENUM       ,   api_srv_net_sess_enum    },
+	{ "SRV_NET_SHARE_ENUM_ALL"  ,  SRV_NET_SHARE_ENUM_ALL  ,   api_srv_net_share_enum_all   },
+	{ "SRV_NET_SHARE_ENUM"      ,  SRV_NET_SHARE_ENUM      ,   api_srv_net_share_enum   },
+	{ "SRV_NET_SHARE_ADD"     ,    SRV_NET_SHARE_ADD     ,     api_srv_net_share_add },
+	{ "SRV_NET_SHARE_DEL"     ,    SRV_NET_SHARE_DEL     ,     api_srv_net_share_del },
+	{ "SRV_NET_SHARE_GET_INFO",    SRV_NET_SHARE_GET_INFO,     api_srv_net_share_get_info },
+	{ "SRV_NET_SHARE_SET_INFO",    SRV_NET_SHARE_SET_INFO,     api_srv_net_share_set_info },
+	{ "SRV_NET_FILE_ENUM"       ,  SRV_NET_FILE_ENUM       ,   api_srv_net_file_enum    },
+	{ "SRV_NET_SRV_GET_INFO"  ,    SRV_NET_SRV_GET_INFO  ,     api_srv_net_srv_get_info },
+	{ "SRV_NET_SRV_SET_INFO"  ,    SRV_NET_SRV_SET_INFO  ,     api_srv_net_srv_set_info },
+	{ "SRV_NET_REMOTE_TOD"    ,    SRV_NET_REMOTE_TOD    ,     api_srv_net_remote_tod   },
+	{ "SRV_NET_DISK_ENUM"     ,    SRV_NET_DISK_ENUM     ,     api_srv_net_disk_enum    },
+	{ "SRV_NET_NAME_VALIDATE" ,    SRV_NET_NAME_VALIDATE ,     api_srv_net_name_validate},
+	{ "SRV_NET_FILE_QUERY_SECDESC",SRV_NET_FILE_QUERY_SECDESC, api_srv_net_file_query_secdesc},
+	{ "SRV_NET_FILE_SET_SECDESC" , SRV_NET_FILE_SET_SECDESC ,  api_srv_net_file_set_secdesc},
+	{ NULL                    ,    0                     ,     NULL                     }
 };
 
 /*******************************************************************