r4616: the first phase in the addition of proper support for
[samba.git] / source4 / torture / rpc / samsync.c
index 777e5f36ebd74c36a9784c86affcdd53aee645d1..4a71e909579b591df9d4a14b141a6d1f143a08a5 100644 (file)
 #include "system/time.h"
 
 #define TEST_MACHINE_NAME "samsynctest"
+#define TEST_MACHINE_NAME2 "samsynctest2"
 
 /*
   try a netlogon SamLogon
 */
 static NTSTATUS test_SamLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
                              struct creds_CredentialState *creds, 
-                             const char *domain, const char *username,
+                             const char *domain, const char *account_name,
+                             const char *workstation, 
                              struct samr_Password *lm_hash, 
                              struct samr_Password *nt_hash, 
                              struct netr_SamInfo3 **info3)
@@ -50,13 +52,13 @@ static NTSTATUS test_SamLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        ninfo.identity_info.parameter_control = 0;
        ninfo.identity_info.logon_id_low = 0;
        ninfo.identity_info.logon_id_high = 0;
-       ninfo.identity_info.account_name.string = username;
-       ninfo.identity_info.workstation.string = TEST_MACHINE_NAME;
+       ninfo.identity_info.account_name.string = account_name;
+       ninfo.identity_info.workstation.string = workstation;
        generate_random_buffer(ninfo.challenge, 
                               sizeof(ninfo.challenge));
        if (nt_hash) {
                ninfo.nt.length = 24;
-               ninfo.nt.data = talloc(mem_ctx, 24);
+               ninfo.nt.data = talloc_size(mem_ctx, 24);
                SMBOWFencrypt(nt_hash->hash, ninfo.challenge, ninfo.nt.data);
        } else {
                ninfo.nt.length = 0;
@@ -65,7 +67,7 @@ static NTSTATUS test_SamLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        
        if (lm_hash) {
                ninfo.lm.length = 24;
-               ninfo.lm.data = talloc(mem_ctx, 24);
+               ninfo.lm.data = talloc_size(mem_ctx, 24);
                SMBOWFencrypt(lm_hash->hash, ninfo.challenge, ninfo.lm.data);
        } else {
                ninfo.lm.length = 0;
@@ -73,7 +75,7 @@ static NTSTATUS test_SamLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        }
 
        r.in.server_name = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
-       r.in.workstation = TEST_MACHINE_NAME;
+       r.in.workstation = workstation;
        r.in.credential = &auth;
        r.in.return_authenticator = &auth2;
        r.in.logon_level = 2;
@@ -104,10 +106,12 @@ struct samsync_state {
        struct samsync_secret *secrets;
        struct samsync_trusted_domain *trusted_domains;
        struct creds_CredentialState *creds;
+       struct creds_CredentialState *creds_netlogon_wksta;
        struct policy_handle *connect_handle;
        struct policy_handle *domain_handle[2];
        struct dom_sid *sid[2];
        struct dcerpc_pipe *p;
+       struct dcerpc_pipe *p_netlogon_wksta;
        struct dcerpc_pipe *p_samr;
        struct dcerpc_pipe *p_lsa;
        struct policy_handle *lsa_handle;
@@ -147,7 +151,7 @@ static struct policy_handle *samsync_open_domain(TALLOC_CTX *mem_ctx,
        }
 
        o.in.connect_handle = samsync_state->connect_handle;
-       o.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       o.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        o.in.sid = l.out.sid;
        o.out.domain_handle = domain_handle;
        
@@ -164,6 +168,43 @@ static struct policy_handle *samsync_open_domain(TALLOC_CTX *mem_ctx,
        return domain_handle;
 }
 
+static struct sec_desc_buf *samsync_query_samr_sec_desc(TALLOC_CTX *mem_ctx, 
+                                                       struct samsync_state *samsync_state, 
+                                                       struct policy_handle *handle) 
+{
+       struct samr_QuerySecurity r;
+       NTSTATUS status;
+
+       r.in.handle = handle;
+       r.in.sec_info = 0x7;
+
+       status = dcerpc_samr_QuerySecurity(samsync_state->p_samr, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("SAMR QuerySecurity failed - %s\n", nt_errstr(status));
+               return NULL;
+       }
+
+       return r.out.sdbuf;
+}
+
+static struct sec_desc_buf *samsync_query_lsa_sec_desc(TALLOC_CTX *mem_ctx, 
+                                                      struct samsync_state *samsync_state, 
+                                                      struct policy_handle *handle) 
+{
+       struct lsa_QuerySecurity r;
+       NTSTATUS status;
+
+       r.in.handle = handle;
+       r.in.sec_info = 0x7;
+
+       status = dcerpc_lsa_QuerySecurity(samsync_state->p_lsa, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("LSA QuerySecurity failed - %s\n", nt_errstr(status));
+               return NULL;
+       }
+
+       return r.out.sdbuf;
+}
 
 #define TEST_UINT64_EQUAL(i1, i2) do {\
        if (i1 != i2) {\
@@ -187,6 +228,7 @@ static struct policy_handle *samsync_open_domain(TALLOC_CTX *mem_ctx,
              ret = False;\
        } \
 } while (0)
+
 #define TEST_STRING_EQUAL(s1, s2) do {\
        if (!((!s1.string || s1.string[0]=='\0') && (!s2.string || s2.string[0]=='\0')) \
            && strcmp_safe(s1.string, s2.string) != 0) {\
@@ -196,6 +238,34 @@ static struct policy_handle *samsync_open_domain(TALLOC_CTX *mem_ctx,
        } \
 } while (0)
 
+#define TEST_SID_EQUAL(s1, s2) do {\
+       if (!dom_sid_equal(s1, s2)) {\
+             printf("dom_sid mismatch: " #s1 ":%s != " #s2 ": %s\n", \
+                    dom_sid_string(mem_ctx, s1), dom_sid_string(mem_ctx, s2));\
+             ret = False;\
+       } \
+} while (0)
+
+/* The ~SEC_DESC_SACL_PRESENT is because we don't, as administrator,
+ * get back the SACL part of the SD when we ask over SAMR */
+
+#define TEST_SEC_DESC_EQUAL(sd1, pipe, handle) do {\
+        struct sec_desc_buf *sdbuf = samsync_query_ ##pipe## _sec_desc(mem_ctx, samsync_state, \
+                                                           handle); \
+       if (!sdbuf || !sdbuf->sd) { \
+                printf("Could not obtain security descriptor to match " #sd1 "\n");\
+               ret = False; \
+        } else {\
+               if (!security_descriptor_mask_equal(sd1.sd, sdbuf->sd, \
+                           ~SEC_DESC_SACL_PRESENT)) {\
+                       printf("Security Descriptor Mismatch for %s:\n", #sd1);\
+                       ndr_print_debug((ndr_print_fn_t)ndr_print_security_descriptor, "SamSync", sd1.sd);\
+                       ndr_print_debug((ndr_print_fn_t)ndr_print_security_descriptor, "SamR", sdbuf->sd);\
+                       ret = False;\
+               }\
+       }\
+} while (0)
+
 static BOOL samsync_handle_domain(TALLOC_CTX *mem_ctx, struct samsync_state *samsync_state,
                           int database_id, struct netr_DELTA_ENUM *delta) 
 {
@@ -279,6 +349,8 @@ static BOOL samsync_handle_domain(TALLOC_CTX *mem_ctx, struct samsync_state *sam
        TEST_TIME_EQUAL(q[13].out.info->info13.domain_create_time, 
                        domain->domain_create_time);
 
+       TEST_SEC_DESC_EQUAL(domain->sdbuf, samr, samsync_state->domain_handle[database_id]);
+
        return ret;
 }
 
@@ -301,7 +373,7 @@ static BOOL samsync_handle_policy(TALLOC_CTX *mem_ctx, struct samsync_state *sam
                }
        }
 
-       if (!sid_equal(samsync_state->sid[SAM_DATABASE_DOMAIN], policy->sid)) {
+       if (!dom_sid_equal(samsync_state->sid[SAM_DATABASE_DOMAIN], policy->sid)) {
                printf("Domain SID from POLICY (%s) does not match domain sid from SAMR (%s)\n", 
                       dom_sid_string(mem_ctx, policy->sid), dom_sid_string(mem_ctx, samsync_state->sid[SAM_DATABASE_DOMAIN]));
                return False;
@@ -338,7 +410,7 @@ static BOOL samsync_handle_user(TALLOC_CTX *mem_ctx, struct samsync_state *samsy
        }
 
        r.in.domain_handle = samsync_state->domain_handle[database_id];
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.in.rid = rid;
        r.out.user_handle = &user_handle;
 
@@ -351,6 +423,8 @@ static BOOL samsync_handle_user(TALLOC_CTX *mem_ctx, struct samsync_state *samsy
        q.in.user_handle = &user_handle;
        q.in.level = 21;
 
+       TEST_SEC_DESC_EQUAL(user->sdbuf, samr, &user_handle);
+
        nt_status = dcerpc_samr_QueryUserInfo(samsync_state->p_samr, mem_ctx, &q);
        if (!test_samr_handle_Close(samsync_state->p_samr, mem_ctx, &user_handle)) {
                return False;
@@ -379,7 +453,7 @@ static BOOL samsync_handle_user(TALLOC_CTX *mem_ctx, struct samsync_state *samsy
        TEST_INT_EQUAL(q.out.info->info21.logon_hours.units_per_week, 
                       user->logon_hours.units_per_week);
        if (ret) {
-               if (memcmp(q.out.info->info21.logon_hours.bitmap, user->logon_hours.bitmap
+               if (memcmp(q.out.info->info21.logon_hours.bits, user->logon_hours.bits
                           q.out.info->info21.logon_hours.units_per_week/8) != 0) {
                        printf("Logon hours mismatch\n");
                        ret = False;
@@ -396,9 +470,6 @@ static BOOL samsync_handle_user(TALLOC_CTX *mem_ctx, struct samsync_state *samsy
        TEST_TIME_EQUAL(q.out.info->info21.acct_expiry,
                       user->acct_expiry);
 
-       TEST_INT_EQUAL(q.out.info->info21.logon_hours.units_per_week, 
-                      user->logon_hours.units_per_week);
-
        TEST_INT_EQUAL(q.out.info->info21.acct_flags, user->acct_flags);
        TEST_INT_EQUAL(q.out.info->info21.nt_password_set, user->nt_password_present);
        TEST_INT_EQUAL(q.out.info->info21.lm_password_set, user->lm_password_present);
@@ -448,6 +519,7 @@ static BOOL samsync_handle_user(TALLOC_CTX *mem_ctx, struct samsync_state *samsy
        nt_status = test_SamLogon(samsync_state->p, mem_ctx, samsync_state->creds, 
                                  domain,
                                  username, 
+                                 TEST_MACHINE_NAME,
                                  lm_hash_p,
                                  nt_hash_p,
                                  &info3);
@@ -483,8 +555,14 @@ static BOOL samsync_handle_user(TALLOC_CTX *mem_ctx, struct samsync_state *samsy
        } else if (NT_STATUS_IS_OK(nt_status)) {
                TEST_INT_EQUAL(user->rid, info3->base.rid);
                TEST_INT_EQUAL(user->primary_gid, info3->base.primary_gid);
-               TEST_INT_EQUAL(user->acct_flags, info3->base.acct_flags);
-               TEST_STRING_EQUAL(user->account_name, info3->base.account_name);
+               /* this is 0x0 from NT4 sp6 */
+               if (info3->base.acct_flags) {
+                       TEST_INT_EQUAL(user->acct_flags, info3->base.acct_flags);
+               }
+               /* this is NULL from NT4 sp6 */
+               if (info3->base.account_name.string) {
+                       TEST_STRING_EQUAL(user->account_name, info3->base.account_name);
+               }
                TEST_STRING_EQUAL(user->full_name, info3->base.full_name);
                TEST_STRING_EQUAL(user->logon_script, info3->base.logon_script);
                TEST_STRING_EQUAL(user->profile_path, info3->base.profile_path);
@@ -502,8 +580,9 @@ static BOOL samsync_handle_user(TALLOC_CTX *mem_ctx, struct samsync_state *samsy
                 * doco I read -- abartlet) */
 
                /* This copes with the two different versions of 0 I see */
+               /* with NT4 sp6 we have the || case */
                if (!((user->last_logoff == 0) 
-                     && (info3->base.last_logoff == 0x7fffffffffffffffLL))) {
+                     || (info3->base.last_logoff == 0x7fffffffffffffffLL))) {
                        TEST_TIME_EQUAL(user->last_logoff, info3->base.last_logoff);
                }
                return ret;
@@ -533,7 +612,7 @@ static BOOL samsync_handle_alias(TALLOC_CTX *mem_ctx, struct samsync_state *sams
        }
 
        r.in.domain_handle = samsync_state->domain_handle[database_id];
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.in.rid = rid;
        r.out.alias_handle = &alias_handle;
 
@@ -546,6 +625,8 @@ static BOOL samsync_handle_alias(TALLOC_CTX *mem_ctx, struct samsync_state *sams
        q.in.alias_handle = &alias_handle;
        q.in.level = 1;
 
+       TEST_SEC_DESC_EQUAL(alias->sdbuf, samr, &alias_handle);
+
        nt_status = dcerpc_samr_QueryAliasInfo(samsync_state->p_samr, mem_ctx, &q);
        if (!test_samr_handle_Close(samsync_state->p_samr, mem_ctx, &alias_handle)) {
                return False;
@@ -559,7 +640,7 @@ static BOOL samsync_handle_alias(TALLOC_CTX *mem_ctx, struct samsync_state *sams
 
        TEST_STRING_EQUAL(q.out.info->all.name, alias->alias_name);
        TEST_STRING_EQUAL(q.out.info->all.description, alias->description);
-       return False;
+       return ret;
 }
 
 static BOOL samsync_handle_group(TALLOC_CTX *mem_ctx, struct samsync_state *samsync_state,
@@ -580,7 +661,7 @@ static BOOL samsync_handle_group(TALLOC_CTX *mem_ctx, struct samsync_state *sams
        }
 
        r.in.domain_handle = samsync_state->domain_handle[database_id];
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.in.rid = rid;
        r.out.group_handle = &group_handle;
 
@@ -593,6 +674,8 @@ static BOOL samsync_handle_group(TALLOC_CTX *mem_ctx, struct samsync_state *sams
        q.in.group_handle = &group_handle;
        q.in.level = 1;
 
+       TEST_SEC_DESC_EQUAL(group->sdbuf, samr, &group_handle);
+
        nt_status = dcerpc_samr_QueryGroupInfo(samsync_state->p_samr, mem_ctx, &q);
        if (!test_samr_handle_Close(samsync_state->p_samr, mem_ctx, &group_handle)) {
                return False;
@@ -607,7 +690,7 @@ static BOOL samsync_handle_group(TALLOC_CTX *mem_ctx, struct samsync_state *sams
        TEST_STRING_EQUAL(q.out.info->all.name, group->group_name);
        TEST_INT_EQUAL(q.out.info->all.attributes, group->attributes);
        TEST_STRING_EQUAL(q.out.info->all.description, group->description);
-       return False;
+       return ret;
 }
 
 static BOOL samsync_handle_secret(TALLOC_CTX *mem_ctx, struct samsync_state *samsync_state,
@@ -637,20 +720,24 @@ static BOOL samsync_handle_secret(TALLOC_CTX *mem_ctx, struct samsync_state *sam
        DLIST_ADD(samsync_state->secrets, new);
 
        o.in.handle = samsync_state->lsa_handle;
-       o.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
-       o.in.name.name = name;
+       o.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+       o.in.name.string = name;
        o.out.sec_handle = &sec_handle;
 
        status = dcerpc_lsa_OpenSecret(samsync_state->p_lsa, mem_ctx, &o);
        if (!NT_STATUS_IS_OK(status)) {
                printf("OpenSecret failed - %s\n", nt_errstr(status));
-               ret = False;
+               return False;
        }
 
+/*
+  We would like to do this, but it is NOT_SUPPORTED on win2k3
+  TEST_SEC_DESC_EQUAL(secret->sdbuf, lsa, &sec_handle);
+*/
        status = dcerpc_fetch_session_key(samsync_state->p_lsa, &session_key);
        if (!NT_STATUS_IS_OK(status)) {
                printf("dcerpc_fetch_session_key failed - %s\n", nt_errstr(status));
-               ret = False;
+               return False;
        }
 
 
@@ -668,7 +755,7 @@ static BOOL samsync_handle_secret(TALLOC_CTX *mem_ctx, struct samsync_state *sam
        status = dcerpc_lsa_QuerySecret(samsync_state->p_lsa, mem_ctx, &q);
        if (!NT_STATUS_IS_OK(status)) {
                printf("QuerySecret failed - %s\n", nt_errstr(status));
-               ret = False;
+               return False;
        }
 
        if (q.out.new_val->buf == NULL) {
@@ -703,16 +790,143 @@ static BOOL samsync_handle_secret(TALLOC_CTX *mem_ctx, struct samsync_state *sam
 static BOOL samsync_handle_trusted_domain(TALLOC_CTX *mem_ctx, struct samsync_state *samsync_state,
                                          int database_id, struct netr_DELTA_ENUM *delta) 
 {
+       NTSTATUS status;
+       BOOL ret = True;
        struct netr_DELTA_TRUSTED_DOMAIN *trusted_domain = delta->delta_union.trusted_domain;
        struct dom_sid *dom_sid = delta->delta_id_union.sid;
 
        struct samsync_trusted_domain *new = talloc_p(samsync_state, struct samsync_trusted_domain);
+       struct lsa_OpenTrustedDomain t;
+       struct policy_handle trustdom_handle;
+       struct lsa_QueryTrustedDomainInfo q;
+       union lsa_TrustedDomainInfo *info[9];
+       int levels [] = {1, 3, 8};
+       int i;
+
        new->name = talloc_reference(new, trusted_domain->domain_name.string);
        new->sid = talloc_reference(new, dom_sid);
 
+       t.in.handle = samsync_state->lsa_handle;
+       t.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+       t.in.sid = dom_sid;
+       t.out.trustdom_handle = &trustdom_handle;
+
+       status = dcerpc_lsa_OpenTrustedDomain(samsync_state->p_lsa, mem_ctx, &t);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("OpenTrustedDomain failed - %s\n", nt_errstr(status));
+               return False;
+       }
+       
+       for (i=0; i< ARRAY_SIZE(levels); i++) {
+               q.in.trustdom_handle = &trustdom_handle;
+               q.in.level = levels[i];
+               status = dcerpc_lsa_QueryTrustedDomainInfo(samsync_state->p_lsa, mem_ctx, &q);
+               if (!NT_STATUS_IS_OK(status)) {
+                       if (q.in.level == 8 && NT_STATUS_EQUAL(status,NT_STATUS_INVALID_PARAMETER)) {
+                               info[levels[i]] = NULL;
+                               continue;
+                       }
+                       printf("QueryInfoTrustedDomain level %d failed - %s\n", 
+                              levels[i], nt_errstr(status));
+                       return False;
+               }
+               info[levels[i]]  = q.out.info;
+       }
+
+       if (info[8]) {
+               TEST_SID_EQUAL(info[8]->full_info.info_ex.sid, dom_sid);
+               TEST_STRING_EQUAL(info[8]->full_info.info_ex.netbios_name, trusted_domain->domain_name);
+       }
+       TEST_STRING_EQUAL(info[1]->name.netbios_name, trusted_domain->domain_name);
+       TEST_INT_EQUAL(info[3]->flags.flags, trusted_domain->flags);
+/*
+  We would like to do this, but it is NOT_SUPPORTED on win2k3
+       TEST_SEC_DESC_EQUAL(trusted_domain->sdbuf, lsa, &trustdom_handle);
+*/
        DLIST_ADD(samsync_state->trusted_domains, new);
 
-       return True;
+       return ret;
+}
+
+static BOOL samsync_handle_account(TALLOC_CTX *mem_ctx, struct samsync_state *samsync_state,
+                                         int database_id, struct netr_DELTA_ENUM *delta) 
+{
+       NTSTATUS status;
+       BOOL ret = True;
+       struct netr_DELTA_ACCOUNT *account = delta->delta_union.account;
+       struct dom_sid *dom_sid = delta->delta_id_union.sid;
+
+       struct lsa_OpenAccount a;
+       struct policy_handle acct_handle;
+       struct lsa_EnumPrivsAccount e;
+       struct lsa_LookupPrivName r;
+
+       int i, j;
+
+       BOOL *found_priv_in_lsa;
+
+       a.in.handle = samsync_state->lsa_handle;
+       a.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+       a.in.sid = dom_sid;
+       a.out.acct_handle = &acct_handle;
+
+       status = dcerpc_lsa_OpenAccount(samsync_state->p_lsa, mem_ctx, &a);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("OpenTrustedDomain failed - %s\n", nt_errstr(status));
+               return False;
+       }
+
+       TEST_SEC_DESC_EQUAL(account->sdbuf, lsa, &acct_handle);
+
+       found_priv_in_lsa = talloc_zero_array(mem_ctx, BOOL, account->privilege_entries);
+
+       e.in.handle = &acct_handle;
+
+       status = dcerpc_lsa_EnumPrivsAccount(samsync_state->p_lsa, mem_ctx, &e);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("EnumPrivsAccount failed - %s\n", nt_errstr(status));
+               return False;
+       }
+
+       if (!e.out.privs) {
+               return account->privilege_entries != 0;
+       }
+
+       if ((account->privilege_entries && !e.out.privs)) {
+               return False;
+       }
+
+       TEST_INT_EQUAL(account->privilege_entries, e.out.privs->count);
+       
+       for (i=0;i< e.out.privs->count; i++) {
+               r.in.handle = samsync_state->lsa_handle;
+               r.in.luid = &e.out.privs->set[i].luid;
+               
+               status = dcerpc_lsa_LookupPrivName(samsync_state->p_lsa, mem_ctx, &r);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("\nLookupPrivName failed - %s\n", nt_errstr(status));
+                       return False;
+               }
+               
+               if (!r.out.name) {
+                       printf("\nLookupPrivName failed to return a name\n");
+                       return False;
+               }
+               for (j=0;j<account->privilege_entries; j++) {
+                       if (strcmp(r.out.name->string, account->privilege_name[j].string) == 0) {
+                               found_priv_in_lsa[j] = True;
+                               break;
+                       }
+               }
+       }
+       for (j=0;j<account->privilege_entries; j++) {
+               if (!found_priv_in_lsa[j]) {
+                       printf("Privilage %s on account %s not found in LSA\n", account->privilege_name[j].string, 
+                              dom_sid_string(mem_ctx, dom_sid));
+                       ret = False;
+               }
+       }
+       return ret;
 }
 
 /*
@@ -765,28 +979,32 @@ static BOOL test_DatabaseSync(struct samsync_state *samsync_state,
                                        ret &= samsync_handle_domain(mem_ctx, samsync_state, 
                                                                     r.in.database_id, &r.out.delta_enum_array->delta_enum[d]);
                                        break;
-                               case NETR_DELTA_USER:
-                                       ret &= samsync_handle_user(mem_ctx, samsync_state, 
-                                                                  r.in.database_id, &r.out.delta_enum_array->delta_enum[d]);
-                                       break;
                                case NETR_DELTA_GROUP:
                                        ret &= samsync_handle_group(mem_ctx, samsync_state, 
                                                                    r.in.database_id, &r.out.delta_enum_array->delta_enum[d]);
                                        break;
+                               case NETR_DELTA_USER:
+                                       ret &= samsync_handle_user(mem_ctx, samsync_state, 
+                                                                  r.in.database_id, &r.out.delta_enum_array->delta_enum[d]);
+                                       break;
                                case NETR_DELTA_ALIAS:
                                        ret &= samsync_handle_alias(mem_ctx, samsync_state, 
                                                                    r.in.database_id, &r.out.delta_enum_array->delta_enum[d]);
                                        break;
+                               case NETR_DELTA_POLICY:
+                                       ret &= samsync_handle_policy(mem_ctx, samsync_state, 
+                                                                    r.in.database_id, &r.out.delta_enum_array->delta_enum[d]);
+                                       break;
                                case NETR_DELTA_TRUSTED_DOMAIN:
                                        ret &= samsync_handle_trusted_domain(mem_ctx, samsync_state, 
                                                                             r.in.database_id, &r.out.delta_enum_array->delta_enum[d]);
                                        break;
-                               case NETR_DELTA_SECRET:
-                                       ret &= samsync_handle_secret(mem_ctx, samsync_state, 
+                               case NETR_DELTA_ACCOUNT:
+                                       ret &= samsync_handle_account(mem_ctx, samsync_state, 
                                                                     r.in.database_id, &r.out.delta_enum_array->delta_enum[d]);
                                        break;
-                               case NETR_DELTA_POLICY:
-                                       ret &= samsync_handle_policy(mem_ctx, samsync_state, 
+                               case NETR_DELTA_SECRET:
+                                       ret &= samsync_handle_secret(mem_ctx, samsync_state, 
                                                                     r.in.database_id, &r.out.delta_enum_array->delta_enum[d]);
                                        break;
                                }
@@ -811,12 +1029,19 @@ static BOOL test_DatabaseSync(struct samsync_state *samsync_state,
                                mdfour(nt_hash.hash, s->secret.data, s->secret.length);
                                
                                printf("Checking password for %s\\%s\n", t->name, username);
-                               nt_status = test_SamLogon(samsync_state->p, mem_ctx, samsync_state->creds
+                               nt_status = test_SamLogon(samsync_state->p_netlogon_wksta, mem_ctx, samsync_state->creds_netlogon_wksta
                                                          t->name,
                                                          username, 
+                                                         TEST_MACHINE_NAME2,
                                                          NULL, 
                                                          &nt_hash,
                                                          NULL);
+                               if (NT_STATUS_EQUAL(nt_status, NT_STATUS_NO_LOGON_SERVERS)) {
+                                       printf("Verifiction of trust password to %s failed: %s (the trusted domain is not available)\n", 
+                                              t->name, nt_errstr(nt_status));
+                                       
+                                       break;
+                               }
                                if (!NT_STATUS_EQUAL(nt_status, NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT)) {
                                        printf("Verifiction of trust password to %s: should have failed (nologon interdomain trust account), instead: %s\n", 
                                               t->name, nt_errstr(nt_status));
@@ -825,9 +1050,10 @@ static BOOL test_DatabaseSync(struct samsync_state *samsync_state,
                                
                                /* break it */
                                nt_hash.hash[0]++;
-                               nt_status = test_SamLogon(samsync_state->p, mem_ctx, samsync_state->creds
+                               nt_status = test_SamLogon(samsync_state->p_netlogon_wksta, mem_ctx, samsync_state->creds_netlogon_wksta
                                                          t->name,
                                                          username, 
+                                                         TEST_MACHINE_NAME2,
                                                          NULL,
                                                          &nt_hash,
                                                          NULL);
@@ -880,7 +1106,8 @@ static BOOL test_DatabaseDeltas(struct samsync_state *samsync_state, TALLOC_CTX
 
                        status = dcerpc_netr_DatabaseDeltas(samsync_state->p, mem_ctx, &r);
                        if (!NT_STATUS_IS_OK(status) &&
-                           !NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES)) {
+                           !NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES) &&
+                           !NT_STATUS_EQUAL(status, NT_STATUS_SYNCHRONIZATION_REQUIRED)) {
                                printf("DatabaseDeltas - %s\n", nt_errstr(status));
                                ret = False;
                                break;
@@ -952,9 +1179,12 @@ BOOL torture_rpc_samsync(void)
        TALLOC_CTX *mem_ctx;
        BOOL ret = True;
        struct test_join *join_ctx;
+       struct test_join *join_ctx2;
        const char *machine_password;
+       const char *machine_password2;
        const char *binding = lp_parm_string(-1, "torture", "binding");
        struct dcerpc_binding b;
+       struct dcerpc_binding b_netlogon_wksta;
        struct samr_Connect c;
        struct samr_SetDomainInfo s;
        struct policy_handle *domain_policy;
@@ -974,13 +1204,20 @@ BOOL torture_rpc_samsync(void)
                return False;
        }
        
+       join_ctx2 = torture_join_domain(TEST_MACHINE_NAME2, lp_workgroup(), ACB_WSTRUST, 
+                                      &machine_password2);
+       if (!join_ctx2) {
+               printf("Failed to join as member\n");
+               return False;
+       }
+       
        samsync_state = talloc_zero_p(mem_ctx, struct samsync_state);
 
        samsync_state->p_samr = torture_join_samr_pipe(join_ctx);
        samsync_state->connect_handle = talloc_zero_p(samsync_state, struct policy_handle);
        samsync_state->lsa_handle = talloc_zero_p(samsync_state, struct policy_handle);
        c.in.system_name = NULL;
-       c.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       c.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        c.out.connect_handle = samsync_state->connect_handle;
 
        status = dcerpc_samr_Connect(samsync_state->p_samr, mem_ctx, &c);
@@ -1020,13 +1257,6 @@ BOOL torture_rpc_samsync(void)
        }
        
 
-       status = dcerpc_parse_binding(mem_ctx, binding, &b);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("Bad binding string %s\n", binding);
-               ret = False;
-               goto failed;
-       }
-
        status = torture_rpc_connection(&samsync_state->p_lsa, 
                                        DCERPC_LSARPC_NAME,
                                        DCERPC_LSARPC_UUID,
@@ -1051,7 +1281,7 @@ BOOL torture_rpc_samsync(void)
 
        r.in.system_name = "\\";
        r.in.attr = &attr;
-       r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        r.out.handle = samsync_state->lsa_handle;
 
        status = dcerpc_lsa_OpenPolicy2(samsync_state->p_lsa, mem_ctx, &r);
@@ -1061,8 +1291,15 @@ BOOL torture_rpc_samsync(void)
                goto failed;
        }
 
+       status = dcerpc_parse_binding(mem_ctx, binding, &b);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Bad binding string %s\n", binding);
+               ret = False;
+               goto failed;
+       }
+
        b.flags &= ~DCERPC_AUTH_OPTIONS;
-       b.flags |= DCERPC_SCHANNEL_BDC | DCERPC_SIGN | DCERPC_SCHANNEL_128;
+       b.flags |= DCERPC_SCHANNEL_BDC | DCERPC_SIGN;
 
        status = dcerpc_pipe_connect_b(&samsync_state->p, &b, 
                                       DCERPC_NETLOGON_UUID,
@@ -1076,7 +1313,37 @@ BOOL torture_rpc_samsync(void)
                goto failed;
        }
 
-       status = dcerpc_schannel_creds(samsync_state->p->security_state.generic_state, mem_ctx, &samsync_state->creds);
+       status = dcerpc_schannel_creds(samsync_state->p->conn->security_state.generic_state, mem_ctx, &samsync_state->creds);
+       if (!NT_STATUS_IS_OK(status)) {
+               ret = False;
+       }
+
+
+
+       status = dcerpc_parse_binding(mem_ctx, binding, &b_netlogon_wksta);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Bad binding string %s\n", binding);
+               ret = False;
+               goto failed;
+       }
+
+       b_netlogon_wksta.flags &= ~DCERPC_AUTH_OPTIONS;
+       b_netlogon_wksta.flags |= DCERPC_SCHANNEL_WORKSTATION | DCERPC_SIGN;
+
+       status = dcerpc_pipe_connect_b(&samsync_state->p_netlogon_wksta, &b_netlogon_wksta, 
+                                      DCERPC_NETLOGON_UUID,
+                                      DCERPC_NETLOGON_VERSION,
+                                      lp_workgroup(), 
+                                      TEST_MACHINE_NAME2,
+                                      machine_password2);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               ret = False;
+               goto failed;
+       }
+
+       status = dcerpc_schannel_creds(samsync_state->p_netlogon_wksta->conn->security_state.generic_state, 
+                                      mem_ctx, &samsync_state->creds_netlogon_wksta);
        if (!NT_STATUS_IS_OK(status)) {
                ret = False;
        }
@@ -1096,6 +1363,7 @@ failed:
        torture_rpc_close(samsync_state->p);
 
        torture_leave_domain(join_ctx);
+       torture_leave_domain(join_ctx2);
 
        talloc_destroy(mem_ctx);