oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Add option password-file, read password from the first line of a file.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17245 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-04-25 21:21:23 +00:00
parent a2380d5c14
commit 594b3f5d86
1 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
kuser/kinit.c
View File

@@ -68,6 +68,7 @@ int do_afslog = -1;
int get_v4_tgt = -1; int get_v4_tgt = -1;
int convert_524 = 0; int convert_524 = 0;
int fcache_version; int fcache_version;
char *password_file = NULL;
char *pk_user_id = NULL; char *pk_user_id = NULL;
char *pk_x509_anchors = NULL; char *pk_x509_anchors = NULL;
char **pk_x509_pool = NULL; char **pk_x509_pool = NULL;
@@ -149,6 +150,9 @@ static struct getargs args[] = {
{ "request-pac", 0, arg_flag, &pac_flag, { "request-pac", 0, arg_flag, &pac_flag,
"request a Windows PAC" }, "request a Windows PAC" },
{ "password-file", 0, arg_string, &password_file,
"read the password from a file" },
#ifdef PKINIT #ifdef PKINIT
{ "pk-user", 'C', arg_string, &pk_user_id, { "pk-user", 'C', arg_string, &pk_user_id,
"principal's public/private/certificate identifier", "principal's public/private/certificate identifier",
@@ -443,6 +447,20 @@ get_new_tickets(krb5_context context,
krb5_deltat renew = 0; krb5_deltat renew = 0;
char *renewstr = NULL; char *renewstr = NULL;
passwd[0] = '\0';
if (password_file) {
FILE *f;
f = fopen(password_file, "r");
if (fgets(passwd, sizeof(passwd), f) == NULL)
krb5_errx(context, 1,
"failed to read password from file %s", password_file);
fclose(f);
passwd[strcspn(passwd, "\n")] = '\0';
}
memset(&cred, 0, sizeof(cred)); memset(&cred, 0, sizeof(cred));
ret = krb5_get_init_creds_opt_alloc (context, &opt); ret = krb5_get_init_creds_opt_alloc (context, &opt);
@@ -543,7 +561,7 @@ get_new_tickets(krb5_context context,
ret = krb5_get_init_creds_password (context, ret = krb5_get_init_creds_password (context,
&cred, &cred,
principal, principal,
NULL, passwd,
krb5_prompter_posix, krb5_prompter_posix,
NULL, NULL,
start_time, start_time,
@@ -554,18 +572,21 @@ get_new_tickets(krb5_context context,
krb5_get_init_creds_opt_free(opt); krb5_get_init_creds_opt_free(opt);
return 0; return 0;
} else { } else {
char *p, *prompt;
krb5_unparse_name (context, principal, &p); if (passwd[0] == '\0') {
asprintf (&prompt, "%s's Password: ", p); char *p, *prompt;
free (p);
if (UI_UTIL_read_pw_string(passwd, sizeof(passwd)-1, prompt, 0)){ krb5_unparse_name (context, principal, &p);
memset(passwd, 0, sizeof(passwd)); asprintf (&prompt, "%s's Password: ", p);
exit(1); free (p);
if (UI_UTIL_read_pw_string(passwd, sizeof(passwd)-1, prompt, 0)){
memset(passwd, 0, sizeof(passwd));
exit(1);
}
free (prompt);
} }
free (prompt);
ret = krb5_get_init_creds_password (context, ret = krb5_get_init_creds_password (context,
&cred, &cred,