sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

net: add "-k" switch for kerberos authentication (in preparation for #5416).

Browse Source 
Guenther
(This used to be commit 4cce94d464)
This commit is contained in:
Günther Deschner
2008-07-30 21:37:09 +02:00
parent 536c26aa02
commit 6913f986f4
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source3/utils/net.c
View File

@ -636,6 +636,7 @@ static struct functable net_func[] = {
{"stdin", 'i', POPT_ARG_NONE, &c->opt_stdin}, {"stdin", 'i', POPT_ARG_NONE, &c->opt_stdin},
{"timeout", 't', POPT_ARG_INT, &c->opt_timeout}, {"timeout", 't', POPT_ARG_INT, &c->opt_timeout},
{"machine-pass",'P', POPT_ARG_NONE, &c->opt_machine_pass}, {"machine-pass",'P', POPT_ARG_NONE, &c->opt_machine_pass},
{"kerberos", 'k', POPT_ARG_NONE, &c->opt_kerberos},
{"myworkgroup", 'W', POPT_ARG_STRING, &c->opt_workgroup}, {"myworkgroup", 'W', POPT_ARG_STRING, &c->opt_workgroup},
{"verbose", 'v', POPT_ARG_NONE, &c->opt_verbose}, {"verbose", 'v', POPT_ARG_NONE, &c->opt_verbose},
{"test", 'T', POPT_ARG_NONE, &c->opt_testmode}, {"test", 'T', POPT_ARG_NONE, &c->opt_testmode},

1
source3/utils/net.h
View File

@ -56,6 +56,7 @@ struct net_context {
const char *opt_exclude; const char *opt_exclude;
const char *opt_destination; const char *opt_destination;
int opt_testmode; int opt_testmode;
bool opt_kerberos;
int opt_have_ip; int opt_have_ip;
struct sockaddr_storage opt_dest_ip; struct sockaddr_storage opt_dest_ip;

3
source3/utils/net_help_common.c
View File

@ -48,7 +48,8 @@ int net_common_flags_usage(struct net_context *c, int argc, const char **argv)
d_printf("\t-l or --long\t\t\tDisplay full information\n"); d_printf("\t-l or --long\t\t\tDisplay full information\n");
d_printf("\t-V or --version\t\t\tPrint samba version information\n"); d_printf("\t-V or --version\t\t\tPrint samba version information\n");
d_printf("\t-P or --machine-pass\t\tAuthenticate as machine account\n"); d_printf("\t-P or --machine-pass\t\tAuthenticate as machine account\n");
d_printf("\t-e or --encrypt\t\tEncrypt SMB transport (UNIX extended servers only)\n"); d_printf("\t-e or --encrypt\t\t\tEncrypt SMB transport (UNIX extended servers only)\n");
d_printf("\t-k or --kerberos\t\tUse kerberos (active directory) authentication\n");
return -1; return -1;
} }

16
source3/utils/net_util.c
View File

@ -94,17 +94,23 @@ NTSTATUS connect_to_service(struct net_context *c,
const char *service_type) const char *service_type)
{ {
NTSTATUS nt_status; NTSTATUS nt_status;
int flags = 0;
c->opt_password = net_prompt_pass(c, c->opt_user_name); c->opt_password = net_prompt_pass(c, c->opt_user_name);
if (!c->opt_password) {
return NT_STATUS_NO_MEMORY; if (c->opt_kerberos) {
flags |= CLI_FULL_CONNECTION_USE_KERBEROS;
}
if (c->opt_kerberos && c->opt_password) {
flags |= CLI_FULL_CONNECTION_FALLBACK_AFTER_KERBEROS;
} }
nt_status = cli_full_connection(cli_ctx, NULL, server_name, nt_status = cli_full_connection(cli_ctx, NULL, server_name,
server_ss, c->opt_port, server_ss, c->opt_port,
service_name, service_type, service_name, service_type,
c->opt_user_name, c->opt_workgroup, c->opt_user_name, c->opt_workgroup,
c->opt_password, 0, Undefined, NULL); c->opt_password, flags, Undefined, NULL);
if (!NT_STATUS_IS_OK(nt_status)) { if (!NT_STATUS_IS_OK(nt_status)) {
d_fprintf(stderr, "Could not connect to server %s\n", server_name); d_fprintf(stderr, "Could not connect to server %s\n", server_name);
@ -538,6 +544,10 @@ const char *net_prompt_pass(struct net_context *c, const char *user)
return NULL; return NULL;
} }
if (c->opt_kerberos && !c->opt_user_specified) {
return NULL;
}
asprintf(&prompt, "Enter %s's password:", user); asprintf(&prompt, "Enter %s's password:", user);
if (!prompt) { if (!prompt) {
return NULL; return NULL;