r464: a big improvement to the API for writing server-side RPC

servers. Previously the server pipe code needed to return the RPC
level status (nearly always "OK") and separately set the function call
return using r->out.result. All the programmers writing servers
(metze, jelmer and me) were often getting this wrong, by doing things
like "return NT_STATUS_NO_MEMORY" which was really quite meaningless
as there is no code like that at the dcerpc level.

I have now modified pidl to generate the necessary boilerplate so that
just returning the status you want from the function will work. So for
a NTSTATUS function you return NT_STATUS_XXX and from a WERROR
function you return WERR_XXX. If you really want to generate a DCERPC
level fault rather than just a return value in your function then you
should use the DCESRV_FAULT() macro which will correctly generate a
fault for you.

As a side effect, this also adds automatic type checking of all of our
server side rpc functions, which was impossible with the old API. When
I changed the API I found and fixed quite a few functions with the
wrong type information, so this is definately useful.

I have also changed the server side template generation to generate a
DCERPC "operation range error" by default when you have not yet filled
in a server side function. This allows us to correctly implement
functions in any order in our rpc pipe servers and give the client the
right information about the fault.
(This used to be commit a4df5c7cf88891a78d82c8d6d7f058d8485e73f0)

1 files changed, 211 insertions, 266 deletions

diff --git a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
index 1e5a2105d0..96af3d84f4 100644
--- a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
+++ b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
@@ -26,13 +26,12 @@
 /* 
   srvsvc_NetCharDevEnum 
 */
