(main): handle krb5_init_context failure consistently
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9443 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -129,7 +129,9 @@ main(int argc, char **argv)
|
||||
int optind = 0;
|
||||
krb5_error_code ret;
|
||||
set_progname(argv[0]);
|
||||
krb5_init_context(&context);
|
||||
ret = krb5_init_context(&context);
|
||||
if (ret)
|
||||
errx (1, "krb5_init_context failed: %d", ret);
|
||||
if(getarg(args, num_args, argc, argv, &optind))
|
||||
usage(1);
|
||||
if(help_flag)
|
||||
|
@@ -190,7 +190,9 @@ main(int argc, char **argv)
|
||||
exit(0);
|
||||
}
|
||||
|
||||
krb5_init_context(&context);
|
||||
ret = krb5_init_context(&context);
|
||||
if (ret)
|
||||
errx (1, "krb5_init_context failed: %d", ret);
|
||||
if(!k_hasafs())
|
||||
krb5_errx(context, 1,
|
||||
"AFS doesn't seem to be present on this machine");
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997 - 1999 Kungliga Tekniska H<>gskolan
|
||||
* Copyright (c) 1997 - 2000 Kungliga Tekniska H<>gskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
@@ -75,7 +75,7 @@ client_setup(krb5_context *context, int *argc, char **argv)
|
||||
|
||||
status = krb5_init_context (context);
|
||||
if (status)
|
||||
errx(1, "krb5_init_context failed: %u", status);
|
||||
errx(1, "krb5_init_context failed: %d", status);
|
||||
|
||||
forwardable = krb5_config_get_bool (*context, NULL,
|
||||
"libdefaults",
|
||||
|
@@ -659,7 +659,13 @@ main(int argc, char **argv)
|
||||
set_progname(argv[0]);
|
||||
|
||||
#ifdef KRB5
|
||||
krb5_init_context(&context);
|
||||
{
|
||||
krb5_error_code ret;
|
||||
|
||||
ret = krb5_init_context(&context);
|
||||
if (ret)
|
||||
errx (1, "krb5_init_context failed: %d", ret);
|
||||
}
|
||||
#endif
|
||||
|
||||
openlog("login", LOG_ODELAY, LOG_AUTH);
|
||||
|
@@ -717,7 +717,13 @@ main(int argc, char **argv)
|
||||
set_progname (argv[0]);
|
||||
|
||||
#ifdef KRB5
|
||||
krb5_init_context (&context);
|
||||
{
|
||||
krb5_error_code ret;
|
||||
|
||||
ret = krb5_init_context (&context);
|
||||
if (ret)
|
||||
errx (1, "krb5_init_context failed: %d", ret);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (getarg (args, sizeof(args) / sizeof(args[0]), argc, argv,
|
||||
|
@@ -845,7 +845,7 @@ main(int argc, char **argv)
|
||||
|
||||
status = krb5_init_context (&context);
|
||||
if (status)
|
||||
errx(1, "krb5_init_context failed: %u", status);
|
||||
errx(1, "krb5_init_context failed: %d", status);
|
||||
|
||||
if (getarg (args, sizeof(args) / sizeof(args[0]), argc, argv,
|
||||
&optind))
|
||||
|
@@ -871,7 +871,13 @@ main(int argc, char **argv)
|
||||
}
|
||||
|
||||
#ifdef KRB5
|
||||
krb5_init_context (&context);
|
||||
{
|
||||
krb5_error_code ret;
|
||||
|
||||
ret = krb5_init_context (&context);
|
||||
if (ret)
|
||||
errx (1, "krb5_init_context failed: %d", ret);
|
||||
}
|
||||
#endif
|
||||
|
||||
if(port_str) {
|
||||
|
@@ -985,8 +985,12 @@ main (int argc, char **argv)
|
||||
#endif
|
||||
#ifdef KRB5
|
||||
{
|
||||
krb5_error_code ret;
|
||||
char *str;
|
||||
krb5_init_context(&context);
|
||||
|
||||
ret = krb5_init_context(&context);
|
||||
if (ret)
|
||||
errx (1, "krb5_init_context failed: %d", ret);
|
||||
krb5_get_default_principal(context, &client);
|
||||
krb5_unparse_name(context, client, &str);
|
||||
snprintf(userprompt, sizeof(userprompt), "User: %s", str);
|
||||
|
@@ -224,7 +224,9 @@ main(int argc, char **argv)
|
||||
|
||||
set_progname(argv[0]);
|
||||
|
||||
krb5_init_context(&context);
|
||||
ret = krb5_init_context(&context);
|
||||
if (ret)
|
||||
errx (1, "krb5_init_context failed: %d", ret);
|
||||
|
||||
while((e = getarg(args, num_args, argc, argv, &optind)))
|
||||
errx(1, "error at argument `%s'", argv[optind]);
|
||||
|
@@ -100,7 +100,9 @@ main(int argc, char **argv)
|
||||
|
||||
set_progname(argv[0]);
|
||||
|
||||
krb5_init_context(&context);
|
||||
ret = krb5_init_context(&context);
|
||||
if (ret)
|
||||
errx (1, "krb5_init_context failed: %d", ret);
|
||||
|
||||
ret = krb5_openlog(context, "kadmind", &logf);
|
||||
ret = krb5_set_warn_dest(context, logf);
|
||||
|
@@ -50,7 +50,9 @@ main(int argc, char **argv)
|
||||
krb5_error_code ret;
|
||||
set_progname(argv[0]);
|
||||
|
||||
krb5_init_context(&context);
|
||||
ret = krb5_init_context(&context);
|
||||
if (ret)
|
||||
errx (1, "krb5_init_context failed: %d", ret);
|
||||
|
||||
configure(argc, argv);
|
||||
|
||||
|
@@ -87,7 +87,7 @@ main (int argc, char **argv)
|
||||
|
||||
ret = krb5_init_context (&context);
|
||||
if (ret)
|
||||
errx (1, "krb5_init_context: %s", krb5_get_err_text(context, ret));
|
||||
errx (1, "krb5_init_context failed: %d", ret);
|
||||
|
||||
if(argv[0]) {
|
||||
ret = krb5_parse_name (context, argv[0], &principal);
|
||||
|
@@ -107,7 +107,7 @@ main(int argc, char **argv)
|
||||
|
||||
ret = krb5_init_context (&context);
|
||||
if (ret)
|
||||
errx(1, "krb5_init_context failed: %u", ret);
|
||||
errx(1, "krb5_init_context failed: %d", ret);
|
||||
|
||||
if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
|
||||
usage(1);
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 1998, 1999 Kungliga Tekniska H<>gskolan
|
||||
* Copyright (c) 1997 - 2000 Kungliga Tekniska H<>gskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
@@ -89,7 +89,7 @@ main (int argc, char **argv)
|
||||
|
||||
ret = krb5_init_context (&context);
|
||||
if (ret)
|
||||
errx (1, "krb5_init_context: %s", krb5_get_err_text(context, ret));
|
||||
errx (1, "krb5_init_context failed: %d", ret);
|
||||
|
||||
if(cache == NULL)
|
||||
cache = krb5_cc_default_name(context);
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997 - 1999 Kungliga Tekniska H<>gskolan
|
||||
* Copyright (c) 1997 - 2000 Kungliga Tekniska H<>gskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
@@ -69,7 +69,7 @@ main(int argc, char **argv)
|
||||
|
||||
ret = krb5_init_context (&context);
|
||||
if (ret)
|
||||
errx(1, "krb5_init_context failed: %u", ret);
|
||||
errx(1, "krb5_init_context failed: %d", ret);
|
||||
|
||||
if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
|
||||
usage(1);
|
||||
|
@@ -344,7 +344,7 @@ main (int argc, char **argv)
|
||||
|
||||
ret = krb5_init_context (&context);
|
||||
if (ret)
|
||||
errx(1, "krb5_init_context failed: %u", ret);
|
||||
errx(1, "krb5_init_context failed: %d", ret);
|
||||
|
||||
forwardable_flag = krb5_config_get_bool (context, NULL,
|
||||
"libdefaults",
|
||||
|
@@ -540,7 +540,7 @@ display_v5_ccache (const char *cred_cache, int do_test, int do_verbose,
|
||||
|
||||
ret = krb5_init_context (&context);
|
||||
if (ret)
|
||||
krb5_err(context, 1, ret, "krb5_init_context");
|
||||
errx (1, "krb5_init_context failed: %d", ret);
|
||||
|
||||
if(cred_cache) {
|
||||
ret = krb5_cc_resolve(context, cred_cache, &ccache);
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan
|
||||
* Copyright (c) 1997 - 2000 Kungliga Tekniska H<>gskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
@@ -45,7 +45,9 @@ main(int argc, char **argv)
|
||||
krb5_get_init_creds_opt get_options;
|
||||
krb5_verify_init_creds_opt verify_options;
|
||||
|
||||
krb5_init_context(&context);
|
||||
ret = krb5_init_context(&context);
|
||||
if (ret)
|
||||
errx (1, "krb5_init_context failed: %d", ret);
|
||||
|
||||
krb5_get_init_creds_opt_init (&get_options);
|
||||
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1999 Kungliga Tekniska H<>gskolan
|
||||
* Copyright (c) 1999 - 2000 Kungliga Tekniska H<>gskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
@@ -150,7 +150,7 @@ main(int argc, char **argv)
|
||||
|
||||
ret = krb5_init_context(&context);
|
||||
if(ret != 0)
|
||||
krb5_err(NULL, 1, ret, "krb5_init_context");
|
||||
errx(1, "krb5_init_context failed: %d", ret);
|
||||
|
||||
ret = hdb_create(context, &db, old_database);
|
||||
if(ret != 0)
|
||||
|
@@ -2874,8 +2874,11 @@ main()
|
||||
krb5_keyblock key;
|
||||
char constant[4];
|
||||
unsigned usage = ENCRYPTION_USAGE(3);
|
||||
krb5_error_code ret;
|
||||
|
||||
krb5_init_context(&context);
|
||||
ret = krb5_init_context(&context);
|
||||
if (ret)
|
||||
errx (1, "krb5_init_context failed: %d", ret);
|
||||
|
||||
key.keytype = ETYPE_NEW_DES3_CBC_SHA1;
|
||||
key.keyvalue.data = "\xb3\x85\x58\x94\xd9\xdc\x7c\xc8"
|
||||
@@ -2898,12 +2901,14 @@ main()
|
||||
krb5_crypto crypto;
|
||||
struct key_data *d;
|
||||
krb5_keyblock key;
|
||||
|
||||
krb5_error_code ret;
|
||||
Checksum res;
|
||||
|
||||
char *data = "what do ya want for nothing?";
|
||||
|
||||
krb5_init_context(&context);
|
||||
ret = krb5_init_context(&context);
|
||||
if (ret)
|
||||
errx (1, "krb5_init_context failed: %d", ret);
|
||||
|
||||
key.keytype = ETYPE_NEW_DES3_CBC_SHA1;
|
||||
key.keyvalue.data = "Jefe";
|
||||
|
@@ -74,7 +74,9 @@ main(int argc, char **argv)
|
||||
krb5_error_code ret;
|
||||
int val = 0;
|
||||
|
||||
krb5_init_context (&context);
|
||||
ret = krb5_init_context (&context);
|
||||
if (ret)
|
||||
errx (1, "krb5_init_context failed: %d", ret);
|
||||
|
||||
for (t = tests; t->principal_name; ++t) {
|
||||
krb5_keyblock key;
|
||||
|
@@ -56,7 +56,9 @@ main(int argc, char **argv)
|
||||
krb5_error_code ret;
|
||||
krb5_addresses addrs;
|
||||
|
||||
krb5_init_context(&context);
|
||||
ret = krb5_init_context(&context);
|
||||
if (ret)
|
||||
errx (1, "krb5_init_context failed: %d", ret);
|
||||
|
||||
ret = krb5_get_all_client_addrs (context, &addrs);
|
||||
if (ret)
|
||||
|
Reference in New Issue
Block a user