summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-08-22 19:28:44 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:16:31 -0500
commit867d900b562e58341b78ba3b6a95e4ce08bc7680 (patch)
treec2bbc8bab59206a5e75bef2ed01163f4085e4d4a
parent4b7139242b1b8f3e270d4d7640ed206e0a6c6b26 (diff)
downloadsamba-867d900b562e58341b78ba3b6a95e4ce08bc7680.tar.gz
samba-867d900b562e58341b78ba3b6a95e4ce08bc7680.tar.bz2
samba-867d900b562e58341b78ba3b6a95e4ce08bc7680.zip
r17717: this cried for bugs...and they happened...
we were passing a struct timeval reference as string, and gcc gives a warning...use C99 style initialisation. is there a special reason why the ACB_NORMAL is passed when the force_password_change is selected? metze (This used to be commit 45061b1b7e76d56d557119eb2f7f6317e104d083)
-rw-r--r--source4/torture/libnet/userman.c40
1 files changed, 30 insertions, 10 deletions
diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c
index 462b557735..73aada2384 100644
--- a/source4/torture/libnet/userman.c
+++ b/source4/torture/libnet/userman.c
@@ -417,17 +417,37 @@ BOOL torture_usermod(struct torture_context *torture)
struct timeval force = { 33333, 55444 };
struct usermod_change changes[] = {
- { USERMOD_FIELD_ACCOUNT_NAME, "changed", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0 },
- { USERMOD_FIELD_FULL_NAME, NULL, "Testing full account name", NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0 },
- { USERMOD_FIELD_DESCRIPTION, NULL, NULL, "Description of tested account", NULL, NULL, NULL, NULL, NULL, NULL, 0 },
- { USERMOD_FIELD_COMMENT, NULL, NULL, NULL, "Comment for the tested account", NULL, NULL, NULL, NULL, NULL, 0 },
- { USERMOD_FIELD_LOGON_SCRIPT, NULL, NULL, NULL, NULL, "test_logon.cmd", NULL, NULL, NULL, NULL, 0 },
- { USERMOD_FIELD_PROFILE_PATH, NULL, NULL, NULL, NULL, NULL, "\\\\TESTSRV\\profiles\\test", NULL, NULL, NULL, 0 },
- { USERMOD_FIELD_ACCT_EXPIRY, NULL, NULL, NULL, NULL, NULL, NULL, &expiry, NULL, NULL, 0 },
- { USERMOD_FIELD_ALLOW_PASS_CHG, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &allow, NULL, 0 },
- { USERMOD_FIELD_FORCE_PASS_CHG, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &force, ACB_NORMAL }
+ {
+ .fields = USERMOD_FIELD_ACCOUNT_NAME,
+ .account_name = "changed",
+ },{
+ .fields = USERMOD_FIELD_FULL_NAME,
+ .full_name = "Testing full account name",
+ },{
+ .fields = USERMOD_FIELD_DESCRIPTION,
+ .description = "Description of tested account",
+ },{
+ .fields = USERMOD_FIELD_COMMENT,
+ .comment = "Comment for the tested account",
+ },{
+ .fields = USERMOD_FIELD_LOGON_SCRIPT,
+ .logon_script = "test_logon.cmd",
+ },{
+ .fields = USERMOD_FIELD_PROFILE_PATH,
+ .profile_path = "\\\\TESTSRV\\profiles\\test",
+ },{
+ .fields = USERMOD_FIELD_ACCT_EXPIRY,
+ .acct_expiry = &expiry,
+ },{
+ .fields = USERMOD_FIELD_ALLOW_PASS_CHG,
+ .allow_password_change = &allow,
+ },{
+ .fields = USERMOD_FIELD_FORCE_PASS_CHG,
+ .force_password_change = &force,
+ .acct_flags = ACB_NORMAL,/* TODO: why is this needed here? */
+ }
};
-
+
mem_ctx = talloc_init("test_userdel");
binding = lp_parm_string(-1, "torture", "binding");