Fix the NTSTATUS -> WERROR for srvsvc pipe.

Jeremy.
(This used to be commit 2b85d3570c2b149049482c3878c50cf8f5bfca61)

2 files changed, 18 insertions, 16 deletions

diff --git a/source3/include/doserr.h b/source3/include/doserr.h
index 5633f837a8..498c3a5d2b 100644
--- a/source3/include/doserr.h
+++ b/source3/include/doserr.h
@@ -162,6 +162,7 @@
 #define WERR_NOMEM W_ERROR(8)
 #define WERR_INVALID_NAME W_ERROR(123)
 #define WERR_UNKNOWN_LEVEL W_ERROR(124)
+#define WERR_OBJECT_PATH_INVALID W_ERROR(161)
 #define WERR_NO_MORE_ITEMS W_ERROR(259)
 #define WERR_MORE_DATA W_ERROR(234)
 #define WERR_UNKNOWN_PRINTER_DRIVER W_ERROR(1797)
diff --git a/source3/include/rpc_srvsvc.h b/source3/include/rpc_srvsvc.h
index 10dbc102e0..c511763232 100644
--- a/source3/include/rpc_srvsvc.h
+++ b/source3/include/rpc_srvsvc.h
@@ -1,5 +1,6 @@
 /*
-   Unix SMB/CIFS implementation.
+   Unix SMB/Netbios implementation.
+   Version 1.9.
    SMB parameters and setup
    Copyright (C) Andrew Tridgell 1992-1997
    Copyright (C) Luke Kenneth Casson Leighton 1996-1997
@@ -66,7 +67,7 @@ typedef struct net_srv_disk_enum {
 	uint32 preferred_len;        /* preferred maximum length (0xffff ffff) */
 	uint32 total_entries;        /* total number of entries */
 	ENUM_HND enum_hnd;
-	NTSTATUS status;               /* return status */
+	WERROR status;               /* return status */
 } SRV_Q_NET_DISK_ENUM, SRV_R_NET_DISK_ENUM;
 
 typedef struct net_name_validate {
@@ -75,7 +76,7 @@ typedef struct net_name_validate {
 	UNISTR2 uni_name; /*name to validate*/
 	uint32 type;
 	uint32 flags;
-	NTSTATUS status;
+	WERROR status;
 } SRV_Q_NET_NAME_VALIDATE, SRV_R_NET_NAME_VALIDATE;
 
 /* SESS_INFO_0 (pointers to level 0 session info strings) */
@@ -184,7 +185,7 @@ typedef struct r_net_sess_enum_info
 	uint32 total_entries;                    /* total number of entries */
 	ENUM_HND enum_hnd;
 
-	NTSTATUS status;               /* return status */
+	WERROR status;               /* return status */
 
 } SRV_R_NET_SESS_ENUM;
 
@@ -287,7 +288,7 @@ typedef struct r_net_conn_enum_info
 	uint32 total_entries;                    /* total number of entries */
 	ENUM_HND enum_hnd;
 
-	NTSTATUS status;               /* return status */
+	WERROR status;               /* return status */
 
 } SRV_R_NET_CONN_ENUM;
 
@@ -443,7 +444,7 @@ typedef struct r_net_share_enum_info
 	uint32 total_entries;                    /* total number of entries */
 	ENUM_HND enum_hnd;
 
-	NTSTATUS status;               /* return status */
+	WERROR status;               /* return status */
 
 } SRV_R_NET_SHARE_ENUM;
 
@@ -479,7 +480,7 @@ typedef struct srv_share_info {
 typedef struct r_net_share_get_info_info
 {
 	SRV_SHARE_INFO info;
-	NTSTATUS status;
+	WERROR status;
 
 } SRV_R_NET_SHARE_GET_INFO;
 
@@ -501,7 +502,7 @@ typedef struct r_net_share_set_info
 {
 	uint32 switch_value;         /* switch value */
 
-	NTSTATUS status;               /* return status */
+	WERROR status;               /* return status */
 
 } SRV_R_NET_SHARE_SET_INFO;
 
@@ -522,7 +523,7 @@ typedef struct r_net_share_add
 {
 	uint32 switch_value;         /* switch value */
 
-	NTSTATUS status;               /* return status */
+	WERROR status;               /* return status */
 
 } SRV_R_NET_SHARE_ADD;
 
@@ -538,7 +539,7 @@ typedef struct q_net_share_del
 /* SRV_R_NET_SHARE_DEL */
 typedef struct r_net_share_del
 {
-	NTSTATUS status;               /* return status */
+	WERROR status;               /* return status */
 
 } SRV_R_NET_SHARE_DEL;
 
@@ -621,7 +622,7 @@ typedef struct r_net_file_enum_info
 	uint32 total_entries;                    /* total number of files */
 	ENUM_HND enum_hnd;
 
-	NTSTATUS status;        /* return status */
+	WERROR status;        /* return status */
 
 } SRV_R_NET_FILE_ENUM;
 
@@ -703,7 +704,7 @@ typedef struct r_net_srv_get_info
 {
 	SRV_INFO_CTR *ctr;
 
-	NTSTATUS status;               /* return status */
+	WERROR status;               /* return status */
 
 } SRV_R_NET_SRV_GET_INFO;
 
@@ -724,7 +725,7 @@ typedef struct r_net_srv_set_info
 {
 	uint32 switch_value;         /* switch value */
 
-	NTSTATUS status;               /* return status */
+	WERROR status;               /* return status */
 
 } SRV_R_NET_SRV_SET_INFO;
 
@@ -760,7 +761,7 @@ typedef struct r_net_remote_tod
 	uint32 ptr_srv_tod;         /* pointer to TOD */
 	TIME_OF_DAY_INFO *tod;
 	
-	NTSTATUS status;               /* return status */
+	WERROR status;               /* return status */
 
 } SRV_R_NET_REMOTE_TOD;
 
@@ -785,7 +786,7 @@ typedef struct r_net_file_query_secdesc
 	uint32 ptr_secdesc;
 	uint32 size_secdesc;
 	SEC_DESC *sec_desc;
-	NTSTATUS status;
+	WERROR status;
 } SRV_R_NET_FILE_QUERY_SECDESC;
 
 /* SRV_Q_NET_FILE_SET_SECDESC */
@@ -806,6 +807,6 @@ typedef struct q_net_file_set_secdesc
 /* SRV_R_NET_FILE_SET_SECDESC */
 typedef struct r_net_file_set_secdesc
 {
-	NTSTATUS status;
+	WERROR status;
 } SRV_R_NET_FILE_SET_SECDESC;
 #endif /* _RPC_SRVSVC_H */