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

Fix a lot of error messages.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3137 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-08-24 14:14:07 +00:00
parent 8e71be9037
commit 5553bfbd9d
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
kuser/kinit.c
View File

@@ -53,7 +53,7 @@ struct getargs args[] = {
{ "lifetime", 'l', arg_string, &lifetime, { "lifetime", 'l', arg_string, &lifetime,
"lifetime of tickets", "seconds"}, "lifetime of tickets", "seconds"},
{ "version", 0, arg_flag, &version_flag, { "version", 0, arg_flag, &version_flag,
"print version", NULL }, NULL, NULL },
{ "help", 0, arg_flag, &help_flag, { "help", 0, arg_flag, &help_flag,
NULL, NULL} NULL, NULL}
}; };
@@ -81,16 +81,18 @@ main (int argc, char **argv)
set_progname (argv[0]); set_progname (argv[0]);
memset(&cred, 0, sizeof(cred)); memset(&cred, 0, sizeof(cred));
ret = krb5_init_context (&context);
if (ret)
errx(1, "krb5_init_context failed: %u", ret);
if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind)) if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
usage(1); usage(1);
if (help_flag) if (help_flag)
usage (0); usage (0);
if(version_flag){ if(version_flag)
printf("%s (%s-%s)\n", __progname, PACKAGE, VERSION); krb5_errx(context, 0, "%s", heimdal_version);
exit(0);
}
krb5_get_init_creds_opt_init (&opt); krb5_get_init_creds_opt_init (&opt);
@@ -110,18 +112,14 @@ main (int argc, char **argv)
argc -= optind; argc -= optind;
argv += optind; argv += optind;
ret = krb5_init_context (&context);
if (ret)
errx (1, "krb5_init_context: %s", krb5_get_err_text(context, ret));
ret = krb5_cc_default (context, &ccache); ret = krb5_cc_default (context, &ccache);
if (ret) if (ret)
errx (1, "krb5_cc_default: %s", krb5_get_err_text(context, ret)); krb5_err (context, 1, ret, "krb5_cc_default");
if (argv[0]) { if (argv[0]) {
ret = krb5_parse_name (context, argv[0], &principal); ret = krb5_parse_name (context, argv[0], &principal);
if (ret) if (ret)
errx (1, "krb5_parse_name: %s", krb5_get_err_text(context, ret)); krb5_err (context, 1, ret, "krb5_parse_name");
} else } else
principal = NULL; principal = NULL;
@@ -134,17 +132,24 @@ main (int argc, char **argv)
0, 0,
NULL, NULL,
&opt); &opt);
if (ret) switch(ret){
errx (1, "krb5_get_init_creds: %s", krb5_get_err_text(context, ret)); case 0:
break;
case KRB5KRB_AP_ERR_BAD_INTEGRITY:
case KRB5KRB_AP_ERR_MODIFIED:
krb5_errx(context, 1, "Password incorrect");
break;
default:
krb5_err(context, 1, ret, "krb5_get_init_creds");
}
ret = krb5_cc_initialize (context, ccache, cred.client); ret = krb5_cc_initialize (context, ccache, cred.client);
if (ret) if (ret)
errx (1, "krb5_cc_initialize: %s", krb5_err (context, 1, ret, "krb5_cc_initialize");
krb5_get_err_text(context, ret));
ret = krb5_cc_store_cred (context, ccache, &cred); ret = krb5_cc_store_cred (context, ccache, &cred);
if (ret) if (ret)
errx (1, "krb5_cc_store_cred: %s", krb5_get_err_text(context, ret)); krb5_err (context, 1, ret, "krb5_cc_store_cred");
krb5_free_creds_contents (context, &cred); krb5_free_creds_contents (context, &cred);
krb5_cc_close (context, ccache); krb5_cc_close (context, ccache);
krb5_free_context (context); krb5_free_context (context);