svn commit: samba r5963 - in branches/SAMBA_4_0/source/torture: .
jelmer at samba.org
jelmer at samba.org
Tue Mar 22 19:31:09 GMT 2005
Author: jelmer
Date: 2005-03-22 19:30:59 +0000 (Tue, 22 Mar 2005)
New Revision: 5963
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5963
Log:
Fix parameter passing for gentest and locktest
Modified:
branches/SAMBA_4_0/source/torture/gentest.c
branches/SAMBA_4_0/source/torture/locktest.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/gentest.c
===================================================================
--- branches/SAMBA_4_0/source/torture/gentest.c 2005-03-22 18:48:05 UTC (rev 5962)
+++ branches/SAMBA_4_0/source/torture/gentest.c 2005-03-22 19:30:59 UTC (rev 5963)
@@ -60,7 +60,7 @@
struct smbcli_state *cli[NINSTANCES];
char *server_name;
char *share_name;
- struct cli_credentials credentials;
+ struct cli_credentials *credentials;
} servers[NSERVERS];
/* the seeds and flags for each operation */
@@ -175,13 +175,13 @@
NTSTATUS status;
printf("Connecting to \\\\%s\\%s as %s - instance %d\n",
servers[i].server_name, servers[i].share_name,
- servers[i].credentials.username, j);
+ servers[i].credentials->username, j);
status = smbcli_full_connection(NULL, &servers[i].cli[j],
"gentest",
servers[i].server_name,
servers[i].share_name, NULL,
- &servers[i].credentials);
+ servers[i].credentials);
if (!NT_STATUS_IS_OK(status)) {
printf("Failed to connect to \\\\%s\\%s - %s\n",
servers[i].server_name, servers[i].share_name,
@@ -2115,6 +2115,7 @@
for (i=0;i<NSERVERS;i++) {
const char *share = argv[1+i];
+ servers[i].credentials = cli_credentials_init(NULL);
if (!split_unc_name(share, &servers[i].server_name, &servers[i].share_name)) {
printf("Invalid share name '%s'\n", share);
return -1;
@@ -2135,8 +2136,8 @@
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[0].credentials, optarg, CRED_SPECIFIED);
+ i = servers[0].credentials->username?1:0;
+ cli_credentials_parse_string(servers[i].credentials, optarg, CRED_SPECIFIED);
break;
case 'd':
DEBUGLEVEL = atoi(optarg);
@@ -2186,13 +2187,13 @@
gentest_init_subsystems;
- if (!servers[0].credentials.username) {
+ if (!servers[0].credentials->username) {
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 (!servers[1].credentials->username) {
+ servers[1].credentials->username = servers[0].credentials->username;
+ servers[1].credentials->password = servers[0].credentials->password;
}
printf("seed=%u\n", options.seed);
Modified: branches/SAMBA_4_0/source/torture/locktest.c
===================================================================
--- branches/SAMBA_4_0/source/torture/locktest.c 2005-03-22 18:48:05 UTC (rev 5962)
+++ branches/SAMBA_4_0/source/torture/locktest.c 2005-03-22 19:30:59 UTC (rev 5963)
@@ -47,7 +47,7 @@
#define NASTY_POSIX_LOCK_HACK 0
-static struct cli_credentials servers[NSERVERS];
+static struct cli_credentials *servers[NSERVERS];
enum lock_op {OP_LOCK, OP_UNLOCK, OP_REOPEN};
@@ -121,7 +121,7 @@
status = smbcli_full_connection(NULL, &c, myname,
server,
share, NULL,
- &servers[snum]);
+ servers[snum]);
if (!NT_STATUS_IS_OK(status)) {
sleep(2);
}
@@ -477,13 +477,16 @@
lp_load(dyn_CONFIGFILE,True,False,False);
load_interfaces();
+ servers[0] = cli_credentials_init(talloc_autofree_context());
+ servers[1] = cli_credentials_init(talloc_autofree_context());
+
seed = time(NULL);
while ((opt = getopt(argc, argv, "U:s:ho:aAW:OR:B:M:EZW:")) != EOF) {
switch (opt) {
case 'U':
- i = servers[0].username?1:0;
- cli_credentials_parse_string(&servers[0], optarg, CRED_SPECIFIED);
+ i = servers[0]->username?1:0;
+ cli_credentials_parse_string(servers[i], optarg, CRED_SPECIFIED);
break;
case 'R':
@@ -531,13 +534,13 @@
}
}
- if (!servers[0].username) {
+ if (!servers[0]->username) {
usage();
return -1;
}
- if (!servers[1].username) {
- servers[1].username = servers[0].username;
- servers[1].password = servers[0].password;
+ if (!servers[1]->username) {
+ servers[1]->username = servers[0]->username;
+ servers[1]->password = servers[0]->password;
}
locktest_init_subsystems;
More information about the samba-cvs
mailing list