diff options
author | Andrew Bartlett <abartlet@samba.org> | 2005-03-22 08:00:45 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:11:11 -0500 |
commit | 645711c602313940dcf80ec786557920ecfbf884 (patch) | |
tree | 77c5f5c5f1285677eaaf7a3fa62bf0b2540e153f /source4/torture/masktest.c | |
parent | 376b03ebd895b221b70058ee18bea50587388182 (diff) | |
download | samba-645711c602313940dcf80ec786557920ecfbf884.tar.gz samba-645711c602313940dcf80ec786557920ecfbf884.tar.xz samba-645711c602313940dcf80ec786557920ecfbf884.zip |
r5941: Commit this patch much earlier than I would normally prefer, but metze needs a working tree...
The main volume of this patch was what I started working on today:
- Cleans up memory handling around DCE/RPC pipes, to have a parent talloc context.
- Uses sepereate inner loops for some of the DCE/RPC tests
The other and more important part of this patch fixes issues
surrounding the new credentials framwork:
This makes the struct cli_credentials always a talloc() structure,
rather than on the stack. Parts of the cli_credentials code already
assumed this.
There were other issues, particularly in the DCERPC over SMB handling,
as well as little things that had to be tidied up before test_w2k3.sh
would start to pass.
Andrew Bartlett
(This used to be commit 0453f9d05d2e336fba1f85dbf2718d01fa2bf778)
Diffstat (limited to 'source4/torture/masktest.c')
-rw-r--r-- | source4/torture/masktest.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c index 00a0c2688d8..d760934334b 100644 --- a/source4/torture/masktest.c +++ b/source4/torture/masktest.c @@ -25,7 +25,7 @@ #include "libcli/raw/libcliraw.h" #include "system/time.h" -static struct cli_credentials credentials; +static struct cli_credentials *credentials; static BOOL showall = False; static BOOL old_list = False; static const char *maskchars = "<>\"?*abc."; @@ -80,7 +80,7 @@ static struct smbcli_state *connect_one(char *share) status = smbcli_full_connection(NULL, &c, "masktest", server, share, NULL, - &credentials); + credentials); if (!NT_STATUS_IS_OK(status)) { return NULL; @@ -297,8 +297,8 @@ static void usage(void) lp_load(dyn_CONFIGFILE,True,False,False); load_interfaces(); - ZERO_STRUCT(credentials); - cli_credentials_guess(&credentials); + credentials = cli_credentials_init(talloc_autofree_context()); + cli_credentials_guess(credentials); seed = time(NULL); @@ -322,7 +322,7 @@ static void usage(void) lp_set_cmdline("max protocol", optarg); break; case 'U': - cli_credentials_parse_string(&credentials, optarg, CRED_SPECIFIED); + cli_credentials_parse_string(credentials, optarg, CRED_SPECIFIED); break; case 's': seed = atoi(optarg); |