diff options
author | Volker Lendecke <vl@samba.org> | 2008-04-25 16:34:11 +0200 |
---|---|---|
committer | Volker Lendecke <vl@samba.org> | 2008-04-25 16:34:11 +0200 |
commit | 3312c93cc6760b1ebdfcd7a2b1508b23a780173c (patch) | |
tree | abdf469dc1dccf2b68015847f5ac2a640ba75ba4 | |
parent | b71e9eafc9f4806365446aa65a6b67e6dac5286e (diff) | |
download | samba-3312c93cc6760b1ebdfcd7a2b1508b23a780173c.tar.gz samba-3312c93cc6760b1ebdfcd7a2b1508b23a780173c.tar.xz samba-3312c93cc6760b1ebdfcd7a2b1508b23a780173c.zip |
Revert "Use rpc_pipe_client->user_name instead of rpc_pipe_client->cli->user_name"
This reverts commit 3f6c5b99664a75a6f490ee3b6980b89cacf7f579.
-rw-r--r-- | source/libads/ldap_printer.c | 2 | ||||
-rw-r--r-- | source/rpc_client/cli_pipe.c | 19 | ||||
-rw-r--r-- | source/utils/net_rpc_printer.c | 6 |
3 files changed, 6 insertions, 21 deletions
diff --git a/source/libads/ldap_printer.c b/source/libads/ldap_printer.c index 6682ec24d08..440f979781e 100644 --- a/source/libads/ldap_printer.c +++ b/source/libads/ldap_printer.c @@ -296,7 +296,7 @@ WERROR get_remote_printer_publishing_data(struct rpc_pipe_client *cli, result = rpccli_spoolss_open_printer_ex(cli, mem_ctx, printername, "", MAXIMUM_ALLOWED_ACCESS, - servername, cli->user_name, &pol); + servername, cli->cli->user_name, &pol); if (!W_ERROR_IS_OK(result)) { DEBUG(3, ("Unable to open printer %s, error is %s.\n", printername, dos_errstr(result))); diff --git a/source/rpc_client/cli_pipe.c b/source/rpc_client/cli_pipe.c index bc9a4268d0f..64fcc16bde3 100644 --- a/source/rpc_client/cli_pipe.c +++ b/source/rpc_client/cli_pipe.c @@ -2275,15 +2275,6 @@ struct rpc_pipe_client *cli_rpc_pipe_open_noauth(struct cli_state *cli, int pipe return NULL; } - result->domain = talloc_strdup(result, cli->domain); - result->user_name = talloc_strdup(result, cli->user_name); - - if ((result->domain == NULL) || (result->user_name == NULL)) { - *perr = NT_STATUS_NO_MEMORY; - cli_rpc_pipe_close(result); - return NULL; - } - *perr = rpc_pipe_bind(result, PIPE_AUTH_TYPE_NONE, PIPE_AUTH_LEVEL_NONE); if (!NT_STATUS_IS_OK(*perr)) { int lvl = 0; @@ -2339,14 +2330,8 @@ static struct rpc_pipe_client *cli_rpc_pipe_open_ntlmssp_internal(struct cli_sta result->auth.cli_auth_data_free_func = cli_ntlmssp_auth_free; - result->domain = talloc_strdup(result, domain); - result->user_name = talloc_strdup(result, username); - - if ((result->domain == NULL) || (result->user_name == NULL)) { - *perr = NT_STATUS_NO_MEMORY; - goto err; - } - + result->domain = domain; + result->user_name = username; pwd_set_cleartext(&result->pwd, password); *perr = ntlmssp_client_start(&ntlmssp_state); diff --git a/source/utils/net_rpc_printer.c b/source/utils/net_rpc_printer.c index 9dc409123e7..80140792a3b 100644 --- a/source/utils/net_rpc_printer.c +++ b/source/utils/net_rpc_printer.c @@ -994,7 +994,7 @@ static bool get_printer_info(struct rpc_pipe_client *pipe_hnd, /* argument given, get a single printer by name */ if (!net_spoolss_open_printer_ex(pipe_hnd, mem_ctx, argv[0], - MAXIMUM_ALLOWED_ACCESS, pipe_hnd->user_name, &hnd)) + MAXIMUM_ALLOWED_ACCESS, pipe_hnd->cli->user_name, &hnd)) return False; if (!net_spoolss_getprinter(pipe_hnd, mem_ctx, &hnd, level, ctr)) { @@ -1190,7 +1190,7 @@ static NTSTATUS rpc_printer_publish_internals_args(struct rpc_pipe_client *pipe_ /* open printer handle */ if (!net_spoolss_open_printer_ex(pipe_hnd, mem_ctx, sharename, - PRINTER_ALL_ACCESS, pipe_hnd->user_name, &hnd)) + PRINTER_ALL_ACCESS, pipe_hnd->cli->user_name, &hnd)) goto done; got_hnd = True; @@ -1838,7 +1838,7 @@ NTSTATUS rpc_printer_migrate_drivers_internals(const DOM_SID *domain_sid, /* open src printer handle */ if (!net_spoolss_open_printer_ex(pipe_hnd, mem_ctx, sharename, - MAXIMUM_ALLOWED_ACCESS, pipe_hnd->user_name, &hnd_src)) + MAXIMUM_ALLOWED_ACCESS, pipe_hnd->cli->user_name, &hnd_src)) goto done; got_hnd_src = True; |