[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Tue Mar 23 10:29:59 MDT 2010
The branch, master has been updated
via bf9f24f... s4-smbtorture: use torture_context in samsync test.
via 9c586e6... s4-smbtorture: remove trailing whitespace from samsync torture test.
from 3e04bf4... s4-smbtorture: use torture_context in libnet domain tests as well.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bf9f24f571e87f5c6ae39cf68c5af3c99664a102
Author: Günther Deschner <gd at samba.org>
Date: Tue Mar 23 17:28:55 2010 +0100
s4-smbtorture: use torture_context in samsync test.
Guenther
commit 9c586e6b1bffac76b40a85d544904b9f8d56451e
Author: Günther Deschner <gd at samba.org>
Date: Tue Mar 23 17:16:23 2010 +0100
s4-smbtorture: remove trailing whitespace from samsync torture test.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source4/torture/rpc/samsync.c | 444 +++++++++++++++++++++--------------------
1 files changed, 230 insertions(+), 214 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index 1cfb9dc..bf3dba5 100644
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -1,4 +1,4 @@
-/*
+/*
Unix SMB/CIFS implementation.
test suite for netlogon rpc operations
@@ -6,17 +6,17 @@
Copyright (C) Andrew Tridgell 2003
Copyright (C) Andrew Bartlett <abartlet at samba.org> 2003-2004
Copyright (C) Tim Potter 2003
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -44,12 +44,13 @@
/*
try a netlogon SamLogon
*/
-static NTSTATUS test_SamLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
- struct netlogon_creds_CredentialState *creds,
+static NTSTATUS test_SamLogon(struct torture_context *tctx,
+ struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+ struct netlogon_creds_CredentialState *creds,
const char *domain, const char *account_name,
- const char *workstation,
- struct samr_Password *lm_hash,
- struct samr_Password *nt_hash,
+ const char *workstation,
+ struct samr_Password *lm_hash,
+ struct samr_Password *nt_hash,
struct netr_SamInfo3 **info3)
{
NTSTATUS status;
@@ -67,7 +68,7 @@ static NTSTATUS test_SamLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
ninfo.identity_info.logon_id_high = 0;
ninfo.identity_info.account_name.string = account_name;
ninfo.identity_info.workstation.string = workstation;
- generate_random_buffer(ninfo.challenge,
+ generate_random_buffer(ninfo.challenge,
sizeof(ninfo.challenge));
if (nt_hash) {
ninfo.nt.length = 24;
@@ -77,7 +78,7 @@ static NTSTATUS test_SamLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
ninfo.nt.length = 0;
ninfo.nt.data = NULL;
}
-
+
if (lm_hash) {
ninfo.lm.length = 24;
ninfo.lm.data = talloc_array(mem_ctx, uint8_t, 24);
@@ -100,13 +101,13 @@ static NTSTATUS test_SamLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
ZERO_STRUCT(auth2);
netlogon_creds_client_authenticator(creds, &auth);
-
+
r.in.validation_level = 3;
-
+
status = dcerpc_netr_LogonSamLogon_r(b, mem_ctx, &r);
if (!netlogon_creds_client_check(creds, &r.out.return_authenticator->cred)) {
- printf("Credential chaining failed\n");
+ torture_comment(tctx, "Credential chaining failed\n");
}
if (info3) {
@@ -150,9 +151,10 @@ struct samsync_trusted_domain {
const char *name;
};
-static struct policy_handle *samsync_open_domain(TALLOC_CTX *mem_ctx,
- struct samsync_state *samsync_state,
- const char *domain,
+static struct policy_handle *samsync_open_domain(struct torture_context *tctx,
+ TALLOC_CTX *mem_ctx,
+ struct samsync_state *samsync_state,
+ const char *domain,
struct dom_sid **sid_p)
{
struct lsa_String name;
@@ -169,7 +171,7 @@ static struct policy_handle *samsync_open_domain(TALLOC_CTX *mem_ctx,
nt_status = dcerpc_samr_LookupDomain_r(samsync_state->b_samr, mem_ctx, &l);
if (!NT_STATUS_IS_OK(nt_status)) {
- printf("LookupDomain failed - %s\n", nt_errstr(nt_status));
+ torture_comment(tctx, "LookupDomain failed - %s\n", nt_errstr(nt_status));
return NULL;
}
@@ -177,23 +179,24 @@ static struct policy_handle *samsync_open_domain(TALLOC_CTX *mem_ctx,
o.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
o.in.sid = *l.out.sid;
o.out.domain_handle = domain_handle;
-
+
if (sid_p) {
*sid_p = *l.out.sid;
}
nt_status = dcerpc_samr_OpenDomain_r(samsync_state->b_samr, mem_ctx, &o);
if (!NT_STATUS_IS_OK(nt_status)) {
- printf("OpenDomain failed - %s\n", nt_errstr(nt_status));
+ torture_comment(tctx, "OpenDomain failed - %s\n", nt_errstr(nt_status));
return NULL;
}
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)
+static struct sec_desc_buf *samsync_query_samr_sec_desc(struct torture_context *tctx,
+ TALLOC_CTX *mem_ctx,
+ struct samsync_state *samsync_state,
+ struct policy_handle *handle)
{
struct samr_QuerySecurity r;
struct sec_desc_buf *sdbuf = NULL;
@@ -205,16 +208,17 @@ static struct sec_desc_buf *samsync_query_samr_sec_desc(TALLOC_CTX *mem_ctx,
status = dcerpc_samr_QuerySecurity_r(samsync_state->b_samr, mem_ctx, &r);
if (!NT_STATUS_IS_OK(status)) {
- printf("SAMR QuerySecurity failed - %s\n", nt_errstr(status));
+ torture_comment(tctx, "SAMR QuerySecurity failed - %s\n", nt_errstr(status));
return NULL;
}
return sdbuf;
}
-static struct sec_desc_buf *samsync_query_lsa_sec_desc(TALLOC_CTX *mem_ctx,
- struct samsync_state *samsync_state,
- struct policy_handle *handle)
+static struct sec_desc_buf *samsync_query_lsa_sec_desc(struct torture_context *tctx,
+ TALLOC_CTX *mem_ctx,
+ struct samsync_state *samsync_state,
+ struct policy_handle *handle)
{
struct lsa_QuerySecurity r;
struct sec_desc_buf *sdbuf = NULL;
@@ -226,7 +230,7 @@ static struct sec_desc_buf *samsync_query_lsa_sec_desc(TALLOC_CTX *mem_ctx,
status = dcerpc_lsa_QuerySecurity_r(samsync_state->b_lsa, mem_ctx, &r);
if (!NT_STATUS_IS_OK(status)) {
- printf("LSA QuerySecurity failed - %s\n", nt_errstr(status));
+ torture_comment(tctx, "LSA QuerySecurity failed - %s\n", nt_errstr(status));
return NULL;
}
@@ -235,7 +239,7 @@ static struct sec_desc_buf *samsync_query_lsa_sec_desc(TALLOC_CTX *mem_ctx,
#define TEST_UINT64_EQUAL(i1, i2) do {\
if (i1 != i2) {\
- printf("%s: uint64 mismatch: " #i1 ": 0x%016llx (%lld) != " #i2 ": 0x%016llx (%lld)\n", \
+ torture_comment(tctx, "%s: uint64 mismatch: " #i1 ": 0x%016llx (%lld) != " #i2 ": 0x%016llx (%lld)\n", \
__location__, \
(long long)i1, (long long)i1, \
(long long)i2, (long long)i2);\
@@ -244,14 +248,14 @@ static struct sec_desc_buf *samsync_query_lsa_sec_desc(TALLOC_CTX *mem_ctx,
} while (0)
#define TEST_INT_EQUAL(i1, i2) do {\
if (i1 != i2) {\
- printf("%s: integer mismatch: " #i1 ": 0x%08x (%d) != " #i2 ": 0x%08x (%d)\n", \
+ torture_comment(tctx, "%s: integer mismatch: " #i1 ": 0x%08x (%d) != " #i2 ": 0x%08x (%d)\n", \
__location__, i1, i1, i2, i2); \
ret = false;\
} \
} while (0)
#define TEST_TIME_EQUAL(t1, t2) do {\
if (t1 != t2) {\
- printf("%s: NTTIME mismatch: " #t1 ":%s != " #t2 ": %s\n", \
+ torture_comment(tctx, "%s: NTTIME mismatch: " #t1 ":%s != " #t2 ": %s\n", \
__location__, nt_time_string(mem_ctx, t1), nt_time_string(mem_ctx, t2));\
ret = false;\
} \
@@ -260,7 +264,7 @@ static struct sec_desc_buf *samsync_query_lsa_sec_desc(TALLOC_CTX *mem_ctx,
#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) {\
- printf("%s: string mismatch: " #s1 ":%s != " #s2 ": %s\n", \
+ torture_comment(tctx, "%s: string mismatch: " #s1 ":%s != " #s2 ": %s\n", \
__location__, s1.string, s2.string);\
ret = false;\
} \
@@ -269,7 +273,7 @@ static struct sec_desc_buf *samsync_query_lsa_sec_desc(TALLOC_CTX *mem_ctx,
#define TEST_BINARY_STRING_EQUAL(s1, s2) do {\
if (!((!s1.array || s1.array[0]=='\0') && (!s2.array || s2.array[0]=='\0')) \
&& memcmp(s1.array, s2.array, s1.length * 2) != 0) {\
- printf("%s: string mismatch: " #s1 ":%s != " #s2 ": %s\n", \
+ torture_comment(tctx, "%s: string mismatch: " #s1 ":%s != " #s2 ": %s\n", \
__location__, (const char *)s1.array, (const char *)s2.array);\
ret = false;\
} \
@@ -277,7 +281,7 @@ static struct sec_desc_buf *samsync_query_lsa_sec_desc(TALLOC_CTX *mem_ctx,
#define TEST_SID_EQUAL(s1, s2) do {\
if (!dom_sid_equal(s1, s2)) {\
- printf("%s: dom_sid mismatch: " #s1 ":%s != " #s2 ": %s\n", \
+ torture_comment(tctx, "%s: dom_sid mismatch: " #s1 ":%s != " #s2 ": %s\n", \
__location__, dom_sid_string(mem_ctx, s1), dom_sid_string(mem_ctx, s2));\
ret = false;\
} \
@@ -287,15 +291,15 @@ static struct sec_desc_buf *samsync_query_lsa_sec_desc(TALLOC_CTX *mem_ctx,
* 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, \
+ struct sec_desc_buf *sdbuf = samsync_query_ ##pipe## _sec_desc(tctx, mem_ctx, samsync_state, \
handle); \
if (!sdbuf || !sdbuf->sd) { \
- printf("Could not obtain security descriptor to match " #sd1 "\n");\
+ torture_comment(tctx, "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);\
+ torture_comment(tctx, "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;\
@@ -303,8 +307,8 @@ static struct sec_desc_buf *samsync_query_lsa_sec_desc(TALLOC_CTX *mem_ctx,
}\
} while (0)
-static bool samsync_handle_domain(TALLOC_CTX *mem_ctx, struct samsync_state *samsync_state,
- int database_id, struct netr_DELTA_ENUM *delta)
+static bool samsync_handle_domain(struct torture_context *tctx, TALLOC_CTX *mem_ctx, struct samsync_state *samsync_state,
+ int database_id, struct netr_DELTA_ENUM *delta)
{
struct netr_DELTA_DOMAIN *domain = delta->delta_union.domain;
struct dom_sid *dom_sid;
@@ -314,29 +318,29 @@ static bool samsync_handle_domain(TALLOC_CTX *mem_ctx, struct samsync_state *sam
NTSTATUS nt_status;
int i;
bool ret = true;
-
- samsync_state->seq_num[database_id] =
+
+ samsync_state->seq_num[database_id] =
domain->sequence_num;
switch (database_id) {
case SAM_DATABASE_DOMAIN:
break;
case SAM_DATABASE_BUILTIN:
if (strcasecmp_m("BUILTIN", domain->domain_name.string) != 0) {
- printf("BUILTIN domain has different name: %s\n", domain->domain_name.string);
+ torture_comment(tctx, "BUILTIN domain has different name: %s\n", domain->domain_name.string);
}
break;
case SAM_DATABASE_PRIVS:
- printf("DOMAIN entry on privs DB!\n");
+ torture_comment(tctx, "DOMAIN entry on privs DB!\n");
return false;
break;
}
-
+
if (!samsync_state->domain_name[database_id]) {
- samsync_state->domain_name[database_id] =
+ samsync_state->domain_name[database_id] =
talloc_reference(samsync_state, domain->domain_name.string);
} else {
if (strcasecmp_m(samsync_state->domain_name[database_id], domain->domain_name.string) != 0) {
- printf("Domain has name varies!: %s != %s\n", samsync_state->domain_name[database_id],
+ torture_comment(tctx, "Domain has name varies!: %s != %s\n", samsync_state->domain_name[database_id],
domain->domain_name.string);
return false;
}
@@ -344,15 +348,16 @@ static bool samsync_handle_domain(TALLOC_CTX *mem_ctx, struct samsync_state *sam
if (!samsync_state->domain_handle[database_id]) {
samsync_state->domain_handle[database_id]
- = talloc_reference(samsync_state,
- samsync_open_domain(mem_ctx, samsync_state, samsync_state->domain_name[database_id],
+ = talloc_reference(samsync_state,
+ samsync_open_domain(tctx,
+ mem_ctx, samsync_state, samsync_state->domain_name[database_id],
&dom_sid));
}
if (samsync_state->domain_handle[database_id]) {
samsync_state->sid[database_id] = talloc_reference(samsync_state, dom_sid);
}
- printf("\tsequence_nums[%d/%s]=%llu\n",
+ torture_comment(tctx, "\tsequence_nums[%d/%s]=%llu\n",
database_id, domain->domain_name.string,
(long long)samsync_state->seq_num[database_id]);
@@ -365,14 +370,14 @@ static bool samsync_handle_domain(TALLOC_CTX *mem_ctx, struct samsync_state *sam
nt_status = dcerpc_samr_QueryDomainInfo_r(samsync_state->b_samr, mem_ctx, &q[levels[i]]);
if (!NT_STATUS_IS_OK(nt_status)) {
- printf("QueryDomainInfo level %u failed - %s\n",
+ torture_comment(tctx, "QueryDomainInfo level %u failed - %s\n",
q[levels[i]].in.level, nt_errstr(nt_status));
return false;
}
}
TEST_STRING_EQUAL(info[5]->info5.domain_name, domain->domain_name);
-
+
TEST_STRING_EQUAL(info[2]->general.oem_information, domain->oem_information);
TEST_STRING_EQUAL(info[4]->oem.oem_information, domain->oem_information);
TEST_TIME_EQUAL(info[2]->general.force_logoff_time, domain->force_logoff_time);
@@ -395,39 +400,40 @@ static bool samsync_handle_domain(TALLOC_CTX *mem_ctx, struct samsync_state *sam
return ret;
}
-static bool samsync_handle_policy(TALLOC_CTX *mem_ctx, struct samsync_state *samsync_state,
- int database_id, struct netr_DELTA_ENUM *delta)
+static bool samsync_handle_policy(struct torture_context *tctx,
+ TALLOC_CTX *mem_ctx, struct samsync_state *samsync_state,
+ int database_id, struct netr_DELTA_ENUM *delta)
{
struct netr_DELTA_POLICY *policy = delta->delta_union.policy;
- samsync_state->seq_num[database_id] =
+ samsync_state->seq_num[database_id] =
policy->sequence_num;
-
+
if (!samsync_state->domain_name[SAM_DATABASE_DOMAIN]) {
- samsync_state->domain_name[SAM_DATABASE_DOMAIN] =
+ samsync_state->domain_name[SAM_DATABASE_DOMAIN] =
talloc_reference(samsync_state, policy->primary_domain_name.string);
} else {
if (strcasecmp_m(samsync_state->domain_name[SAM_DATABASE_DOMAIN], policy->primary_domain_name.string) != 0) {
- printf("PRIMARY domain has name varies between DOMAIN and POLICY!: %s != %s\n", samsync_state->domain_name[SAM_DATABASE_DOMAIN],
+ torture_comment(tctx, "PRIMARY domain has name varies between DOMAIN and POLICY!: %s != %s\n", samsync_state->domain_name[SAM_DATABASE_DOMAIN],
policy->primary_domain_name.string);
return false;
}
}
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",
+ torture_comment(tctx, "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;
}
- printf("\tsequence_nums[%d/PRIVS]=%llu\n",
- database_id,
+ torture_comment(tctx, "\tsequence_nums[%d/PRIVS]=%llu\n",
+ database_id,
(long long)samsync_state->seq_num[database_id]);
return true;
}
static bool samsync_handle_user(struct torture_context *tctx, TALLOC_CTX *mem_ctx, struct samsync_state *samsync_state,
- int database_id, struct netr_DELTA_ENUM *delta)
+ int database_id, struct netr_DELTA_ENUM *delta)
{
uint32_t rid = delta->delta_id_union.rid;
struct netr_DELTA_USER *user = delta->delta_union.user;
@@ -450,7 +456,7 @@ static bool samsync_handle_user(struct torture_context *tctx, TALLOC_CTX *mem_ct
struct samr_RidWithAttributeArray *rids;
if (!samsync_state->domain_name || !samsync_state->domain_handle[database_id]) {
- printf("SamSync needs domain information before the users\n");
+ torture_comment(tctx, "SamSync needs domain information before the users\n");
return false;
}
@@ -461,7 +467,7 @@ static bool samsync_handle_user(struct torture_context *tctx, TALLOC_CTX *mem_ct
nt_status = dcerpc_samr_OpenUser_r(samsync_state->b_samr, mem_ctx, &r);
if (!NT_STATUS_IS_OK(nt_status)) {
- printf("OpenUser(%u) failed - %s\n", rid, nt_errstr(nt_status));
+ torture_comment(tctx, "OpenUser(%u) failed - %s\n", rid, nt_errstr(nt_status));
return false;
}
@@ -473,23 +479,23 @@ static bool samsync_handle_user(struct torture_context *tctx, TALLOC_CTX *mem_ct
nt_status = dcerpc_samr_QueryUserInfo_r(samsync_state->b_samr, mem_ctx, &q);
if (!NT_STATUS_IS_OK(nt_status)) {
- printf("QueryUserInfo level %u failed - %s\n",
+ torture_comment(tctx, "QueryUserInfo level %u failed - %s\n",
q.in.level, nt_errstr(nt_status));
ret = false;
}
getgroups.in.user_handle = &user_handle;
getgroups.out.rids = &rids;
-
+
nt_status = dcerpc_samr_GetGroupsForUser_r(samsync_state->b_samr, mem_ctx, &getgroups);
if (!NT_STATUS_IS_OK(nt_status)) {
- printf("GetGroupsForUser failed - %s\n",
+ torture_comment(tctx, "GetGroupsForUser failed - %s\n",
nt_errstr(nt_status));
ret = false;
}
if (!test_samr_handle_Close(samsync_state->b_samr, mem_ctx, &user_handle)) {
- printf("samr_handle_Close failed - %s\n",
+ torture_comment(tctx, "samr_handle_Close failed - %s\n",
nt_errstr(nt_status));
ret = false;
}
@@ -498,7 +504,7 @@ static bool samsync_handle_user(struct torture_context *tctx, TALLOC_CTX *mem_ct
}
if (!NT_STATUS_IS_OK(nt_status)) {
- printf("QueryUserInfo level %u failed - %s\n",
+ torture_comment(tctx, "QueryUserInfo level %u failed - %s\n",
q.in.level, nt_errstr(nt_status));
return false;
}
@@ -522,7 +528,7 @@ static bool samsync_handle_user(struct torture_context *tctx, TALLOC_CTX *mem_ct
if (ret) {
if (memcmp(info->info21.logon_hours.bits, user->logon_hours.bits,
info->info21.logon_hours.units_per_week/8) != 0) {
- printf("Logon hours mismatch\n");
+ torture_comment(tctx, "Logon hours mismatch\n");
ret = false;
}
}
@@ -540,11 +546,11 @@ static bool samsync_handle_user(struct torture_context *tctx, TALLOC_CTX *mem_ct
TEST_INT_EQUAL((info->info21.acct_flags & ~ACB_PW_EXPIRED), user->acct_flags);
if (user->acct_flags & ACB_PWNOEXP) {
if (info->info21.acct_flags & ACB_PW_EXPIRED) {
- printf("ACB flags mismatch: both expired and no expiry!\n");
+ torture_comment(tctx, "ACB flags mismatch: both expired and no expiry!\n");
ret = false;
}
if (info->info21.force_password_change != (NTTIME)0x7FFFFFFFFFFFFFFFULL) {
- printf("ACB flags mismatch: no password expiry, but force password change 0x%016llx (%lld) != 0x%016llx (%lld)\n",
+ torture_comment(tctx, "ACB flags mismatch: no password expiry, but force password change 0x%016llx (%lld) != 0x%016llx (%lld)\n",
(unsigned long long)info->info21.force_password_change,
(unsigned long long)info->info21.force_password_change,
(unsigned long long)0x7FFFFFFFFFFFFFFFULL, (unsigned long long)0x7FFFFFFFFFFFFFFFULL
@@ -587,7 +593,7 @@ static bool samsync_handle_user(struct torture_context *tctx, TALLOC_CTX *mem_ct
nt_hash_p = &nt_hash;
}
} else {
- printf("Failed to parse Sensitive Data for %s:\n", username);
+ torture_comment(tctx, "Failed to parse Sensitive Data for %s:\n", username);
#if 0
dump_data(0, data.data, data.length);
#endif
@@ -604,9 +610,10 @@ static bool samsync_handle_user(struct torture_context *tctx, TALLOC_CTX *mem_ct
DEBUG(100,("ACCOUNT [%s\\%-25s] LMHASH %s\n", samsync_state->domain_name[0], username, data_blob_hex_string_upper(mem_ctx, &lm_hash_blob)));
}
- nt_status = test_SamLogon(samsync_state->p_netlogon_wksta, mem_ctx, samsync_state->creds_netlogon_wksta,
+ nt_status = test_SamLogon(tctx,
+ samsync_state->p_netlogon_wksta, mem_ctx, samsync_state->creds_netlogon_wksta,
domain,
- username,
+ username,
TEST_WKSTA_MACHINE_NAME,
lm_hash_p,
nt_hash_p,
@@ -680,7 +687,7 @@ static bool samsync_handle_user(struct torture_context *tctx, TALLOC_CTX *mem_ct
/* This copes with the two different versions of 0 I see */
/* with NT4 sp6 we have the || case */
- if (!((user->last_logoff == 0)
+ if (!((user->last_logoff == 0)
|| (info3->base.last_logoff == 0x7fffffffffffffffLL))) {
TEST_TIME_EQUAL(user->last_logoff, info3->base.last_logoff);
}
@@ -690,7 +697,7 @@ static bool samsync_handle_user(struct torture_context *tctx, TALLOC_CTX *mem_ct
int i, j;
int count = rids->count;
bool *matched = talloc_zero_array(mem_ctx, bool, rids->count);
-
+
for (i = 0; i < count; i++) {
for (j = 0; j < count; j++) {
if ((rids->rids[i].rid ==
@@ -705,22 +712,23 @@ static bool samsync_handle_user(struct torture_context *tctx, TALLOC_CTX *mem_ct
for (i = 0; i < rids->count; i++) {
if (matched[i] == false) {
ret = false;
- printf("Could not find group RID %u found in getgroups in NETLOGON reply\n",
--
Samba Shared Repository
More information about the samba-cvs
mailing list