netlogon.idl: netr_ServerPasswordGet returns NTSTATUS not WERROR.

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>

diff --git a/librpc/idl/netlogon.idl b/librpc/idl/netlogon.idl
index 50b9c9ea8b9fe2b3a366fc14edd3c8652a6ffe1b..f588bc1c6d8f957ad6768f5c28464ffeef658e8b 100644 (file)
--- a/librpc/idl/netlogon.idl
+++ b/librpc/idl/netlogon.idl
@@ -1450,7 +1450,7 @@ interface netlogon
 
        /****************/
        /* Function 0x1f */
-       WERROR netr_ServerPasswordGet(
+       NTSTATUS netr_ServerPasswordGet(
                [in,unique] [string,charset(UTF16)] uint16 *server_name,
                [in]  [string,charset(UTF16)] uint16 *account_name,
                [in]  netr_SchannelType secure_channel_type,

diff --git a/source3/rpc_server/netlogon/srv_netlog_nt.c b/source3/rpc_server/netlogon/srv_netlog_nt.c
index b487c31e872c0f6c389618b7739a22134584e1e0..41cb487503a4626d7b36a18d30678e8b0e07e9d4 100644 (file)
--- a/source3/rpc_server/netlogon/srv_netlog_nt.c
+++ b/source3/rpc_server/netlogon/srv_netlog_nt.c
@@ -2191,11 +2191,11 @@ NTSTATUS _netr_LogonGetDomainInfo(struct pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-WERROR _netr_ServerPasswordGet(struct pipes_struct *p,
-                              struct netr_ServerPasswordGet *r)
+NTSTATUS _netr_ServerPasswordGet(struct pipes_struct *p,
+                                struct netr_ServerPasswordGet *r)
 {
        p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
-       return WERR_NOT_SUPPORTED;
+       return NT_STATUS_NOT_SUPPORTED;
 }
 
 /****************************************************************

diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index c60a262c036fb376d1b209873e24a96f8102e69f..50e53a0a97b7222979f453a3a4db9042f46f4169 100644 (file)
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -1801,7 +1801,7 @@ static NTSTATUS dcesrv_netr_LogonGetDomainInfo(struct dcesrv_call_state *dce_cal
 /*
   netr_ServerPasswordGet
 */
-static WERROR dcesrv_netr_ServerPasswordGet(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+static NTSTATUS dcesrv_netr_ServerPasswordGet(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct netr_ServerPasswordGet *r)
 {
        DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);

diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index eb9afd011c5dbf5c0b82fcec2aa43e2fd6e2e655..dac876ce7069294e0d82d7055545b4ad939466b7 100644 (file)
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -754,6 +754,7 @@ static bool test_GetPassword(struct torture_context *tctx,
 
        status = dcerpc_netr_ServerPasswordGet_r(b, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "ServerPasswordGet");
+       torture_assert_ntstatus_ok(tctx, r.out.result, "ServerPasswordGet");
 
        return true;
 }