sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

r5963: Fix parameter passing for gentest and locktest

Browse Source 
(This used to be commit 28914c89dc1400d8364c13258ec0e8558acc7dfd)
This commit is contained in:
Jelmer Vernooij 2005-03-22 19:30:59 +00:00 committed by Gerald (Jerry) Carter
parent 1bb3e99d06
commit 88a5f8b26f
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source4/torture/gentest.c
View File

@ -60,7 +60,7 @@ static struct {
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 @@ static BOOL connect_servers(void)
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 @@ static void usage(void)
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 @@ static void usage(void)
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 @@ static void usage(void)
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);

19
source4/torture/locktest.c
View File

@ -47,7 +47,7 @@ static BOOL zero_zero;
#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 @@ static struct smbcli_state *connect_one(char *share, int snum)
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 @@ static void usage(void)
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 @@ static void usage(void)
}
}
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;