-static NTSTATUS srvsvc_NetCharDevEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-		       struct srvsvc_NetCharDevEnum *r)
+static WERROR srvsvc_NetCharDevEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+				      struct srvsvc_NetCharDevEnum *r)
 {
 	r->out.level = r->in.level;
 	r->out.totalentries = 0;
 	r->out.resume_handle = NULL;
-	r->out.result = WERR_OK;
 
 	switch (r->in.level) {
 	case 0:
@@ -42,8 +41,8 @@ static NTSTATUS srvsvc_NetCharDevEnum(struct dcesrv_call_state *dce_call, TALLOC
 		r->out.ctr.ctr0->count = 0;
 		r->out.ctr.ctr0->array = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
+		return WERR_NOT_SUPPORTED;
+
 	case 1:
 		r->out.ctr.ctr1 = talloc_p(mem_ctx, struct srvsvc_NetCharDevCtr1);
 		WERR_TALLOC_CHECK(r->out.ctr.ctr1);
@@ -51,66 +50,60 @@ static NTSTATUS srvsvc_NetCharDevEnum(struct dcesrv_call_state *dce_call, TALLOC
 		r->out.ctr.ctr1->count = 0;
 		r->out.ctr.ctr1->array = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
+		return WERR_NOT_SUPPORTED;
+
 	default:
-		r->out.result = WERR_UNKNOWN_LEVEL;
-		break;
+		return WERR_UNKNOWN_LEVEL;
 	}
 
-	return NT_STATUS_OK;
+	return WERR_OK;
 }
 
 
 /* 
   srvsvc_NetCharDevGetInfo 
 */
-static NTSTATUS srvsvc_NetCharDevGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NetCharDevGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NetCharDevGetInfo *r)
 {
-	r->out.result = WERR_OK;
-
 	switch (r->in.level) {
 	case 0:
 		r->out.info.info0 = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
+		return WERR_NOT_SUPPORTED;
+
 	case 1:
 		r->out.info.info1 = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
+		return WERR_NOT_SUPPORTED;
+
 	default:
-		r->out.result = WERR_UNKNOWN_LEVEL;
-		break;
+		return WERR_UNKNOWN_LEVEL;
 	}
 
-	return NT_STATUS_OK;
+	return WERR_OK;
 }
 
 
 /* 
   srvsvc_NetCharDevControl 
 */
-static NTSTATUS srvsvc_NetCharDevControl(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NetCharDevControl(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NetCharDevControl *r)
 {
-	r->out.result = WERR_NOT_SUPPORTED;
-	return NT_STATUS_OK;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NetCharDevQEnum 
 */
-static NTSTATUS srvsvc_NetCharDevQEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-		       struct srvsvc_NetCharDevQEnum *r)
+static WERROR srvsvc_NetCharDevQEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+				     struct srvsvc_NetCharDevQEnum *r)
 {
 	r->out.level = r->in.level;
 	r->out.totalentries = 0;
 	r->out.resume_handle = NULL;
-	r->out.result = WERR_OK;
 
 	switch (r->in.level) {
 	case 0:
@@ -120,8 +113,8 @@ static NTSTATUS srvsvc_NetCharDevQEnum(struct dcesrv_call_state *dce_call, TALLO
 		r->out.ctr.ctr0->count = 0;
 		r->out.ctr.ctr0->array = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
+		return WERR_NOT_SUPPORTED;
+
 	case 1:
 		r->out.ctr.ctr1 = talloc_p(mem_ctx, struct srvsvc_NetCharDevQCtr1);
 		WERR_TALLOC_CHECK(r->out.ctr.ctr1);
@@ -129,361 +122,324 @@ static NTSTATUS srvsvc_NetCharDevQEnum(struct dcesrv_call_state *dce_call, TALLO
 		r->out.ctr.ctr1->count = 0;
 		r->out.ctr.ctr1->array = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
+		return WERR_NOT_SUPPORTED;
+
 	default:
-		r->out.result = WERR_UNKNOWN_LEVEL;
-		break;
+		return WERR_UNKNOWN_LEVEL;
 	}
 
-	return NT_STATUS_OK;
+	return WERR_OK;
 }
 
 
 /* 
   srvsvc_NetCharDevQGetInfo 
 */
-static NTSTATUS srvsvc_NetCharDevQGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-		       struct srvsvc_NetCharDevQGetInfo *r)
+static WERROR srvsvc_NetCharDevQGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+					struct srvsvc_NetCharDevQGetInfo *r)
 {
-	r->out.result = WERR_OK;
-
 	switch (r->in.level) {
 	case 0:
 		r->out.info.info0 = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
+		return WERR_NOT_SUPPORTED;
+
 	case 1:
 		r->out.info.info1 = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
+		return WERR_NOT_SUPPORTED;
+
 	default:
-		r->out.result = WERR_UNKNOWN_LEVEL;
-		break;
+		return WERR_UNKNOWN_LEVEL;
 	}
 
-	return NT_STATUS_OK;
+	return WERR_OK;
 }
 
 
 /* 
   srvsvc_NetCharDevQSetInfo 
 */
-static NTSTATUS srvsvc_NetCharDevQSetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NetCharDevQSetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NetCharDevQSetInfo *r)
 {
-	r->out.result = WERR_OK;
-
 	switch (r->in.level) {
 	case 0:	
 		if (r->in.parm_error) {
 			r->out.parm_error = r->in.parm_error;
 		}
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
+		return WERR_NOT_SUPPORTED;
 	case 1:
 		if (r->in.parm_error) {
 			r->out.parm_error = r->in.parm_error;
 		}
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
+		return WERR_NOT_SUPPORTED;
 	default:
-		r->out.result = WERR_UNKNOWN_LEVEL;
-		break;
+		return WERR_UNKNOWN_LEVEL;
 	}
 
-	return NT_STATUS_OK;
+	return WERR_OK;
 }
 
 
 /* 
   srvsvc_NetCharDevQPurge 
 */
