svn commit: samba r6531 - in branches/SAMBA_4_0/source/torture: .
tridge at samba.org
tridge at samba.org
Sat Apr 30 09:59:17 GMT 2005
Author: tridge
Date: 2005-04-30 09:59:17 +0000 (Sat, 30 Apr 2005)
New Revision: 6531
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6531
Log:
fixed gentest with new credentials code
Modified:
branches/SAMBA_4_0/source/torture/gentest.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/gentest.c
===================================================================
--- branches/SAMBA_4_0/source/torture/gentest.c 2005-04-30 09:54:58 UTC (rev 6530)
+++ branches/SAMBA_4_0/source/torture/gentest.c 2005-04-30 09:59:17 UTC (rev 6531)
@@ -2101,7 +2101,7 @@
int main(int argc, char *argv[])
{
int opt;
- int i;
+ int i, username_count=0;
BOOL ret;
setlinebuf(stdout);
@@ -2130,6 +2130,11 @@
lp_load(dyn_CONFIGFILE,True,False,False);
load_interfaces();
+ servers[0].credentials = cli_credentials_init(talloc_autofree_context());
+ servers[1].credentials = cli_credentials_init(talloc_autofree_context());
+ cli_credentials_guess(servers[0].credentials);
+ cli_credentials_guess(servers[1].credentials);
+
options.seed = time(NULL);
options.numops = 1000;
options.max_open_handles = 20;
@@ -2138,8 +2143,13 @@
while ((opt = getopt(argc, argv, "U:s:o:ad:i:AOhS:LFXC")) != EOF) {
switch (opt) {
case 'U':
- i = servers[0].credentials->username?1:0;
- cli_credentials_parse_string(servers[i].credentials, optarg, CRED_SPECIFIED);
+ if (username_count == 2) {
+ usage();
+ exit(1);
+ }
+ cli_credentials_parse_string(servers[username_count].credentials,
+ optarg, CRED_SPECIFIED);
+ username_count++;
break;
case 'd':
DEBUGLEVEL = atoi(optarg);
@@ -2189,13 +2199,12 @@
gentest_init_subsystems;
- if (!servers[0].credentials->username) {
+ if (username_count == 0) {
usage();
return -1;
}
- if (!servers[1].credentials->username) {
- servers[1].credentials->username = servers[0].credentials->username;
- servers[1].credentials->password = servers[0].credentials->password;
+ if (username_count == 1) {
+ servers[1].credentials = servers[0].credentials;
}
printf("seed=%u\n", options.seed);
More information about the samba-cvs
mailing list