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

New option `-p' and prompt

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2086 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-07-09 01:51:10 +00:00
parent ddfa9ee032
commit f43172b73b
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
kuser/kinit.c
View File

@@ -4,7 +4,7 @@ RCSID("$Id$");
static void static void
usage (void) usage (void)
{ {
errx (1, "Usage: %s [-f] [principal]", __progname); errx (1, "Usage: %s [-f] [-p] [principal]", __progname);
} }
int int
@@ -16,19 +16,24 @@ main (int argc, char **argv)
krb5_principal principal; krb5_principal principal;
krb5_principal server; krb5_principal server;
krb5_creds cred; krb5_creds cred;
krb5_preauthtype pre_auth[] = {KRB5_PADATA_ENC_TIMESTAMP}; krb5_preauthtype pre_auth_types[] = {KRB5_PADATA_ENC_TIMESTAMP};
int c; int c;
int forwardable = 0; int forwardable = 0;
krb5_flags options = 0; krb5_flags options = 0;
char *realm;
int preauth = 1;
set_progname (argv[0]); set_progname (argv[0]);
while ((c = getopt (argc, argv, "f")) != EOF) { while ((c = getopt (argc, argv, "fp")) != EOF) {
switch (c) { switch (c) {
case 'f': case 'f':
forwardable = 1; forwardable = 1;
options = 1; /* XXX */ options = 1; /* XXX */
break; break;
case 'p':
preauth = 0;
break;
default: default:
usage (); usage ();
} }
@@ -36,7 +41,6 @@ main (int argc, char **argv)
argc -= optind; argc -= optind;
argv += optind; argv += optind;
err = krb5_init_context (&context); err = krb5_init_context (&context);
if (err) if (err)
errx (1, "krb5_init_context: %s", krb5_get_err_text(context, err)); errx (1, "krb5_init_context: %s", krb5_get_err_text(context, err));
@@ -45,19 +49,19 @@ main (int argc, char **argv)
if (err) if (err)
errx (1, "krb5_cc_default: %s", krb5_get_err_text(context, err)); errx (1, "krb5_cc_default: %s", krb5_get_err_text(context, err));
err = krb5_get_default_realm (context, &realm);
if (err)
errx (1, "krb5_get_default_realm: %s",
krb5_get_err_text(context, err));
if(argv[0]){ if(argv[0]){
err = krb5_parse_name (context, argv[0], &principal); err = krb5_parse_name (context, argv[0], &principal);
if (err) if (err)
errx (1, "krb5_parse_name: %s", krb5_get_err_text(context, err)); errx (1, "krb5_parse_name: %s", krb5_get_err_text(context, err));
fprintf (stderr, "%s@%s's ", argv[0], realm);
}else{ }else{
char *realm;
struct passwd *pw; struct passwd *pw;
err = krb5_get_default_realm (context, &realm);
if (err)
errx (1, "krb5_get_default_realm: %s",
krb5_get_err_text(context, err));
pw = getpwuid(getuid()); pw = getpwuid(getuid());
err = krb5_build_principal(context, &principal, err = krb5_build_principal(context, &principal,
strlen(realm), realm, strlen(realm), realm,
@@ -65,8 +69,9 @@ main (int argc, char **argv)
if (err) if (err)
errx (1, "krb5_build_principal: %s", errx (1, "krb5_build_principal: %s",
krb5_get_err_text(context, err)); krb5_get_err_text(context, err));
free(realm); fprintf (stderr, "%s@%s's ", pw->pw_name, realm);
} }
free(realm);
err = krb5_cc_initialize (context, ccache, principal); err = krb5_cc_initialize (context, ccache, principal);
if (err) if (err)
@@ -109,7 +114,7 @@ main (int argc, char **argv)
options, options,
NULL, NULL,
NULL, NULL,
/*NULL*/ pre_auth, preauth ? pre_auth_types : NULL,
NULL, NULL,
ccache, ccache,
&cred, &cred,