-static NTSTATUS srvsvc_NetCharDevQPurge(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NetCharDevQPurge(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NetCharDevQPurge *r)
 {
-	r->out.result = WERR_NOT_SUPPORTED;
-	return NT_STATUS_OK;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NetCharDevQPurgeSelf 
 */
-static NTSTATUS srvsvc_NetCharDevQPurgeSelf(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-		       struct srvsvc_NetCharDevQPurgeSelf *r)
+static WERROR srvsvc_NetCharDevQPurgeSelf(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+					  struct srvsvc_NetCharDevQPurgeSelf *r)
 {
-	r->out.result = WERR_NOT_SUPPORTED;
-	return NT_STATUS_OK;
+	return WERR_NOT_SUPPORTED;	
 }
 
 
 /* 
   srvsvc_NetConnEnum 
 */
-static NTSTATUS srvsvc_NetConnEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NetConnEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NetConnEnum *r)
 {
 	r->out.level = r->in.level;
 	r->out.totalentries = 0;
 	r->out.resume_handle = NULL;
-	r->out.result = WERR_OK;
 
 	switch (r->in.level) {
-	case 0: {
+	case 0:
 		r->out.ctr.ctr0 = talloc_p(mem_ctx, struct srvsvc_NetConnCtr0);
 		WERR_TALLOC_CHECK(r->out.ctr.ctr0);
 
 		r->out.ctr.ctr0->count = 0;
 		r->out.ctr.ctr0->array = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
-		}
-	case 1: {
+		return WERR_NOT_SUPPORTED;
+
+	case 1:
 		r->out.ctr.ctr1 = talloc_p(mem_ctx, struct srvsvc_NetConnCtr1);
 		WERR_TALLOC_CHECK(r->out.ctr.ctr1);
 
 		r->out.ctr.ctr1->count = 0;
 		r->out.ctr.ctr1->array = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
-		}
+		return WERR_NOT_SUPPORTED;
+
 	default:
-		r->out.result = WERR_UNKNOWN_LEVEL;
-		break;
+		return WERR_UNKNOWN_LEVEL;
 	}
 
-	return NT_STATUS_OK;
+	return WERR_OK;
 }
 
 
 /* 
   srvsvc_NetFileEnum 
 */
-static NTSTATUS srvsvc_NetFileEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-		       struct srvsvc_NetFileEnum *r)
+static WERROR srvsvc_NetFileEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+				 struct srvsvc_NetFileEnum *r)
 {
 	r->out.level = r->in.level;
 	r->out.totalentries = 0;
 	r->out.resume_handle = NULL;
-	r->out.result = WERR_OK;
 
 	switch (r->in.level) {
-	case 2: {
+	case 2:
 		r->out.ctr.ctr2 = talloc_p(mem_ctx, struct srvsvc_NetFileCtr2);
 		WERR_TALLOC_CHECK(r->out.ctr.ctr2);
 
 		r->out.ctr.ctr2->count = 0;
 		r->out.ctr.ctr2->array = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
-		}
-	case 3: {
+		return WERR_NOT_SUPPORTED;
+
+	case 3:
 		r->out.ctr.ctr3 = talloc_p(mem_ctx, struct srvsvc_NetFileCtr3);
 		WERR_TALLOC_CHECK(r->out.ctr.ctr3);
 
 		r->out.ctr.ctr3->count = 0;
 		r->out.ctr.ctr3->array = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
-		}
+		return WERR_NOT_SUPPORTED;
+
 	default:
-		r->out.result = WERR_UNKNOWN_LEVEL;
-		break;
+		return WERR_UNKNOWN_LEVEL;
 	}
 
-	return NT_STATUS_OK;
+	return WERR_OK;
 }
 
 
 /* 
   srvsvc_NetFileGetInfo 
 */
-static NTSTATUS srvsvc_NetFileGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-		       struct srvsvc_NetFileGetInfo *r)
+static WERROR srvsvc_NetFileGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+				    struct srvsvc_NetFileGetInfo *r)
 {
-	r->out.result = WERR_OK;
-
 	switch (r->in.level) {
-	case 2: {
+	case 2:
 		r->out.info.info2 = NULL;
+		return WERR_NOT_SUPPORTED;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
-		}
-	case 3: {
+	case 3:
 		r->out.info.info3 = NULL;
+		return WERR_NOT_SUPPORTED;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
-		}
 	default:
-		r->out.result = WERR_UNKNOWN_LEVEL;
-		break;
+		return WERR_UNKNOWN_LEVEL;
 	}
 
-	return NT_STATUS_OK;
+	return WERR_OK;
 }
 
 
 /* 
   srvsvc_NetFileClose 
 */
