diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-03-21 23:35:58 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:11:09 -0500 |
| commit | 13b0776f60f6a0f35a4afc2b3d3c6b5ec9c1ca6a (patch) | |
| tree | 8eddfcb0dd18a9cee4c1de4fbd3ee98f05cd27e6 /source4/torture/locktest.c | |
| parent | 05bc2d7b2c11a3583a6d1221cfbd618eb6730518 (diff) | |
| download | samba-13b0776f60f6a0f35a4afc2b3d3c6b5ec9c1ca6a.tar.gz samba-13b0776f60f6a0f35a4afc2b3d3c6b5ec9c1ca6a.tar.bz2 samba-13b0776f60f6a0f35a4afc2b3d3c6b5ec9c1ca6a.zip | |
r5929: Use cli_credentials for the SMB functions as well.
Fix a couple of bugs in the new cli_credentials code
(This used to be commit 4ad481cfe5cde514d2ef9646147239f3faaa6173)
Diffstat (limited to 'source4/torture/locktest.c')
| -rw-r--r-- | source4/torture/locktest.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c index 74f348638c..005f9af71b 100644 --- a/source4/torture/locktest.c +++ b/source4/torture/locktest.c @@ -47,10 +47,7 @@ static BOOL zero_zero; #define NASTY_POSIX_LOCK_HACK 0 -static struct { - char *username; - char *password; -} servers[NSERVERS]; +static struct cli_credentials servers[NSERVERS]; enum lock_op {OP_LOCK, OP_UNLOCK, OP_REOPEN}; @@ -124,8 +121,7 @@ static struct smbcli_state *connect_one(char *share, int snum) status = smbcli_full_connection(NULL, &c, myname, server, share, NULL, - servers[snum].username, lp_workgroup(), - servers[snum].password); + &servers[snum]); if (!NT_STATUS_IS_OK(status)) { sleep(2); } @@ -487,12 +483,8 @@ static void usage(void) switch (opt) { case 'U': i = servers[0].username?1:0; - if (!split_username(optarg, - &servers[i].username, - &servers[i].password)) { - printf("Must supply USER%%PASS\n"); - return -1; - } + cli_credentials_parse_string(&servers[0], optarg, CRED_SPECIFIED); + break; case 'R': lock_range = strtol(optarg, NULL, 0); |