r26285: Add IDL and torture test for netr_ServerPasswordGet().

Guenther

diff --git a/source/librpc/idl/netlogon.idl b/source/librpc/idl/netlogon.idl
index 9743f74b34538ab5e31ce0a14fb21893dee2f717..8e0950c2aa5dde0eb10bc0e3193f7d38b7f378f6 100644 (file)
--- a/source/librpc/idl/netlogon.idl
+++ b/source/librpc/idl/netlogon.idl
@@ -1112,7 +1112,15 @@ interface netlogon
 
        /****************/
        /* Function 0x1f */
-       WERROR netr_NETRSERVERPASSWORDGET();
+       WERROR netr_ServerPasswordGet(
+               [in]  [string,charset(UTF16)] uint16 *server_name,
+               [in]  [string,charset(UTF16)] uint16 account_name[],
+               [in]  netr_SchannelType secure_channel_type,
+               [in]  [string,charset(UTF16)] uint16 computer_name[],
+               [in,ref] netr_Authenticator *credential,
+               [out,ref] netr_Authenticator *return_authenticator,
+               [out,ref] samr_Password *password
+               );
 
        /****************/
        /* Function 0x20 */

diff --git a/source/rpc_server/netlogon/dcerpc_netlogon.c b/source/rpc_server/netlogon/dcerpc_netlogon.c
index 1c6a1d0588184881fb3004a8f16a7d7a65f68ccd..d2390a8de056f9e3d80bac6c948b258f694567f4 100644 (file)
--- a/source/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source/rpc_server/netlogon/dcerpc_netlogon.c
@@ -946,11 +946,11 @@ static NTSTATUS dcesrv_netr_LogonGetDomainInfo(struct dcesrv_call_state *dce_cal
 
 
 
-/* 
-  netr_NETRSERVERPASSWORDGET 
+/*
+  netr_ServerPasswordGet
 */
-static WERROR dcesrv_netr_NETRSERVERPASSWORDGET(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct netr_NETRSERVERPASSWORDGET *r)
+static WERROR 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/source/samba4-knownfail b/source/samba4-knownfail
index e9226f86a701c03ec0475a466393cf2a4002254a..11726383d14a283ddbe29059eb0fc0d651baef18 100644 (file)
--- a/source/samba4-knownfail
+++ b/source/samba4-knownfail
@@ -29,5 +29,6 @@ RPC-NETLOGON.*/NetrEnumerateTrustedDomainsEx
 RPC-NETLOGON.*/DsrGetDcSiteCoverageW
 RPC-NETLOGON.*/DsRAddressToSitenamesW
 RPC-NETLOGON.*/DsRAddressToSitenamesExW
+RPC-NETLOGON.*/GetPassword
 BASE-CHARSET.*/Testing partial surrogate
 .*NET-API-DELSHARE.*                           # DelShare isn't implemented yet

diff --git a/source/torture/rpc/netlogon.c b/source/torture/rpc/netlogon.c
index 92fd27b8ce7f8ae05a3090e95e9d80fc7ce2d719..c0b26e0d8730d88dfec95a0f382c38aa8ca35bb0 100644 (file)
--- a/source/torture/rpc/netlogon.c
+++ b/source/torture/rpc/netlogon.c
@@ -438,6 +438,36 @@ static bool test_SetPassword2(struct torture_context *tctx,
        return true;
 }
 
+static bool test_GetPassword(struct torture_context *tctx,
+                            struct dcerpc_pipe *p,
+                            struct cli_credentials *machine_credentials)
+{
+       struct netr_ServerPasswordGet r;
+       struct creds_CredentialState *creds;
+       struct netr_Authenticator credential;
+       NTSTATUS status;
+       struct netr_Authenticator return_authenticator;
+       struct samr_Password password;
+
+       if (!test_SetupCredentials(p, tctx, machine_credentials, &creds)) {
+               return false;
+       }
+
+       creds_client_authenticator(creds, &credential);
+
+       r.in.server_name = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
+       r.in.account_name = talloc_asprintf(tctx, "%s$", TEST_MACHINE_NAME);
+       r.in.secure_channel_type = SEC_CHAN_BDC;
+       r.in.computer_name = TEST_MACHINE_NAME;
+       r.in.credential = &credential;
+       r.out.return_authenticator = &return_authenticator;
+       r.out.password = &password;
+
+       status = dcerpc_netr_ServerPasswordGet(p, tctx, &r);
+       torture_assert_ntstatus_ok(tctx, status, "ServerPasswordGet");
+
+       return true;
+}
 /*
   try a netlogon SamLogon
 */