-static NTSTATUS srvsvc_NetFileClose(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NetFileClose(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NetFileClose *r)
 {
-	r->out.result = WERR_NOT_SUPPORTED;
-	return NT_STATUS_OK;
+	return WERR_NOT_SUPPORTED;
+	return WERR_OK;
 }
 
 
 /* 
   srvsvc_NetSessEnum 
 */
-static NTSTATUS srvsvc_NetSessEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NetSessEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NetSessEnum *r)
 {
 	r->out.level = r->in.level;
 	r->out.totalentries = 0;
 	r->out.resume_handle = NULL;
-	r->out.result = WERR_OK;
 
 	switch (r->in.level) {
-	case 0: {
+	case 0:
 		r->out.ctr.ctr0 = talloc_p(mem_ctx, struct srvsvc_NetSessCtr0);
 		WERR_TALLOC_CHECK(r->out.ctr.ctr0);
 
 		r->out.ctr.ctr0->count = 0;
 		r->out.ctr.ctr0->array = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
-		}
-	case 1: {
+		return WERR_NOT_SUPPORTED;
+
+	case 1:
 		r->out.ctr.ctr1 = talloc_p(mem_ctx, struct srvsvc_NetSessCtr1);
 		WERR_TALLOC_CHECK(r->out.ctr.ctr1);
 
 		r->out.ctr.ctr1->count = 0;
 		r->out.ctr.ctr1->array = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
-		}
-	case 2: {
+		return WERR_NOT_SUPPORTED;
+
+	case 2:
 		r->out.ctr.ctr2 = talloc_p(mem_ctx, struct srvsvc_NetSessCtr2);
 		WERR_TALLOC_CHECK(r->out.ctr.ctr2);
 
 		r->out.ctr.ctr2->count = 0;
 		r->out.ctr.ctr2->array = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
-		}
-	case 10:{
+		return WERR_NOT_SUPPORTED;
+
+	case 10:
 		r->out.ctr.ctr10 = talloc_p(mem_ctx, struct srvsvc_NetSessCtr10);
 		WERR_TALLOC_CHECK(r->out.ctr.ctr10);
 
 		r->out.ctr.ctr2->count = 0;
 		r->out.ctr.ctr2->array = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
-		}
-	case 502:{
+		return WERR_NOT_SUPPORTED;
+
+	case 502:
 		r->out.ctr.ctr502 = talloc_p(mem_ctx, struct srvsvc_NetSessCtr502);
 		WERR_TALLOC_CHECK(r->out.ctr.ctr502);
 
 		r->out.ctr.ctr2->count = 0;
 		r->out.ctr.ctr2->array = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
-		}
+		return WERR_NOT_SUPPORTED;
+
 	default:
-		r->out.result = WERR_UNKNOWN_LEVEL;
-		break;
+		return WERR_UNKNOWN_LEVEL;
 	}
 
-	return NT_STATUS_OK;
+	return WERR_OK;
 }
 
 
 /* 
   srvsvc_NetSessDel 
 */
-static NTSTATUS srvsvc_NetSessDel(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NetSessDel(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NetSessDel *r)
 {
-	r->out.result = WERR_NOT_SUPPORTED;
-	return NT_STATUS_OK;
+	return WERR_NOT_SUPPORTED;
+	return WERR_OK;
 }
 
 
 /* 
   srvsvc_NetShareAdd 
 */
-static NTSTATUS srvsvc_NetShareAdd(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NetShareAdd(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NetShareAdd *r)
 {
-	r->out.result = WERR_OK;
-
 	switch (r->in.level) {
 	case 0:	
 		if (r->in.parm_error) {
 			r->out.parm_error = r->in.parm_error;
 		}
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
+		return WERR_NOT_SUPPORTED;
+
 	case 1:
 		if (r->in.parm_error) {
 			r->out.parm_error = r->in.parm_error;
 		}
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
+		return WERR_NOT_SUPPORTED;
+
 	case 2:
 		if (r->in.parm_error) {
 			r->out.parm_error = r->in.parm_error;
 		}
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
+		return WERR_NOT_SUPPORTED;
+
 	case 501:
 		if (r->in.parm_error) {
 			r->out.parm_error = r->in.parm_error;
 		}
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
+		return WERR_NOT_SUPPORTED;
+
 	case 502:
 		if (r->in.parm_error) {
 			r->out.parm_error = r->in.parm_error;
 		}
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
+		return WERR_NOT_SUPPORTED;
+
 	default:
-		r->out.result = WERR_UNKNOWN_LEVEL;
-		break;
+		return WERR_UNKNOWN_LEVEL;
 	}
 
-	return NT_STATUS_OK;
+	return WERR_OK;
 }
 
 
 /* 
   srvsvc_NetShareEnumAll
 */
-static NTSTATUS srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NetShareEnumAll *r)
 {
 	struct dcesrv_context *dce_ctx = dce_call->conn->dce_ctx;
 	r->out.level = r->in.level;
 	r->out.totalentries = 0;
 	r->out.resume_handle = NULL;
-	r->out.result = WERR_OK;
 
 	switch (r->in.level) {
 	case 0: {
@@ -615,133 +571,124 @@ static NTSTATUS srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, TALLO
 		break;
 		}
 	default:
-		r->out.result = WERR_UNKNOWN_LEVEL;
-		break;
+		return WERR_UNKNOWN_LEVEL;
 	}
 
-	return NT_STATUS_OK;
+	return WERR_OK;
 }
 
 
 /* 
   srvsvc_NetShareGetInfo 
 */
-static NTSTATUS srvsvc_NetShareGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NetShareGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NetShareGetInfo *r)
 {
-	r->out.result = WERR_OK;
-
 	switch (r->in.level) {
-	case 0: {
+	case 0:
 		r->out.info.info0 = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
-		}
-	case 1: {
+		return WERR_NOT_SUPPORTED;
+
+	case 1:
 		r->out.info.info0 = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
-		}
-	case 2: {
+		return WERR_NOT_SUPPORTED;
+
+	case 2:
 		r->out.info.info0 = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
-		}
-	case 501:{
+		return WERR_NOT_SUPPORTED;
+
+	case 501:
 		r->out.info.info0 = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
-		}
-	case 502:{
+		return WERR_NOT_SUPPORTED;
+
+	case 502:
 		r->out.info.info0 = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
-		break;
-		}
+		return WERR_NOT_SUPPORTED;
+
 	default:
-		r->out.result = WERR_UNKNOWN_LEVEL;
+		return WERR_UNKNOWN_LEVEL;
 		break;
 	}
 
-	return NT_STATUS_OK;
+	return WERR_OK;
 }
 
 
 /* 
   srvsvc_NetShareSetInfo 
 */
