NETLOGON pipe improvements
[ira/wip.git] / source4 / torture / rpc / netlogon.c
index 44d92eb1219acf56a195d78624564f4378ff1867..57bfcbfb7a9f83fc201cd255b43240d69cc787ff 100644 (file)
 #include "../lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "param/param.h"
+#include "libcli/security/security.h"
 
 #define TEST_MACHINE_NAME "torturetest"
 
@@ -73,15 +75,15 @@ static bool test_LogonUasLogoff(struct torture_context *tctx,
        return true;
 }
 
-static bool test_SetupCredentials(struct dcerpc_pipe *p, struct torture_context *tctx,
+bool test_SetupCredentials(struct dcerpc_pipe *p, struct torture_context *tctx,
                                  struct cli_credentials *credentials,
-                                 struct creds_CredentialState **creds_out)
+                                 struct netlogon_creds_CredentialState **creds_out)
 {
        NTSTATUS status;
        struct netr_ServerReqChallenge r;
        struct netr_ServerAuthenticate a;
        struct netr_Credential credentials1, credentials2, credentials3;
-       struct creds_CredentialState *creds;
+       struct netlogon_creds_CredentialState *creds;
        const struct samr_Password *mach_password;
        const char *machine_name;
 
@@ -90,13 +92,10 @@ static bool test_SetupCredentials(struct dcerpc_pipe *p, struct torture_context
 
        torture_comment(tctx, "Testing ServerReqChallenge\n");
 
-       creds = talloc(tctx, struct creds_CredentialState);
-       torture_assert(tctx, creds != NULL, "memory allocation");
-
        r.in.server_name = NULL;
        r.in.computer_name = machine_name;
        r.in.credentials = &credentials1;
-       r.out.credentials = &credentials2;
+       r.out.return_credentials = &credentials2;
 
        generate_random_buffer(credentials1.data, sizeof(credentials1.data));
 
@@ -110,9 +109,13 @@ static bool test_SetupCredentials(struct dcerpc_pipe *p, struct torture_context
        a.in.credentials = &credentials3;
        a.out.return_credentials = &credentials3;
 
-       creds_client_init(creds, &credentials1, &credentials2, 
-                         mach_password, &credentials3, 
-                         0);
+       creds = netlogon_creds_client_init(tctx, a.in.account_name,
+                                          a.in.computer_name,
+                                          &credentials1, &credentials2, 
+                                          mach_password, &credentials3, 
+                                          0);
+       torture_assert(tctx, creds != NULL, "memory allocation");
+
 
        torture_comment(tctx, "Testing ServerAuthenticate\n");
 
@@ -126,7 +129,7 @@ static bool test_SetupCredentials(struct dcerpc_pipe *p, struct torture_context
 
        torture_assert_ntstatus_ok(tctx, status, "ServerAuthenticate");
 
-       torture_assert(tctx, creds_client_check(creds, &credentials3), 
+       torture_assert(tctx, netlogon_creds_client_check(creds, &credentials3), 
                       "Credential chaining failed");
 
        *creds_out = creds;
@@ -137,29 +140,26 @@ bool test_SetupCredentials2(struct dcerpc_pipe *p, struct torture_context *tctx,
                            uint32_t negotiate_flags,
                            struct cli_credentials *machine_credentials,
                            int sec_chan_type,
-                           struct creds_CredentialState **creds_out)
+                           struct netlogon_creds_CredentialState **creds_out)
 {
        NTSTATUS status;
        struct netr_ServerReqChallenge r;
        struct netr_ServerAuthenticate2 a;
        struct netr_Credential credentials1, credentials2, credentials3;
-       struct creds_CredentialState *creds;
+       struct netlogon_creds_CredentialState *creds;
        const struct samr_Password *mach_password;
        const char *machine_name;
-       const char *plain_pass;
 
        mach_password = cli_credentials_get_nt_hash(machine_credentials, tctx);
        machine_name = cli_credentials_get_workstation(machine_credentials);
 
        torture_comment(tctx, "Testing ServerReqChallenge\n");
 
-       creds = talloc(tctx, struct creds_CredentialState);
-       torture_assert(tctx, creds != NULL, "memory allocation");
 
        r.in.server_name = NULL;
        r.in.computer_name = machine_name;
        r.in.credentials = &credentials1;
-       r.out.credentials = &credentials2;
+       r.out.return_credentials = &credentials2;
 
        generate_random_buffer(credentials1.data, sizeof(credentials1.data));
 
@@ -175,16 +175,20 @@ bool test_SetupCredentials2(struct dcerpc_pipe *p, struct torture_context *tctx,
        a.in.credentials = &credentials3;
        a.out.return_credentials = &credentials3;
 
-       creds_client_init(creds, &credentials1, &credentials2, 
-                         mach_password, &credentials3, 
-                         negotiate_flags);
+       creds = netlogon_creds_client_init(tctx, a.in.account_name,
+                                          a.in.computer_name, 
+                                          &credentials1, &credentials2, 
+                                          mach_password, &credentials3, 
+                                          negotiate_flags);
+
+       torture_assert(tctx, creds != NULL, "memory allocation");
 
        torture_comment(tctx, "Testing ServerAuthenticate2\n");
 
        status = dcerpc_netr_ServerAuthenticate2(p, tctx, &a);
        torture_assert_ntstatus_ok(tctx, status, "ServerAuthenticate2");
 
-       torture_assert(tctx, creds_client_check(creds, &credentials3), 
+       torture_assert(tctx, netlogon_creds_client_check(creds, &credentials3), 
                "Credential chaining failed");
 
        torture_comment(tctx, "negotiate_flags=0x%08x\n", negotiate_flags);
@@ -197,13 +201,13 @@ bool test_SetupCredentials2(struct dcerpc_pipe *p, struct torture_context *tctx,
 static bool test_SetupCredentials3(struct dcerpc_pipe *p, struct torture_context *tctx,
                            uint32_t negotiate_flags,
                            struct cli_credentials *machine_credentials,
-                           struct creds_CredentialState **creds_out)
+                           struct netlogon_creds_CredentialState **creds_out)
 {
        NTSTATUS status;
        struct netr_ServerReqChallenge r;
        struct netr_ServerAuthenticate3 a;
        struct netr_Credential credentials1, credentials2, credentials3;
-       struct creds_CredentialState *creds;
+       struct netlogon_creds_CredentialState *creds;
        struct samr_Password mach_password;
        uint32_t rid;
        const char *machine_name;
@@ -214,13 +218,10 @@ static bool test_SetupCredentials3(struct dcerpc_pipe *p, struct torture_context
 
        torture_comment(tctx, "Testing ServerReqChallenge\n");
 
-       creds = talloc(tctx, struct creds_CredentialState);
-       torture_assert(tctx, creds != NULL, "memory allocation");
-
        r.in.server_name = NULL;
        r.in.computer_name = machine_name;
        r.in.credentials = &credentials1;
-       r.out.credentials = &credentials2;
+       r.out.return_credentials = &credentials2;
 
        generate_random_buffer(credentials1.data, sizeof(credentials1.data));
 
@@ -239,15 +240,19 @@ static bool test_SetupCredentials3(struct dcerpc_pipe *p, struct torture_context
        a.out.negotiate_flags = &negotiate_flags;
        a.out.rid = &rid;
 
-       creds_client_init(creds, &credentials1, &credentials2, 
-                         &mach_password, &credentials3,
-                         negotiate_flags);
+       creds = netlogon_creds_client_init(tctx, a.in.account_name,
+                                          a.in.computer_name,
+                                          &credentials1, &credentials2, 
+                                          &mach_password, &credentials3,
+                                          negotiate_flags);
+       
+       torture_assert(tctx, creds != NULL, "memory allocation");
 
        torture_comment(tctx, "Testing ServerAuthenticate3\n");
 
        status = dcerpc_netr_ServerAuthenticate3(p, tctx, &a);
        torture_assert_ntstatus_ok(tctx, status, "ServerAuthenticate3");
-       torture_assert(tctx, creds_client_check(creds, &credentials3), "Credential chaining failed");
+       torture_assert(tctx, netlogon_creds_client_check(creds, &credentials3), "Credential chaining failed");
 
        torture_comment(tctx, "negotiate_flags=0x%08x\n", negotiate_flags);
        
@@ -269,7 +274,9 @@ static bool test_SetPassword(struct torture_context *tctx,
        NTSTATUS status;
        struct netr_ServerPasswordSet r;
        const char *password;
-       struct creds_CredentialState *creds;
+       struct netlogon_creds_CredentialState *creds;
+       struct netr_Authenticator credential, return_authenticator;
+       struct samr_Password new_password;
 
        if (!test_SetupCredentials(p, tctx, machine_credentials, &creds)) {
                return false;
@@ -279,22 +286,25 @@ static bool test_SetPassword(struct torture_context *tctx,
        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.in.new_password = &new_password;
+       r.out.return_authenticator = &return_authenticator;
 
        password = generate_random_str(tctx, 8);
-       E_md4hash(password, r.in.new_password.hash);
+       E_md4hash(password, new_password.hash);
 
-       creds_des_encrypt(creds, &r.in.new_password);
+       netlogon_creds_des_encrypt(creds, &new_password);
 
        torture_comment(tctx, "Testing ServerPasswordSet on machine account\n");
        torture_comment(tctx, "Changing machine account password to '%s'\n", 
                        password);
 
-       creds_client_authenticator(creds, &r.in.credential);
+       netlogon_creds_client_authenticator(creds, &credential);
 
        status = dcerpc_netr_ServerPasswordSet(p, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "ServerPasswordSet");
 
-       if (!creds_client_check(creds, &r.out.return_authenticator.cred)) {
+       if (!netlogon_creds_client_check(creds, &r.out.return_authenticator->cred)) {
                torture_comment(tctx, "Credential chaining failed\n");
        }
 
@@ -307,12 +317,12 @@ static bool test_SetPassword(struct torture_context *tctx,
        torture_comment(tctx, 
                "Changing machine account password to '%s' (same as previous run)\n", password);
 
-       creds_client_authenticator(creds, &r.in.credential);
+       netlogon_creds_client_authenticator(creds, &credential);
 
        status = dcerpc_netr_ServerPasswordSet(p, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "ServerPasswordSet (2)");
 
-       if (!creds_client_check(creds, &r.out.return_authenticator.cred)) {
+       if (!netlogon_creds_client_check(creds, &r.out.return_authenticator->cred)) {
                torture_comment(tctx, "Credential chaining failed\n");
        }
 
@@ -354,9 +364,11 @@ static bool test_SetPassword2(struct torture_context *tctx,
        struct netr_ServerPasswordSet2 r;
        const char *password;
        DATA_BLOB new_random_pass;
-       struct creds_CredentialState *creds;
+       struct netlogon_creds_CredentialState *creds;
        struct samr_CryptPassword password_buf;
        struct samr_Password nt_hash;
+       struct netr_Authenticator credential, return_authenticator;
+       struct netr_CryptPassword new_password;
 
        if (!test_SetupCredentials(p, tctx, machine_credentials, &creds)) {
                return false;
@@ -366,23 +378,26 @@ static bool test_SetPassword2(struct torture_context *tctx,
        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.in.new_password = &new_password;
+       r.out.return_authenticator = &return_authenticator;
 
        password = generate_random_str(tctx, 8);
        encode_pw_buffer(password_buf.data, password, STR_UNICODE);
-       creds_arcfour_crypt(creds, password_buf.data, 516);
+       netlogon_creds_arcfour_crypt(creds, password_buf.data, 516);
 
-       memcpy(r.in.new_password.data, password_buf.data, 512);
-       r.in.new_password.length = IVAL(password_buf.data, 512);
+       memcpy(new_password.data, password_buf.data, 512);
+       new_password.length = IVAL(password_buf.data, 512);
 
        torture_comment(tctx, "Testing ServerPasswordSet2 on machine account\n");
        torture_comment(tctx, "Changing machine account password to '%s'\n", password);
 
-       creds_client_authenticator(creds, &r.in.credential);
+       netlogon_creds_client_authenticator(creds, &credential);
 
        status = dcerpc_netr_ServerPasswordSet2(p, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "ServerPasswordSet2");
 
-       if (!creds_client_check(creds, &r.out.return_authenticator.cred)) {
+       if (!netlogon_creds_client_check(creds, &r.out.return_authenticator->cred)) {
                torture_comment(tctx, "Credential chaining failed\n");
        }
 
@@ -399,22 +414,22 @@ static bool test_SetPassword2(struct torture_context *tctx,
                 */
                password = "";
                encode_pw_buffer(password_buf.data, password, STR_UNICODE);
-               creds_arcfour_crypt(creds, password_buf.data, 516);
+               netlogon_creds_arcfour_crypt(creds, password_buf.data, 516);
                
-               memcpy(r.in.new_password.data, password_buf.data, 512);
-               r.in.new_password.length = IVAL(password_buf.data, 512);
+               memcpy(new_password.data, password_buf.data, 512);
+               new_password.length = IVAL(password_buf.data, 512);
                
                torture_comment(tctx, 
                        "Testing ServerPasswordSet2 on machine account\n");
                torture_comment(tctx, 
                        "Changing machine account password to '%s'\n", password);
                
-               creds_client_authenticator(creds, &r.in.credential);
+               netlogon_creds_client_authenticator(creds, &credential);
                
                status = dcerpc_netr_ServerPasswordSet2(p, tctx, &r);
                torture_assert_ntstatus_ok(tctx, status, "ServerPasswordSet2");
                
-               if (!creds_client_check(creds, &r.out.return_authenticator.cred)) {
+               if (!netlogon_creds_client_check(creds, &r.out.return_authenticator->cred)) {
                        torture_comment(tctx, "Credential chaining failed\n");
                }
                
@@ -427,20 +442,20 @@ static bool test_SetPassword2(struct torture_context *tctx,
        /* now try a random password */
        password = generate_random_str(tctx, 8);
        encode_pw_buffer(password_buf.data, password, STR_UNICODE);
-       creds_arcfour_crypt(creds, password_buf.data, 516);
+       netlogon_creds_arcfour_crypt(creds, password_buf.data, 516);
 
-       memcpy(r.in.new_password.data, password_buf.data, 512);
-       r.in.new_password.length = IVAL(password_buf.data, 512);
+       memcpy(new_password.data, password_buf.data, 512);
+       new_password.length = IVAL(password_buf.data, 512);
 
        torture_comment(tctx, "Testing second ServerPasswordSet2 on machine account\n");
        torture_comment(tctx, "Changing machine account password to '%s'\n", password);
 
-       creds_client_authenticator(creds, &r.in.credential);
+       netlogon_creds_client_authenticator(creds, &credential);
 
        status = dcerpc_netr_ServerPasswordSet2(p, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "ServerPasswordSet2 (2)");
 
-       if (!creds_client_check(creds, &r.out.return_authenticator.cred)) {
+       if (!netlogon_creds_client_check(creds, &r.out.return_authenticator->cred)) {
                torture_comment(tctx, "Credential chaining failed\n");
        }
 
@@ -453,12 +468,12 @@ static bool test_SetPassword2(struct torture_context *tctx,
        torture_comment(tctx, 
                "Changing machine account password to '%s' (same as previous run)\n", password);
 
-       creds_client_authenticator(creds, &r.in.credential);
+       netlogon_creds_client_authenticator(creds, &credential);
 
        status = dcerpc_netr_ServerPasswordSet2(p, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "ServerPasswordSet (3)");
 
-       if (!creds_client_check(creds, &r.out.return_authenticator.cred)) {
+       if (!netlogon_creds_client_check(creds, &r.out.return_authenticator->cred)) {
                torture_comment(tctx, "Credential chaining failed\n");
        }
 
@@ -473,20 +488,20 @@ static bool test_SetPassword2(struct torture_context *tctx,
        /* now try a random stream of bytes for a password */
        set_pw_in_buffer(password_buf.data, &new_random_pass);
 
-       creds_arcfour_crypt(creds, password_buf.data, 516);
+       netlogon_creds_arcfour_crypt(creds, password_buf.data, 516);
 
-       memcpy(r.in.new_password.data, password_buf.data, 512);
-       r.in.new_password.length = IVAL(password_buf.data, 512);
+       memcpy(new_password.data, password_buf.data, 512);
+       new_password.length = IVAL(password_buf.data, 512);
 
        torture_comment(tctx, 
                "Testing a third ServerPasswordSet2 on machine account, with a compleatly random password\n");
 
-       creds_client_authenticator(creds, &r.in.credential);
+       netlogon_creds_client_authenticator(creds, &credential);
 
        status = dcerpc_netr_ServerPasswordSet2(p, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "ServerPasswordSet (3)");
 
-       if (!creds_client_check(creds, &r.out.return_authenticator.cred)) {
+       if (!netlogon_creds_client_check(creds, &r.out.return_authenticator->cred)) {
                torture_comment(tctx, "Credential chaining failed\n");
        }
 
@@ -507,7 +522,7 @@ static bool test_GetPassword(struct torture_context *tctx,
                             struct cli_credentials *machine_credentials)
 {
        struct netr_ServerPasswordGet r;
-       struct creds_CredentialState *creds;
+       struct netlogon_creds_CredentialState *creds;
        struct netr_Authenticator credential;
        NTSTATUS status;
        struct netr_Authenticator return_authenticator;
@@ -517,7 +532,7 @@ static bool test_GetPassword(struct torture_context *tctx,
                return false;
        }
 
-       creds_client_authenticator(creds, &credential);
+       netlogon_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);
@@ -538,7 +553,7 @@ static bool test_GetTrustPasswords(struct torture_context *tctx,
                                   struct cli_credentials *machine_credentials)
 {
        struct netr_ServerTrustPasswordsGet r;
-       struct creds_CredentialState *creds;
+       struct netlogon_creds_CredentialState *creds;
        struct netr_Authenticator credential;
        NTSTATUS status;
        struct netr_Authenticator return_authenticator;
@@ -548,7 +563,7 @@ static bool test_GetTrustPasswords(struct torture_context *tctx,
                return false;
        }
 
-       creds_client_authenticator(creds, &credential);
+       netlogon_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);
@@ -570,7 +585,7 @@ static bool test_GetTrustPasswords(struct torture_context *tctx,
 */
 bool test_netlogon_ops(struct dcerpc_pipe *p, struct torture_context *tctx,
                              struct cli_credentials *credentials, 
-                             struct creds_CredentialState *creds)
+                             struct netlogon_creds_CredentialState *creds)
 {
        NTSTATUS status;
        struct netr_LogonSamLogon r;
@@ -636,14 +651,15 @@ bool test_netlogon_ops(struct dcerpc_pipe *p, struct torture_context *tctx,
        
        for (i=2;i<3;i++) {
                ZERO_STRUCT(auth2);
-               creds_client_authenticator(creds, &auth);
+               netlogon_creds_client_authenticator(creds, &auth);
                
                r.in.validation_level = i;
                
                status = dcerpc_netr_LogonSamLogon(p, tctx, &r);
                torture_assert_ntstatus_ok(tctx, status, "LogonSamLogon failed");
                
-               torture_assert(tctx, creds_client_check(creds, &r.out.return_authenticator->cred), 
+               torture_assert(tctx, netlogon_creds_client_check(creds, 
+                                                                &r.out.return_authenticator->cred), 
                        "Credential chaining failed");
        }
 
@@ -671,7 +687,7 @@ static bool test_SamLogon(struct torture_context *tctx,
                          struct dcerpc_pipe *p,
                          struct cli_credentials *credentials)
 {
-       struct creds_CredentialState *creds;
+       struct netlogon_creds_CredentialState *creds;
 
        if (!test_SetupCredentials(p, tctx, credentials, &creds)) {
                return false;
@@ -692,7 +708,7 @@ static bool test_DatabaseSync(struct torture_context *tctx,
 {
        NTSTATUS status;
        struct netr_DatabaseSync r;
-       struct creds_CredentialState *creds;
+       struct netlogon_creds_CredentialState *creds;
        const uint32_t database_ids[] = {SAM_DATABASE_DOMAIN, SAM_DATABASE_BUILTIN, SAM_DATABASE_PRIVS}; 
        int i;
        struct netr_DELTA_ENUM_ARRAY *delta_enum_array = NULL;
@@ -722,7 +738,7 @@ static bool test_DatabaseSync(struct torture_context *tctx,
                torture_comment(tctx, "Testing DatabaseSync of id %d\n", r.in.database_id);
 
                do {
-                       creds_client_authenticator(creds, &credential);
+                       netlogon_creds_client_authenticator(creds, &credential);
 
                        r.in.credential = &credential;
 
@@ -736,7 +752,7 @@ static bool test_DatabaseSync(struct torture_context *tctx,
                        }
                        torture_assert_ntstatus_ok(tctx, status, "DatabaseSync");
 
-                       if (!creds_client_check(creds, &r.out.return_authenticator->cred)) {
+                       if (!netlogon_creds_client_check(creds, &r.out.return_authenticator->cred)) {
                                torture_comment(tctx, "Credential chaining failed\n");
                        }
 
@@ -766,7 +782,7 @@ static bool test_DatabaseDeltas(struct torture_context *tctx,
 {
        NTSTATUS status;
        struct netr_DatabaseDeltas r;
-       struct creds_CredentialState *creds;
+       struct netlogon_creds_CredentialState *creds;
        struct netr_Authenticator credential;
        struct netr_Authenticator return_authenticator;
        struct netr_DELTA_ENUM_ARRAY *delta_enum_array = NULL;
@@ -796,7 +812,7 @@ static bool test_DatabaseDeltas(struct torture_context *tctx,
                       r.in.database_id, (unsigned long long)*r.in.sequence_num);
 
                do {
-                       creds_client_authenticator(creds, &credential);
+                       netlogon_creds_client_authenticator(creds, &credential);
 
                        status = dcerpc_netr_DatabaseDeltas(p, tctx, &r);
                        if (NT_STATUS_EQUAL(status, 
@@ -810,7 +826,7 @@ static bool test_DatabaseDeltas(struct torture_context *tctx,
 
                        torture_assert_ntstatus_ok(tctx, status, "DatabaseDeltas");
 
-                       if (!creds_client_check(creds, &return_authenticator.cred)) {
+                       if (!netlogon_creds_client_check(creds, &return_authenticator.cred)) {
                                torture_comment(tctx, "Credential chaining failed\n");
                        }
 
@@ -821,6 +837,538 @@ static bool test_DatabaseDeltas(struct torture_context *tctx,
        return true;
 }
 
+static bool test_DatabaseRedo(struct torture_context *tctx,
+                             struct dcerpc_pipe *p,
+                             struct cli_credentials *machine_credentials)
+{
+       NTSTATUS status;
+       struct netr_DatabaseRedo r;
+       struct netlogon_creds_CredentialState *creds;
+       struct netr_Authenticator credential;
+       struct netr_Authenticator return_authenticator;
+       struct netr_DELTA_ENUM_ARRAY *delta_enum_array = NULL;
+       struct netr_ChangeLogEntry e;
+       struct dom_sid null_sid, *sid;
+       int i,d;
+
+       ZERO_STRUCT(null_sid);
+
+       sid = dom_sid_parse_talloc(tctx, "S-1-5-21-1111111111-2222222222-333333333-500");
+
+       {
+
+       struct {
+               uint32_t rid;
+               uint16_t flags;
+               uint8_t db_index;
+               uint8_t delta_type;
+               struct dom_sid sid;
+               const char *name;
+               NTSTATUS expected_error;
+               uint32_t expected_num_results;
+               uint8_t expected_delta_type_1;
+               uint8_t expected_delta_type_2;
+               const char *comment;
+       } changes[] = {
+
+               /* SAM_DATABASE_DOMAIN */
+
+               {
+                       .rid                    = 0,
+                       .flags                  = 0,
+                       .db_index               = SAM_DATABASE_DOMAIN,
+                       .delta_type             = NETR_DELTA_MODIFY_COUNT,
+                       .sid                    = null_sid,
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_SYNCHRONIZATION_REQUIRED,
+                       .expected_num_results   = 0,
+                       .comment                = "NETR_DELTA_MODIFY_COUNT"
+               },
+               {
+                       .rid                    = 0,
+                       .flags                  = 0,
+                       .db_index               = SAM_DATABASE_DOMAIN,
+                       .delta_type             = 0,
+                       .sid                    = null_sid,
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 1,
+                       .expected_delta_type_1  = NETR_DELTA_DOMAIN,
+                       .comment                = "NULL DELTA"
+               },
+               {
+                       .rid                    = 0,
+                       .flags                  = 0,
+                       .db_index               = SAM_DATABASE_DOMAIN,
+                       .delta_type             = NETR_DELTA_DOMAIN,
+                       .sid                    = null_sid,
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 1,
+                       .expected_delta_type_1  = NETR_DELTA_DOMAIN,
+                       .comment                = "NETR_DELTA_DOMAIN"
+               },
+               {
+                       .rid                    = DOMAIN_RID_ADMINISTRATOR,
+                       .flags                  = 0,
+                       .db_index               = SAM_DATABASE_DOMAIN,
+                       .delta_type             = NETR_DELTA_USER,
+                       .sid                    = null_sid,
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 1,
+                       .expected_delta_type_1  = NETR_DELTA_USER,
+                       .comment                = "NETR_DELTA_USER by rid 500"
+               },
+               {
+                       .rid                    = DOMAIN_RID_GUEST,
+                       .flags                  = 0,
+                       .db_index               = SAM_DATABASE_DOMAIN,
+                       .delta_type             = NETR_DELTA_USER,
+                       .sid                    = null_sid,
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 1,
+                       .expected_delta_type_1  = NETR_DELTA_USER,
+                       .comment                = "NETR_DELTA_USER by rid 501"
+               },
+               {
+                       .rid                    = 0,
+                       .flags                  = NETR_CHANGELOG_SID_INCLUDED,
+                       .db_index               = SAM_DATABASE_DOMAIN,
+                       .delta_type             = NETR_DELTA_USER,
+                       .sid                    = *sid,
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 1,
+                       .expected_delta_type_1  = NETR_DELTA_DELETE_USER,
+                       .comment                = "NETR_DELTA_USER by sid and flags"
+               },
+               {
+                       .rid                    = 0,
+                       .flags                  = NETR_CHANGELOG_SID_INCLUDED,
+                       .db_index               = SAM_DATABASE_DOMAIN,
+                       .delta_type             = NETR_DELTA_USER,
+                       .sid                    = null_sid,
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 1,
+                       .expected_delta_type_1  = NETR_DELTA_DELETE_USER,
+                       .comment                = "NETR_DELTA_USER by null_sid and flags"
+               },
+               {
+                       .rid                    = 0,
+                       .flags                  = NETR_CHANGELOG_NAME_INCLUDED,
+                       .db_index               = SAM_DATABASE_DOMAIN,
+                       .delta_type             = NETR_DELTA_USER,
+                       .sid                    = null_sid,
+                       .name                   = "administrator",
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 1,
+                       .expected_delta_type_1  = NETR_DELTA_DELETE_USER,
+                       .comment                = "NETR_DELTA_USER by name 'administrator'"
+               },
+               {
+                       .rid                    = DOMAIN_RID_ADMINS,
+                       .flags                  = 0,
+                       .db_index               = SAM_DATABASE_DOMAIN,
+                       .delta_type             = NETR_DELTA_GROUP,
+                       .sid                    = null_sid,
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 2,
+                       .expected_delta_type_1  = NETR_DELTA_GROUP,
+                       .expected_delta_type_2  = NETR_DELTA_GROUP_MEMBER,
+                       .comment                = "NETR_DELTA_GROUP by rid 512"
+               },
+               {
+                       .rid                    = DOMAIN_RID_ADMINS,
+                       .flags                  = 0,
+                       .db_index               = SAM_DATABASE_DOMAIN,
+                       .delta_type             = NETR_DELTA_GROUP_MEMBER,
+                       .sid                    = null_sid,
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 2,
+                       .expected_delta_type_1  = NETR_DELTA_GROUP,
+                       .expected_delta_type_2  = NETR_DELTA_GROUP_MEMBER,
+                       .comment                = "NETR_DELTA_GROUP_MEMBER by rid 512"
+               },
+
+
+               /* SAM_DATABASE_BUILTIN */
+
+               {
+                       .rid                    = 0,
+                       .flags                  = 0,
+                       .db_index               = SAM_DATABASE_BUILTIN,
+                       .delta_type             = NETR_DELTA_MODIFY_COUNT,
+                       .sid                    = null_sid,
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_SYNCHRONIZATION_REQUIRED,
+                       .expected_num_results   = 0,
+                       .comment                = "NETR_DELTA_MODIFY_COUNT"
+               },
+               {
+                       .rid                    = 0,
+                       .flags                  = 0,
+                       .db_index               = SAM_DATABASE_BUILTIN,
+                       .delta_type             = NETR_DELTA_DOMAIN,
+                       .sid                    = null_sid,
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 1,
+                       .expected_delta_type_1  = NETR_DELTA_DOMAIN,
+                       .comment                = "NETR_DELTA_DOMAIN"
+               },
+               {
+                       .rid                    = DOMAIN_RID_ADMINISTRATOR,
+                       .flags                  = 0,
+                       .db_index               = SAM_DATABASE_BUILTIN,
+                       .delta_type             = NETR_DELTA_USER,
+                       .sid                    = null_sid,
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 1,
+                       .expected_delta_type_1  = NETR_DELTA_DELETE_USER,
+                       .comment                = "NETR_DELTA_USER by rid 500"
+               },
+               {
+                       .rid                    = 0,
+                       .flags                  = 0,
+                       .db_index               = SAM_DATABASE_BUILTIN,
+                       .delta_type             = NETR_DELTA_USER,
+                       .sid                    = null_sid,
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 1,
+                       .expected_delta_type_1  = NETR_DELTA_DELETE_USER,
+                       .comment                = "NETR_DELTA_USER"
+               },
+               {
+                       .rid                    = 544,
+                       .flags                  = 0,
+                       .db_index               = SAM_DATABASE_BUILTIN,
+                       .delta_type             = NETR_DELTA_ALIAS,
+                       .sid                    = null_sid,
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 2,
+                       .expected_delta_type_1  = NETR_DELTA_ALIAS,
+                       .expected_delta_type_2  = NETR_DELTA_ALIAS_MEMBER,
+                       .comment                = "NETR_DELTA_ALIAS by rid 544"
+               },
+               {
+                       .rid                    = 544,
+                       .flags                  = 0,
+                       .db_index               = SAM_DATABASE_BUILTIN,
+                       .delta_type             = NETR_DELTA_ALIAS_MEMBER,
+                       .sid                    = null_sid,
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 2,
+                       .expected_delta_type_1  = NETR_DELTA_ALIAS,
+                       .expected_delta_type_2  = NETR_DELTA_ALIAS_MEMBER,
+                       .comment                = "NETR_DELTA_ALIAS_MEMBER by rid 544"
+               },
+               {
+                       .rid                    = 544,
+                       .flags                  = 0,
+                       .db_index               = SAM_DATABASE_BUILTIN,
+                       .delta_type             = 0,
+                       .sid                    = null_sid,
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 1,
+                       .expected_delta_type_1  = NETR_DELTA_DOMAIN,
+                       .comment                = "NULL DELTA by rid 544"
+               },
+               {
+                       .rid                    = 544,
+                       .flags                  = NETR_CHANGELOG_SID_INCLUDED,
+                       .db_index               = SAM_DATABASE_BUILTIN,
+                       .delta_type             = 0,
+                       .sid                    = *dom_sid_parse_talloc(tctx, "S-1-5-32-544"),
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 1,
+                       .expected_delta_type_1  = NETR_DELTA_DOMAIN,
+                       .comment                = "NULL DELTA by rid 544 sid S-1-5-32-544 and flags"
+               },
+               {
+                       .rid                    = 544,
+                       .flags                  = NETR_CHANGELOG_SID_INCLUDED,
+                       .db_index               = SAM_DATABASE_BUILTIN,
+                       .delta_type             = NETR_DELTA_ALIAS,
+                       .sid                    = *dom_sid_parse_talloc(tctx, "S-1-5-32-544"),
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 2,
+                       .expected_delta_type_1  = NETR_DELTA_ALIAS,
+                       .expected_delta_type_2  = NETR_DELTA_ALIAS_MEMBER,
+                       .comment                = "NETR_DELTA_ALIAS by rid 544 and sid S-1-5-32-544 and flags"
+               },
+               {
+                       .rid                    = 0,
+                       .flags                  = NETR_CHANGELOG_SID_INCLUDED,
+                       .db_index               = SAM_DATABASE_BUILTIN,
+                       .delta_type             = NETR_DELTA_ALIAS,
+                       .sid                    = *dom_sid_parse_talloc(tctx, "S-1-5-32-544"),
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 1,
+                       .expected_delta_type_1  = NETR_DELTA_DELETE_ALIAS,
+                       .comment                = "NETR_DELTA_ALIAS by sid S-1-5-32-544 and flags"
+               },
+
+               /* SAM_DATABASE_PRIVS */
+
+               {
+                       .rid                    = 0,
+                       .flags                  = 0,
+                       .db_index               = SAM_DATABASE_PRIVS,
+                       .delta_type             = 0,
+                       .sid                    = null_sid,
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_ACCESS_DENIED,
+                       .expected_num_results   = 0,
+                       .comment                = "NULL DELTA"
+               },
+               {
+                       .rid                    = 0,
+                       .flags                  = 0,
+                       .db_index               = SAM_DATABASE_PRIVS,
+                       .delta_type             = NETR_DELTA_MODIFY_COUNT,
+                       .sid                    = null_sid,
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_SYNCHRONIZATION_REQUIRED,
+                       .expected_num_results   = 0,
+                       .comment                = "NETR_DELTA_MODIFY_COUNT"
+               },
+               {
+                       .rid                    = 0,
+                       .flags                  = 0,
+                       .db_index               = SAM_DATABASE_PRIVS,
+                       .delta_type             = NETR_DELTA_POLICY,
+                       .sid                    = null_sid,
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 1,
+                       .expected_delta_type_1  = NETR_DELTA_POLICY,
+                       .comment                = "NETR_DELTA_POLICY"
+               },
+               {
+                       .rid                    = 0,
+                       .flags                  = NETR_CHANGELOG_SID_INCLUDED,
+                       .db_index               = SAM_DATABASE_PRIVS,
+                       .delta_type             = NETR_DELTA_POLICY,
+                       .sid                    = null_sid,
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 1,
+                       .expected_delta_type_1  = NETR_DELTA_POLICY,
+                       .comment                = "NETR_DELTA_POLICY by null sid and flags"
+               },
+               {
+                       .rid                    = 0,
+                       .flags                  = NETR_CHANGELOG_SID_INCLUDED,
+                       .db_index               = SAM_DATABASE_PRIVS,
+                       .delta_type             = NETR_DELTA_POLICY,
+                       .sid                    = *dom_sid_parse_talloc(tctx, "S-1-5-32"),
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 1,
+                       .expected_delta_type_1  = NETR_DELTA_POLICY,
+                       .comment                = "NETR_DELTA_POLICY by sid S-1-5-32 and flags"
+               },
+               {
+                       .rid                    = DOMAIN_RID_ADMINISTRATOR,
+                       .flags                  = 0,
+                       .db_index               = SAM_DATABASE_PRIVS,
+                       .delta_type             = NETR_DELTA_ACCOUNT,
+                       .sid                    = null_sid,
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_SYNCHRONIZATION_REQUIRED, /* strange */
+                       .expected_num_results   = 0,
+                       .comment                = "NETR_DELTA_ACCOUNT by rid 500"
+               },
+               {
+                       .rid                    = 0,
+                       .flags                  = NETR_CHANGELOG_SID_INCLUDED,
+                       .db_index               = SAM_DATABASE_PRIVS,
+                       .delta_type             = NETR_DELTA_ACCOUNT,
+                       .sid                    = *dom_sid_parse_talloc(tctx, "S-1-1-0"),
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 1,
+                       .expected_delta_type_1  = NETR_DELTA_ACCOUNT,
+                       .comment                = "NETR_DELTA_ACCOUNT by sid S-1-1-0 and flags"
+               },
+               {
+                       .rid                    = 0,
+                       .flags                  = NETR_CHANGELOG_SID_INCLUDED |
+                                                 NETR_CHANGELOG_IMMEDIATE_REPL_REQUIRED,
+                       .db_index               = SAM_DATABASE_PRIVS,
+                       .delta_type             = NETR_DELTA_ACCOUNT,
+                       .sid                    = *dom_sid_parse_talloc(tctx, "S-1-1-0"),
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 1,
+                       .expected_delta_type_1  = NETR_DELTA_ACCOUNT,
+                       .comment                = "NETR_DELTA_ACCOUNT by sid S-1-1-0 and 2 flags"
+               },
+               {
+                       .rid                    = 0,
+                       .flags                  = NETR_CHANGELOG_SID_INCLUDED |
+                                                 NETR_CHANGELOG_NAME_INCLUDED,
+                       .db_index               = SAM_DATABASE_PRIVS,
+                       .delta_type             = NETR_DELTA_ACCOUNT,
+                       .sid                    = *dom_sid_parse_talloc(tctx, "S-1-1-0"),
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_INVALID_PARAMETER,
+                       .expected_num_results   = 0,
+                       .comment                = "NETR_DELTA_ACCOUNT by sid S-1-1-0 and invalid flags"
+               },
+               {
+                       .rid                    = DOMAIN_RID_ADMINISTRATOR,
+                       .flags                  = NETR_CHANGELOG_SID_INCLUDED,
+                       .db_index               = SAM_DATABASE_PRIVS,
+                       .delta_type             = NETR_DELTA_ACCOUNT,
+                       .sid                    = *sid,
+                       .name                   = NULL,
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 1,
+                       .expected_delta_type_1  = NETR_DELTA_DELETE_ACCOUNT,
+                       .comment                = "NETR_DELTA_ACCOUNT by rid 500, sid and flags"
+               },
+               {
+                       .rid                    = 0,
+                       .flags                  = NETR_CHANGELOG_NAME_INCLUDED,
+                       .db_index               = SAM_DATABASE_PRIVS,
+                       .delta_type             = NETR_DELTA_SECRET,
+                       .sid                    = null_sid,
+                       .name                   = "IsurelydontexistIhope",
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 1,
+                       .expected_delta_type_1  = NETR_DELTA_DELETE_SECRET,
+                       .comment                = "NETR_DELTA_SECRET by name 'IsurelydontexistIhope' and flags"
+               },
+               {
+                       .rid                    = 0,
+                       .flags                  = NETR_CHANGELOG_NAME_INCLUDED,
+                       .db_index               = SAM_DATABASE_PRIVS,
+                       .delta_type             = NETR_DELTA_SECRET,
+                       .sid                    = null_sid,
+                       .name                   = "G$BCKUPKEY_P",
+                       .expected_error         = NT_STATUS_OK,
+                       .expected_num_results   = 1,
+                       .expected_delta_type_1  = NETR_DELTA_SECRET,
+                       .comment                = "NETR_DELTA_SECRET by name 'G$BCKUPKEY_P' and flags"
+               }
+       };
+
+       ZERO_STRUCT(return_authenticator);
+
+       r.in.logon_server = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
+       r.in.computername = TEST_MACHINE_NAME;
+       r.in.return_authenticator = &return_authenticator;
+       r.out.return_authenticator = &return_authenticator;
+       r.out.delta_enum_array = &delta_enum_array;
+
+       for (d=0; d<3; d++) {
+
+               const char *database;
+
+               switch (d) {
+               case 0:
+                       database = "SAM";
+                       break;
+               case 1:
+                       database = "BUILTIN";
+                       break;
+               case 2:
+                       database = "LSA";
+                       break;
+               default:
+                       break;
+               }
+
+               torture_comment(tctx, "Testing DatabaseRedo\n");
+
+               if (!test_SetupCredentials(p, tctx, machine_credentials, &creds)) {
+                       return false;
+               }
+
+               for (i=0;i<ARRAY_SIZE(changes);i++) {
+
+                       if (d != changes[i].db_index) {
+                               continue;
+                       }
+
+                       netlogon_creds_client_authenticator(creds, &credential);
+
+                       r.in.credential = &credential;
+
+                       e.serial_number1        = 0;
+                       e.serial_number2        = 0;
+                       e.object_rid            = changes[i].rid;
+                       e.flags                 = changes[i].flags;
+                       e.db_index              = changes[i].db_index;
+                       e.delta_type            = changes[i].delta_type;
+
+                       switch (changes[i].flags & (NETR_CHANGELOG_NAME_INCLUDED | NETR_CHANGELOG_SID_INCLUDED)) {
+                       case NETR_CHANGELOG_SID_INCLUDED:
+                               e.object.object_sid             = changes[i].sid;
+                               break;
+                       case NETR_CHANGELOG_NAME_INCLUDED:
+                               e.object.object_name            = changes[i].name;
+                               break;
+                       default:
+                               break;
+                       }
+
+                       r.in.change_log_entry = e;
+
+                       torture_comment(tctx, "Testing DatabaseRedo with database %s and %s\n",
+                               database, changes[i].comment);
+
+                       status = dcerpc_netr_DatabaseRedo(p, tctx, &r);
+                       if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
+                               return true;
+                       }
+
+                       torture_assert_ntstatus_equal(tctx, status, changes[i].expected_error, changes[i].comment);
+                       if (delta_enum_array) {
+                               torture_assert_int_equal(tctx,
+                                       delta_enum_array->num_deltas,
+                                       changes[i].expected_num_results,
+                                       changes[i].comment);
+                               if (delta_enum_array->num_deltas > 0) {
+                                       torture_assert_int_equal(tctx,
+                                               delta_enum_array->delta_enum[0].delta_type,
+                                               changes[i].expected_delta_type_1,
+                                               changes[i].comment);
+                               }
+                               if (delta_enum_array->num_deltas > 1) {
+                                       torture_assert_int_equal(tctx,
+                                               delta_enum_array->delta_enum[1].delta_type,
+                                               changes[i].expected_delta_type_2,
+                                               changes[i].comment);
+                               }
+                       }
+
+                       if (!netlogon_creds_client_check(creds, &return_authenticator.cred)) {
+                               torture_comment(tctx, "Credential chaining failed\n");
+                               if (!test_SetupCredentials(p, tctx, machine_credentials, &creds)) {
+                                       return false;
+                               }
+                       }
+               }
+       }
+       }
+
+       return true;
+}
 
 /*
   try a netlogon AccountDeltas
@@ -831,7 +1379,7 @@ static bool test_AccountDeltas(struct torture_context *tctx,
 {
        NTSTATUS status;
        struct netr_AccountDeltas r;
-       struct creds_CredentialState *creds;
+       struct netlogon_creds_CredentialState *creds;
 
        struct netr_AccountBuffer buffer;
        uint32_t count_returned = 0;
@@ -848,7 +1396,7 @@ static bool test_AccountDeltas(struct torture_context *tctx,
        r.in.logon_server = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
        r.in.computername = TEST_MACHINE_NAME;
        r.in.return_authenticator = &return_authenticator;
-       creds_client_authenticator(creds, &r.in.credential);
+       netlogon_creds_client_authenticator(creds, &r.in.credential);
        ZERO_STRUCT(r.in.uas);
        r.in.count=10;
        r.in.level=0;
@@ -874,7 +1422,7 @@ static bool test_AccountSync(struct torture_context *tctx, struct dcerpc_pipe *p
 {
        NTSTATUS status;
        struct netr_AccountSync r;
-       struct creds_CredentialState *creds;
+       struct netlogon_creds_CredentialState *creds;
 
        struct netr_AccountBuffer buffer;
        uint32_t count_returned = 0;
@@ -893,7 +1441,7 @@ static bool test_AccountSync(struct torture_context *tctx, struct dcerpc_pipe *p
        r.in.logon_server = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
        r.in.computername = TEST_MACHINE_NAME;
        r.in.return_authenticator = &return_authenticator;
-       creds_client_authenticator(creds, &r.in.credential);
+       netlogon_creds_client_authenticator(creds, &r.in.credential);
        r.in.recordid = &recordid;
        r.in.reference=0;
        r.in.level=0;
@@ -943,12 +1491,12 @@ static bool test_LogonControl(struct torture_context *tctx,
 {
        NTSTATUS status;
        struct netr_LogonControl r;
-       union netr_CONTROL_QUERY_INFORMATION info;
+       union netr_CONTROL_QUERY_INFORMATION query;
        int i;
 
        r.in.logon_server = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
        r.in.function_code = 1;
-       r.out.info = &info;
+       r.out.query = &query;
 
        for (i=1;i<4;i++) {
                r.in.level = i;
@@ -979,6 +1527,7 @@ static bool test_GetAnyDCName(struct torture_context *tctx,
 
        status = dcerpc_netr_GetAnyDCName(p, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "GetAnyDCName");
+       torture_assert_werr_ok(tctx, r.out.result, "GetAnyDCName");
 
        if (dcname) {
            torture_comment(tctx, "\tDC is at '%s'\n", dcname);
@@ -1078,7 +1627,7 @@ static bool test_DatabaseSync2(struct torture_context *tctx,
        struct netr_DELTA_ENUM_ARRAY *delta_enum_array = NULL;
        struct netr_Authenticator return_authenticator, credential;
 
-       struct creds_CredentialState *creds;
+       struct netlogon_creds_CredentialState *creds;
        const uint32_t database_ids[] = {0, 1, 2}; 
        int i;
 
@@ -1109,7 +1658,7 @@ static bool test_DatabaseSync2(struct torture_context *tctx,
                torture_comment(tctx, "Testing DatabaseSync2 of id %d\n", r.in.database_id);
 
                do {
-                       creds_client_authenticator(creds, &credential);
+                       netlogon_creds_client_authenticator(creds, &credential);
 
                        r.in.credential = &credential;
 
@@ -1124,7 +1673,7 @@ static bool test_DatabaseSync2(struct torture_context *tctx,
 
                        torture_assert_ntstatus_ok(tctx, status, "DatabaseSync2");
 
-                       if (!creds_client_check(creds, &r.out.return_authenticator->cred)) {
+                       if (!netlogon_creds_client_check(creds, &r.out.return_authenticator->cred)) {
                                torture_comment(tctx, "Credential chaining failed\n");
                        }
 
@@ -1143,13 +1692,16 @@ static bool test_LogonControl2Ex(struct torture_context *tctx,
 {
        NTSTATUS status;
        struct netr_LogonControl2Ex r;
+       union netr_CONTROL_DATA_INFORMATION data;
        union netr_CONTROL_QUERY_INFORMATION query;
        int i;
 
+       data.domain = lp_workgroup(tctx->lp_ctx);
+
        r.in.logon_server = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
 
        r.in.function_code = NETLOGON_CONTROL_REDISCOVER;
-       r.in.data.domain = lp_workgroup(tctx->lp_ctx);
+       r.in.data = &data;
        r.out.query = &query;
 
        for (i=1;i<4;i++) {
@@ -1162,8 +1714,10 @@ static bool test_LogonControl2Ex(struct torture_context *tctx,
                torture_assert_ntstatus_ok(tctx, status, "LogonControl");
        }
 
+       data.domain = lp_workgroup(tctx->lp_ctx);
+
        r.in.function_code = NETLOGON_CONTROL_TC_QUERY;
-       r.in.data.domain = lp_workgroup(tctx->lp_ctx);
+       r.in.data = &data;
 
        for (i=1;i<4;i++) {
                r.in.level = i;
@@ -1175,8 +1729,10 @@ static bool test_LogonControl2Ex(struct torture_context *tctx,
                torture_assert_ntstatus_ok(tctx, status, "LogonControl");
        }
 
+       data.domain = lp_workgroup(tctx->lp_ctx);
+
        r.in.function_code = NETLOGON_CONTROL_TRANSPORT_NOTIFY;
-       r.in.data.domain = lp_workgroup(tctx->lp_ctx);
+       r.in.data = &data;
 
        for (i=1;i<4;i++) {
                r.in.level = i;
@@ -1188,8 +1744,10 @@ static bool test_LogonControl2Ex(struct torture_context *tctx,
                torture_assert_ntstatus_ok(tctx, status, "LogonControl");
        }
 
+       data.debug_level = ~0;
+
        r.in.function_code = NETLOGON_CONTROL_SET_DBFLAG;
-       r.in.data.debug_level = ~0;
+       r.in.data = &data;
 
        for (i=1;i<4;i++) {
                r.in.level = i;
@@ -1506,6 +2064,47 @@ static bool test_netr_DsRAddressToSitenamesExW(struct torture_context *tctx,
        return true;
 }
 
+static bool test_netr_ServerGetTrustInfo(struct torture_context *tctx,
+                                        struct dcerpc_pipe *p,
+                                        struct cli_credentials *machine_credentials)
+{
+       NTSTATUS status;
+       struct netr_ServerGetTrustInfo r;
+
+       struct netr_Authenticator a;
+       struct netr_Authenticator return_authenticator;
+       struct samr_Password new_owf_password;
+       struct samr_Password old_owf_password;
+       struct netr_TrustInfo *trust_info;
+
+       struct netlogon_creds_CredentialState *creds;
+
+       if (!test_SetupCredentials3(p, tctx, NETLOGON_NEG_AUTH2_ADS_FLAGS,
+                                   machine_credentials, &creds)) {
+               return false;
+       }
+
+       netlogon_creds_client_authenticator(creds, &a);
+
+       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                 = &a;
+
+       r.out.return_authenticator      = &return_authenticator;
+       r.out.new_owf_password          = &new_owf_password;
+       r.out.old_owf_password          = &old_owf_password;
+       r.out.trust_info                = &trust_info;
+
+       status = dcerpc_netr_ServerGetTrustInfo(p, tctx, &r);
+       torture_assert_ntstatus_ok(tctx, status, "failed");
+       torture_assert(tctx, netlogon_creds_client_check(creds, &return_authenticator.cred), "Credential chaining failed");
+
+       return true;
+}
+
+
 static bool test_GetDomainInfo(struct torture_context *tctx, 
                               struct dcerpc_pipe *p,
                               struct cli_credentials *machine_credentials)
@@ -1514,7 +2113,7 @@ static bool test_GetDomainInfo(struct torture_context *tctx,
        struct netr_LogonGetDomainInfo r;
        struct netr_DomainQuery1 q1;
        struct netr_Authenticator a;
-       struct creds_CredentialState *creds;
+       struct netlogon_creds_CredentialState *creds;
        union netr_DomainInfo info;
 
        if (!test_SetupCredentials3(p, tctx, NETLOGON_NEG_AUTH2_ADS_FLAGS, 
@@ -1524,7 +2123,7 @@ static bool test_GetDomainInfo(struct torture_context *tctx,
 
        ZERO_STRUCT(r);
 
-       creds_client_authenticator(creds, &a);
+       netlogon_creds_client_authenticator(creds, &a);
 
        r.in.server_name = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
        r.in.computer_name = TEST_MACHINE_NAME;
@@ -1542,21 +2141,21 @@ static bool test_GetDomainInfo(struct torture_context *tctx,
        q1.workstation_site = "Default-First-Site-Name";
        q1.blob2.length = 0;
        q1.blob2.size = 0;
-       q1.blob2.data = NULL;
+       q1.blob2.array = NULL;
        q1.product.string = "product string";
 
        torture_comment(tctx, "Testing netr_LogonGetDomainInfo\n");
 
        status = dcerpc_netr_LogonGetDomainInfo(p, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "netr_LogonGetDomainInfo");
-       torture_assert(tctx, creds_client_check(creds, &a.cred), "Credential chaining failed");
+       torture_assert(tctx, netlogon_creds_client_check(creds, &a.cred), "Credential chaining failed");
 
        torture_comment(tctx, "Testing netr_LogonGetDomainInfo 2nd call\n");
-       creds_client_authenticator(creds, &a);
+       netlogon_creds_client_authenticator(creds, &a);
 
        status = dcerpc_netr_LogonGetDomainInfo(p, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "netr_LogonGetDomainInfo");
-       torture_assert(tctx, creds_client_check(creds, &a.cred), "Credential chaining failed");
+       torture_assert(tctx, netlogon_creds_client_check(creds, &a.cred), "Credential chaining failed");
 
        return true;
 }
@@ -1579,8 +2178,8 @@ static bool test_GetDomainInfo_async(struct torture_context *tctx,
        struct netr_DomainQuery1 q1;
        struct netr_Authenticator a;
 #define ASYNC_COUNT 100
-       struct creds_CredentialState *creds;
-       struct creds_CredentialState *creds_async[ASYNC_COUNT];
+       struct netlogon_creds_CredentialState *creds;
+       struct netlogon_creds_CredentialState *creds_async[ASYNC_COUNT];
        struct rpc_request *req[ASYNC_COUNT];
        int i;
        int *async_counter = talloc(tctx, int);
@@ -1608,7 +2207,7 @@ static bool test_GetDomainInfo_async(struct torture_context *tctx,
        q1.workstation_site = "Default-First-Site-Name";
        q1.blob2.length = 0;
        q1.blob2.size = 0;
-       q1.blob2.data = NULL;
+       q1.blob2.array = NULL;
        q1.product.string = "product string";
 
        torture_comment(tctx, "Testing netr_LogonGetDomainInfo - async count %d\n", ASYNC_COUNT);
@@ -1616,9 +2215,9 @@ static bool test_GetDomainInfo_async(struct torture_context *tctx,
        *async_counter = 0;
 
        for (i=0;i<ASYNC_COUNT;i++) {
-               creds_client_authenticator(creds, &a);
+               netlogon_creds_client_authenticator(creds, &a);
 
-               creds_async[i] = (struct creds_CredentialState *)talloc_memdup(creds, creds, sizeof(*creds));
+               creds_async[i] = (struct netlogon_creds_CredentialState *)talloc_memdup(creds, creds, sizeof(*creds));
                req[i] = dcerpc_netr_LogonGetDomainInfo_send(p, tctx, &r);
 
                req[i]->async.callback = async_callback;
@@ -1636,7 +2235,7 @@ static bool test_GetDomainInfo_async(struct torture_context *tctx,
                torture_assert_ntstatus_ok(tctx, status, "netr_LogonGetDomainInfo_async");
                torture_assert_ntstatus_ok(tctx, r.out.result, "netr_LogonGetDomainInfo_async"); 
 
-               torture_assert(tctx, creds_client_check(creds_async[i], &a.cred), 
+               torture_assert(tctx, netlogon_creds_client_check(creds_async[i], &a.cred), 
                        "Credential chaining failed at async");
        }
 
@@ -1751,6 +2350,7 @@ struct torture_suite *torture_rpc_netlogon(TALLOC_CTX *mem_ctx)
        torture_rpc_tcase_add_test_creds(tcase, "GetDomainInfo", test_GetDomainInfo);
        torture_rpc_tcase_add_test_creds(tcase, "DatabaseSync", test_DatabaseSync);
        torture_rpc_tcase_add_test_creds(tcase, "DatabaseDeltas", test_DatabaseDeltas);
+       torture_rpc_tcase_add_test_creds(tcase, "DatabaseRedo", test_DatabaseRedo);
        torture_rpc_tcase_add_test_creds(tcase, "AccountDeltas", test_AccountDeltas);
        torture_rpc_tcase_add_test_creds(tcase, "AccountSync", test_AccountSync);
        torture_rpc_tcase_add_test(tcase, "GetDcName", test_GetDcName);
@@ -1771,6 +2371,7 @@ struct torture_suite *torture_rpc_netlogon(TALLOC_CTX *mem_ctx)
        torture_rpc_tcase_add_test(tcase, "DsrGetDcSiteCoverageW", test_netr_DsrGetDcSiteCoverageW);
        torture_rpc_tcase_add_test(tcase, "DsRAddressToSitenamesW", test_netr_DsRAddressToSitenamesW);
        torture_rpc_tcase_add_test(tcase, "DsRAddressToSitenamesExW", test_netr_DsRAddressToSitenamesExW);
+       torture_rpc_tcase_add_test_creds(tcase, "ServerGetTrustInfo", test_netr_ServerGetTrustInfo);
 
        return suite;
 }