diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-03-21 02:08:38 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:11:08 -0500 |
| commit | 02075be0bbc2095073f8898350fded64a7c97c79 (patch) | |
| tree | 28ea2820f79dfc766b745515848c840bf98b2a88 /source4/torture/torture.c | |
| parent | 105660d3f9b537fa47fe6e33c0418a1d8f85e0e9 (diff) | |
| download | samba-02075be0bbc2095073f8898350fded64a7c97c79.tar.gz samba-02075be0bbc2095073f8898350fded64a7c97c79.tar.bz2 samba-02075be0bbc2095073f8898350fded64a7c97c79.zip | |
r5917: First step in using the new cli_credentials structure. This patch
puts support for it into popt_common, adds a few utility functions
(in lib/credentials.c) and the callback functions for the command-line
(lib/cmdline/credentials.c). Comments are welcome :-)
(This used to be commit 1d49b57c50fe8c2683ea23e9df41ce8ad774db98)
Diffstat (limited to 'source4/torture/torture.c')
| -rw-r--r-- | source4/torture/torture.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/torture/torture.c b/source4/torture/torture.c index 588bf1bcff..c7762f1b8a 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -2729,7 +2729,7 @@ static BOOL is_binding_string(const char *binding_string) } if (!lp_parm_string(-1,"torture","username")) { - lp_set_cmdline("torture:username", cmdline_get_username()); + lp_set_cmdline("torture:username", cli_credentials_get_username(cmdline_credentials)); } if (!lp_parm_string(-1,"torture","userdomain")) { /* @@ -2738,13 +2738,13 @@ static BOOL is_binding_string(const char *binding_string) * for all cmdline tools * --metze */ - if (strequal(lp_netbios_name(),cmdline_get_userdomain())) { - cmdline_set_userdomain(lp_workgroup()); + if (strequal(lp_netbios_name(),cli_credentials_get_domain(cmdline_credentials))) { + cli_credentials_set_domain(cmdline_credentials, lp_workgroup(), CRED_SPECIFIED); } - lp_set_cmdline("torture:userdomain", cmdline_get_userdomain()); + lp_set_cmdline("torture:userdomain", cli_credentials_get_domain(cmdline_credentials)); } if (!lp_parm_string(-1,"torture","password")) { - lp_set_cmdline("torture:password", cmdline_get_userpassword()); + lp_set_cmdline("torture:password", cli_credentials_get_password(cmdline_credentials)); } if (argc_new == 0) { |