diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-05-26 09:26:47 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-05-26 09:26:47 +1000 |
| commit | ecdad56b6eedad4a4d8031477827c522cdf6d76e (patch) | |
| tree | ee924581609a5ddfca9992630502a53f7540db87 /source3/utils/net_util.c | |
| parent | e15027155d3d880abde83124e252b3dd10a9aae4 (diff) | |
| parent | 714acfac013a46c3677c3eb72ad57db6d97c7d61 (diff) | |
| download | samba-ecdad56b6eedad4a4d8031477827c522cdf6d76e.tar.gz samba-ecdad56b6eedad4a4d8031477827c522cdf6d76e.tar.bz2 samba-ecdad56b6eedad4a4d8031477827c522cdf6d76e.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/utils/net_util.c')
| -rw-r--r-- | source3/utils/net_util.c | 109 |
1 files changed, 18 insertions, 91 deletions
diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c index 8bf9aac6f2..50f3c1db01 100644 --- a/source3/utils/net_util.c +++ b/source3/utils/net_util.c @@ -96,22 +96,22 @@ NTSTATUS connect_to_service(struct net_context *c, { NTSTATUS nt_status; int flags = 0; + struct user_auth_info *ai = c->auth_info; - c->opt_password = net_prompt_pass(c, c->opt_user_name); + set_cmdline_auth_info_getpass(ai); - if (c->opt_kerberos) { - flags |= CLI_FULL_CONNECTION_USE_KERBEROS; - } - - if (c->opt_kerberos && c->opt_password) { - flags |= CLI_FULL_CONNECTION_FALLBACK_AFTER_KERBEROS; + if (get_cmdline_auth_info_use_kerberos(ai)) { + flags |= CLI_FULL_CONNECTION_USE_KERBEROS | + CLI_FULL_CONNECTION_FALLBACK_AFTER_KERBEROS; } nt_status = cli_full_connection(cli_ctx, NULL, server_name, server_ss, c->opt_port, service_name, service_type, - c->opt_user_name, c->opt_workgroup, - c->opt_password, flags, Undefined, NULL); + get_cmdline_auth_info_username(ai), + c->opt_workgroup, + get_cmdline_auth_info_password(ai), + flags, Undefined, NULL); if (!NT_STATUS_IS_OK(nt_status)) { d_fprintf(stderr, "Could not connect to server %s\n", server_name); @@ -131,10 +131,10 @@ NTSTATUS connect_to_service(struct net_context *c, return nt_status; } - if (c->smb_encrypt) { + if (get_cmdline_auth_info_smb_encrypt(ai)) { nt_status = cli_force_encryption(*cli_ctx, - c->opt_user_name, - c->opt_password, + get_cmdline_auth_info_username(ai), + get_cmdline_auth_info_password(ai), c->opt_workgroup); if (NT_STATUS_EQUAL(nt_status,NT_STATUS_NOT_SUPPORTED)) { @@ -234,14 +234,12 @@ NTSTATUS connect_to_ipc_krb5(struct net_context *c, { NTSTATUS nt_status; char *user_and_realm = NULL; + struct user_auth_info *ai = c->auth_info; /* FIXME: Should get existing kerberos ticket if possible. */ - c->opt_password = net_prompt_pass(c, c->opt_user_name); - if (!c->opt_password) { - return NT_STATUS_NO_MEMORY; - } + set_cmdline_auth_info_getpass(ai); - user_and_realm = get_user_and_realm(c->opt_user_name); + user_and_realm = get_user_and_realm(get_cmdline_auth_info_username(ai)); if (!user_and_realm) { return NT_STATUS_NO_MEMORY; } @@ -250,7 +248,7 @@ NTSTATUS connect_to_ipc_krb5(struct net_context *c, server_ss, c->opt_port, "IPC$", "IPC", user_and_realm, c->opt_workgroup, - c->opt_password, + get_cmdline_auth_info_password(ai), CLI_FULL_CONNECTION_USE_KERBEROS, Undefined, NULL); @@ -261,10 +259,10 @@ NTSTATUS connect_to_ipc_krb5(struct net_context *c, return nt_status; } - if (c->smb_encrypt) { + if (get_cmdline_auth_info_smb_encrypt(ai)) { nt_status = cli_cm_force_encryption(*cli_ctx, user_and_realm, - c->opt_password, + get_cmdline_auth_info_password(ai), c->opt_workgroup, "IPC$"); if (!NT_STATUS_IS_OK(nt_status)) { @@ -328,50 +326,6 @@ NTSTATUS connect_dst_pipe(struct net_context *c, struct cli_state **cli_dst, return nt_status; } -/**************************************************************************** - Use the local machine account (krb) and password for this session. -****************************************************************************/ - -int net_use_krb_machine_account(struct net_context *c) -{ - char *user_name = NULL; - - if (!secrets_init()) { - d_fprintf(stderr, "ERROR: Unable to open secrets database\n"); - exit(1); - } - - c->opt_password = secrets_fetch_machine_password( - c->opt_target_workgroup, NULL, NULL); - if (asprintf(&user_name, "%s$@%s", global_myname(), lp_realm()) == -1) { - return -1; - } - c->opt_user_name = user_name; - return 0; -} - -/**************************************************************************** - Use the machine account name and password for this session. -****************************************************************************/ - -int net_use_machine_account(struct net_context *c) -{ - char *user_name = NULL; - - if (!secrets_init()) { - d_fprintf(stderr, "ERROR: Unable to open secrets database\n"); - exit(1); - } - - c->opt_password = secrets_fetch_machine_password( - c->opt_target_workgroup, NULL, NULL); - if (asprintf(&user_name, "%s$", global_myname()) == -1) { - return -1; - } - c->opt_user_name = user_name; - return 0; -} - bool net_find_server(struct net_context *c, const char *domain, unsigned flags, @@ -535,33 +489,6 @@ done: /**************************************************************************** ****************************************************************************/ -const char *net_prompt_pass(struct net_context *c, const char *user) -{ - char *prompt = NULL; - const char *pass = NULL; - - if (c->opt_password) { - return c->opt_password; - } - - if (c->opt_machine_pass) { - return NULL; - } - - if (c->opt_kerberos && !c->opt_user_specified) { - return NULL; - } - - if (asprintf(&prompt, "Enter %s's password:", user) == -1) { - return NULL; - } - - pass = getpass(prompt); - SAFE_FREE(prompt); - - return pass; -} - int net_run_function(struct net_context *c, int argc, const char **argv, const char *whoami, struct functable *table) { |