From 633782864b5b71b8b3f515334842a7b24fc24686 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Sun, 31 Dec 2000 08:05:03 +0000
Subject: [PATCH] (main): handle krb5_init_context failure consistently

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9443 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 admin/ktutil.c                |  4 +++-
 appl/afsutil/afslog.c         |  4 +++-
 appl/kf/kf.c                  |  4 ++--
 appl/login/login.c            |  8 +++++++-
 appl/push/push.c              |  8 +++++++-
 appl/rsh/rsh.c                |  2 +-
 appl/rsh/rshd.c               |  8 +++++++-
 appl/xnlock/xnlock.c          |  6 +++++-
 kadmin/kadmin.c               |  4 +++-
 kadmin/kadmind.c              |  4 +++-
 kdc/main.c                    |  4 +++-
 kpasswd/kpasswd.c             |  2 +-
 kuser/kdecode_ticket.c        |  2 +-
 kuser/kdestroy.c              |  4 ++--
 kuser/kgetcred.c              |  4 ++--
 kuser/kinit.c                 |  2 +-
 kuser/klist.c                 |  2 +-
 kuser/kverify.c               |  6 ++++--
 lib/hdb/convert_db.c          |  4 ++--
 lib/krb5/crypto.c             | 11 ++++++++---
 lib/krb5/string-to-key-test.c |  4 +++-
 lib/krb5/test_get_addrs.c     |  4 +++-
 22 files changed, 72 insertions(+), 29 deletions(-)

diff --git a/admin/ktutil.c b/admin/ktutil.c
index bc85618b2..49d1d490a 100644
--- a/admin/ktutil.c
+++ b/admin/ktutil.c
@@ -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)
diff --git a/appl/afsutil/afslog.c b/appl/afsutil/afslog.c
index 7ae4ac4ae..93b3e6e89 100644
--- a/appl/afsutil/afslog.c
+++ b/appl/afsutil/afslog.c
@@ -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");
diff --git a/appl/kf/kf.c b/appl/kf/kf.c
index f4f1bcae7..ad1ae990e 100644
--- a/appl/kf/kf.c
+++ b/appl/kf/kf.c
@@ -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",
diff --git a/appl/login/login.c b/appl/login/login.c
index 84c135407..f2971a565 100644
--- a/appl/login/login.c
+++ b/appl/login/login.c
@@ -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);
diff --git a/appl/push/push.c b/appl/push/push.c
index 83977da26..e87807ed4 100644
--- a/appl/push/push.c
+++ b/appl/push/push.c
@@ -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,
diff --git a/appl/rsh/rsh.c b/appl/rsh/rsh.c
index e8857a838..7b3b674f4 100644
--- a/appl/rsh/rsh.c
+++ b/appl/rsh/rsh.c
@@ -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))
diff --git a/appl/rsh/rshd.c b/appl/rsh/rshd.c
index 708a5818f..44a1f9324 100644
--- a/appl/rsh/rshd.c
+++ b/appl/rsh/rshd.c
@@ -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) {
diff --git a/appl/xnlock/xnlock.c b/appl/xnlock/xnlock.c
index fb0c2f359..8f3c84945 100644
--- a/appl/xnlock/xnlock.c
+++ b/appl/xnlock/xnlock.c
@@ -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);
diff --git a/kadmin/kadmin.c b/kadmin/kadmin.c
index d584de867..71432b808 100644
--- a/kadmin/kadmin.c
+++ b/kadmin/kadmin.c
@@ -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]);
diff --git a/kadmin/kadmind.c b/kadmin/kadmind.c
index de5128a61..6a5affee7 100644
--- a/kadmin/kadmind.c
+++ b/kadmin/kadmind.c
@@ -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);
diff --git a/kdc/main.c b/kdc/main.c
index 2f72fd8be..1c12e3525 100644
--- a/kdc/main.c
+++ b/kdc/main.c
@@ -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);
 
diff --git a/kpasswd/kpasswd.c b/kpasswd/kpasswd.c
index 053e19ee5..249653056 100644
--- a/kpasswd/kpasswd.c
+++ b/kpasswd/kpasswd.c
@@ -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);
diff --git a/kuser/kdecode_ticket.c b/kuser/kdecode_ticket.c
index f0c91c867..f56d539da 100644
--- a/kuser/kdecode_ticket.c
+++ b/kuser/kdecode_ticket.c
@@ -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);
diff --git a/kuser/kdestroy.c b/kuser/kdestroy.c
index 9e75f8bab..5da45af58 100644
--- a/kuser/kdestroy.c
+++ b/kuser/kdestroy.c
@@ -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);
diff --git a/kuser/kgetcred.c b/kuser/kgetcred.c
index 3cd46d95e..41e959448 100644
--- a/kuser/kgetcred.c
+++ b/kuser/kgetcred.c
@@ -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);
diff --git a/kuser/kinit.c b/kuser/kinit.c
index b21088577..11380dd79 100644
--- a/kuser/kinit.c
+++ b/kuser/kinit.c
@@ -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",
diff --git a/kuser/klist.c b/kuser/klist.c
index 3c8c4f5fb..9939f0fc4 100644
--- a/kuser/klist.c
+++ b/kuser/klist.c
@@ -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);
diff --git a/kuser/kverify.c b/kuser/kverify.c
index 02c220df8..30e62bf4f 100644
--- a/kuser/kverify.c
+++ b/kuser/kverify.c
@@ -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);
 
diff --git a/lib/hdb/convert_db.c b/lib/hdb/convert_db.c
index 56ab03e10..f698452f3 100644
--- a/lib/hdb/convert_db.c
+++ b/lib/hdb/convert_db.c
@@ -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)
diff --git a/lib/krb5/crypto.c b/lib/krb5/crypto.c
index c03a19c18..c64a45500 100644
--- a/lib/krb5/crypto.c
+++ b/lib/krb5/crypto.c
@@ -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";
diff --git a/lib/krb5/string-to-key-test.c b/lib/krb5/string-to-key-test.c
index 2bd91a065..d929a3862 100644
--- a/lib/krb5/string-to-key-test.c
+++ b/lib/krb5/string-to-key-test.c
@@ -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;
diff --git a/lib/krb5/test_get_addrs.c b/lib/krb5/test_get_addrs.c
index 2f42bee75..7a0fa9ec4 100644
--- a/lib/krb5/test_get_addrs.c
+++ b/lib/krb5/test_get_addrs.c
@@ -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)