-static NTSTATUS srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NetShareSetInfo *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NetShareDel 
 */
-static NTSTATUS srvsvc_NetShareDel(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NetShareDel(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NetShareDel *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NetShareDelSticky 
 */
-static NTSTATUS srvsvc_NetShareDelSticky(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NetShareDelSticky(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NetShareDelSticky *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NetShareCheck 
 */
-static NTSTATUS srvsvc_NetShareCheck(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NetShareCheck(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NetShareCheck *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NetSrvGetInfo 
 */
-static NTSTATUS srvsvc_NetSrvGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NetSrvGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NetSrvGetInfo *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NetSrvSetInfo 
 */
-static NTSTATUS srvsvc_NetSrvSetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NetSrvSetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NetSrvSetInfo *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NetDiskEnum 
 */
-static NTSTATUS srvsvc_NetDiskEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NetDiskEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NetDiskEnum *r)
 {
 	r->out.count = 0;
 	r->out.ctr0 = NULL;
 	r->out.totalentries = 0;
 	r->out.resume_handle = NULL;
-	r->out.result = WERR_OK;
 
 	switch (r->in.level) {
 	case 0: {
@@ -752,48 +699,47 @@ static NTSTATUS srvsvc_NetDiskEnum(struct dcesrv_call_state *dce_call, TALLOC_CT
 		r->out.ctr0->count = 0;
 		r->out.ctr0->array = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
+		return WERR_NOT_SUPPORTED;
 		break;
 		}
 	default:
-		r->out.result = WERR_UNKNOWN_LEVEL;
+		return WERR_UNKNOWN_LEVEL;
 		break;
 	}
 
-	return NT_STATUS_OK;
+	return WERR_OK;
 }
 
 
 /* 
   srvsvc_NETRSERVERSTATISTICSGET 
 */
-static NTSTATUS srvsvc_NETRSERVERSTATISTICSGET(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-		       struct srvsvc_NETRSERVERSTATISTICSGET *r)
+static WERROR srvsvc_NETRSERVERSTATISTICSGET(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+					     struct srvsvc_NETRSERVERSTATISTICSGET *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NETRSERVERTRANSPORTADD 
 */
-static NTSTATUS srvsvc_NETRSERVERTRANSPORTADD(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NETRSERVERTRANSPORTADD(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NETRSERVERTRANSPORTADD *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NetTransportEnum 
 */
-static NTSTATUS srvsvc_NetTransportEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NetTransportEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NetTransportEnum *r)
 {
 	r->out.level = r->in.level;
 	r->out.totalentries = 0;
 	r->out.resume_handle = NULL;
-	r->out.result = WERR_OK;
 
 	switch (r->in.level) {
 	case 0: {
@@ -803,7 +749,7 @@ static NTSTATUS srvsvc_NetTransportEnum(struct dcesrv_call_state *dce_call, TALL
 		r->out.ctr.ctr0->count = 0;
 		r->out.ctr.ctr0->array = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
+		return WERR_NOT_SUPPORTED;
 		break;
 		}
 	case 1: {
@@ -813,7 +759,7 @@ static NTSTATUS srvsvc_NetTransportEnum(struct dcesrv_call_state *dce_call, TALL
 		r->out.ctr.ctr1->count = 0;
 		r->out.ctr.ctr1->array = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
+		return WERR_NOT_SUPPORTED;
 		break;
 		}
 	case 2: {
@@ -823,7 +769,7 @@ static NTSTATUS srvsvc_NetTransportEnum(struct dcesrv_call_state *dce_call, TALL
 		r->out.ctr.ctr2->count = 0;
 		r->out.ctr.ctr2->array = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
+		return WERR_NOT_SUPPORTED;
 		break;
 		}
 	case 3: {
@@ -833,119 +779,118 @@ static NTSTATUS srvsvc_NetTransportEnum(struct dcesrv_call_state *dce_call, TALL
 		r->out.ctr.ctr3->count = 0;
 		r->out.ctr.ctr3->array = NULL;
 
-		r->out.result = WERR_NOT_SUPPORTED;
+		return WERR_NOT_SUPPORTED;
 		break;
 		}
 	default:
-		r->out.result = WERR_UNKNOWN_LEVEL;
+		return WERR_UNKNOWN_LEVEL;
 		break;
 	}
 
-	return NT_STATUS_OK;
+	return WERR_OK;
 }
 
 
 /* 
   srvsvc_NETRSERVERTRANSPORTDEL 
 */
-static NTSTATUS srvsvc_NETRSERVERTRANSPORTDEL(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NETRSERVERTRANSPORTDEL(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NETRSERVERTRANSPORTDEL *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NET_REMOTE_TOD 
 */
-static NTSTATUS srvsvc_NET_REMOTE_TOD(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NET_REMOTE_TOD(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NET_REMOTE_TOD *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NETRSERVERSETSERVICEBITS 
 */
-static NTSTATUS srvsvc_NETRSERVERSETSERVICEBITS(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NETRSERVERSETSERVICEBITS(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NETRSERVERSETSERVICEBITS *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NETRPRPATHTYPE 
 */
-static NTSTATUS srvsvc_NETRPRPATHTYPE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NETRPRPATHTYPE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NETRPRPATHTYPE *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NETRPRPATHCANONICALIZE 
 */
-static NTSTATUS srvsvc_NETRPRPATHCANONICALIZE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NETRPRPATHCANONICALIZE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NETRPRPATHCANONICALIZE *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NETRPRPATHCOMPARE 
 */
-static NTSTATUS srvsvc_NETRPRPATHCOMPARE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NETRPRPATHCOMPARE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NETRPRPATHCOMPARE *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NET_NAME_VALIDATE 
 */
-static NTSTATUS srvsvc_NET_NAME_VALIDATE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NET_NAME_VALIDATE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NET_NAME_VALIDATE *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NETRPRNAMECANONICALIZE 
 */
-static NTSTATUS srvsvc_NETRPRNAMECANONICALIZE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NETRPRNAMECANONICALIZE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NETRPRNAMECANONICALIZE *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NETRPRNAMECOMPARE 
 */
-static NTSTATUS srvsvc_NETRPRNAMECOMPARE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NETRPRNAMECOMPARE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NETRPRNAMECOMPARE *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NetShareEnum 
 */
-static NTSTATUS srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NetShareEnum *r)
 {
 	struct dcesrv_context *dce_ctx = dce_call->conn->dce_ctx;
 	r->out.level = r->in.level;
 	r->out.totalentries = 0;
 	r->out.resume_handle = NULL;
-	r->out.result = WERR_OK;
 
 	switch (r->in.level) {
 	case 0: {
@@ -1077,181 +1022,181 @@ static NTSTATUS srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TALLOC_C
 		break;
 		}
 	default:
-		r->out.result = WERR_UNKNOWN_LEVEL;
+		return WERR_UNKNOWN_LEVEL;
 		break;
 	}
 
-	return NT_STATUS_OK;
+	return WERR_OK;
 }
 
 
 /* 
   srvsvc_NETRSHAREDELSTART 
 */
-static NTSTATUS srvsvc_NETRSHAREDELSTART(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NETRSHAREDELSTART(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NETRSHAREDELSTART *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NETRSHAREDELCOMMIT 
 */
-static NTSTATUS srvsvc_NETRSHAREDELCOMMIT(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NETRSHAREDELCOMMIT(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NETRSHAREDELCOMMIT *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NET_FILE_QUERY_SECDESC 
 */
-static NTSTATUS srvsvc_NET_FILE_QUERY_SECDESC(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NET_FILE_QUERY_SECDESC(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NET_FILE_QUERY_SECDESC *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NET_FILE_SET_SECDESC 
 */
-static NTSTATUS srvsvc_NET_FILE_SET_SECDESC(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NET_FILE_SET_SECDESC(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NET_FILE_SET_SECDESC *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NETRSERVERTRANSPORTADDEX 
 */
-static NTSTATUS srvsvc_NETRSERVERTRANSPORTADDEX(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NETRSERVERTRANSPORTADDEX(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NETRSERVERTRANSPORTADDEX *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NETRSERVERSETSERVICEBITSEX 
 */
-static NTSTATUS srvsvc_NETRSERVERSETSERVICEBITSEX(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NETRSERVERSETSERVICEBITSEX(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NETRSERVERSETSERVICEBITSEX *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NETRDFSGETVERSION 
 */
-static NTSTATUS srvsvc_NETRDFSGETVERSION(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NETRDFSGETVERSION(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NETRDFSGETVERSION *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NETRDFSCREATELOCALPARTITION 
 */
-static NTSTATUS srvsvc_NETRDFSCREATELOCALPARTITION(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NETRDFSCREATELOCALPARTITION(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NETRDFSCREATELOCALPARTITION *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NETRDFSDELETELOCALPARTITION 
 */
-static NTSTATUS srvsvc_NETRDFSDELETELOCALPARTITION(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NETRDFSDELETELOCALPARTITION(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NETRDFSDELETELOCALPARTITION *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NETRDFSSETLOCALVOLUMESTATE 
 */
-static NTSTATUS srvsvc_NETRDFSSETLOCALVOLUMESTATE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NETRDFSSETLOCALVOLUMESTATE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NETRDFSSETLOCALVOLUMESTATE *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NETRDFSSETSERVERINFO 
 */
-static NTSTATUS srvsvc_NETRDFSSETSERVERINFO(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NETRDFSSETSERVERINFO(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NETRDFSSETSERVERINFO *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NETRDFSCREATEEXITPOINT 
 */
-static NTSTATUS srvsvc_NETRDFSCREATEEXITPOINT(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NETRDFSCREATEEXITPOINT(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NETRDFSCREATEEXITPOINT *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NETRDFSDELETEEXITPOINT 
 */
-static NTSTATUS srvsvc_NETRDFSDELETEEXITPOINT(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NETRDFSDELETEEXITPOINT(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NETRDFSDELETEEXITPOINT *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NETRDFSMODIFYPREFIX 
 */
-static NTSTATUS srvsvc_NETRDFSMODIFYPREFIX(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NETRDFSMODIFYPREFIX(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NETRDFSMODIFYPREFIX *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NETRDFSFIXLOCALVOLUME 
 */
-static NTSTATUS srvsvc_NETRDFSFIXLOCALVOLUME(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NETRDFSFIXLOCALVOLUME(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NETRDFSFIXLOCALVOLUME *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NETRDFSMANAGERREPORTSITEINFO 
 */
-static NTSTATUS srvsvc_NETRDFSMANAGERREPORTSITEINFO(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NETRDFSMANAGERREPORTSITEINFO(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NETRDFSMANAGERREPORTSITEINFO *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }
 
 
 /* 
   srvsvc_NETRSERVERTRANSPORTDELEX 
 */
-static NTSTATUS srvsvc_NETRSERVERTRANSPORTDELEX(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static WERROR srvsvc_NETRSERVERTRANSPORTDELEX(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct srvsvc_NETRSERVERTRANSPORTDELEX *r)
 {
-	return NT_STATUS_NOT_IMPLEMENTED;
+	return WERR_NOT_SUPPORTED;
 }