Apply patch from Mark Phalan to correctly use progname instead of

argv[0].

ticket: 6030
tags: pullup
target_version: 1.6.4

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20532 dc483132-0cff-0310-8789-dd5450dbe970

5 files changed, 65 insertions, 80 deletions

diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index 8fcb56e5a..ee45464b6 100644
--- a/src/kadmin/dbutil/dump.c
+++ b/src/kadmin/dbutil/dump.c
@@ -1091,7 +1091,6 @@ dump_db(argc, argv)
 {
     FILE		*f;
     struct dump_args	arglist;
-    char		*programname;
     char		*ofile;
     krb5_error_code	kret, retval;
     dump_version	*dump;
@@ -1105,9 +1104,6 @@ dump_db(argc, argv)
     /*
      * Parse the arguments.
      */
-    programname = argv[0];
-    if (strrchr(programname, (int) '/'))
-	programname = strrchr(argv[0], (int) '/') + 1;
     ofile = (char *) NULL;
     dump = &r1_3_version;
     arglist.verbose = 0;
@@ -1175,7 +1171,7 @@ dump_db(argc, argv)
      * to be opened if we try a dump that uses it.
      */
     if (!dbactive) {
-	com_err(argv[0], 0, Err_no_database);
+	com_err(progname, 0, Err_no_database);
 	exit_status++;
 	return;
     }
@@ -1193,7 +1189,7 @@ dump_db(argc, argv)
 						(char *) NULL, 0,
 						&master_keyblock);
 		    if (retval) {
-			    com_err(argv[0], retval,
+			    com_err(progname, retval,
 				    "while reading master key");
 			    exit(1);
 		    }
@@ -1201,7 +1197,7 @@ dump_db(argc, argv)
 						       master_princ,
 						       &master_keyblock);
 		    if (retval) {
-			    com_err(argv[0], retval,
+			    com_err(progname, retval,
 				    "while verifying master key");
 			    exit(1);
 		    }
@@ -1218,7 +1214,7 @@ dump_db(argc, argv)
 					     TRUE, 
 					     new_mkey_file, 0,
 					     &new_master_keyblock))) { 
-		    com_err(argv[0], retval, "while reading new master key");
+		    com_err(progname, retval, "while reading new master key");
 		    exit(1);
 	    }
     }
@@ -1244,7 +1240,7 @@ dump_db(argc, argv)
 	unlink(ofile);
 	if (!(f = fopen(ofile, "w"))) {
 	    fprintf(stderr, ofopen_error,
-		    programname, ofile, error_message(errno));
+		    progname, ofile, error_message(errno));
 	    exit_status++;
 	    return;
        }
@@ -1252,7 +1248,7 @@ dump_db(argc, argv)
 				   fileno(f),
 				   KRB5_LOCKMODE_EXCLUSIVE))) {
 	    fprintf(stderr, oflock_error,
-		    programname, ofile, error_message(kret));
+		    progname, ofile, error_message(kret));
 	    exit_status++;
 	}
 	else
@@ -1261,7 +1257,7 @@ dump_db(argc, argv)
 	f = stdout;
     }
     if (f && !(kret)) {
-	arglist.programname = programname;
+	arglist.programname = progname;
 	arglist.ofile = f;
 	arglist.kcontext = util_context;
 	fprintf(arglist.ofile, "%s", dump->header);
@@ -1270,7 +1266,7 @@ dump_db(argc, argv)
 	    if (ulog_map(util_context, global_params.iprop_logfile,
 			 global_params.iprop_ulogsize, FKCOMMAND, db_args)) {
 		fprintf(stderr,
-			_("%s: Could not map log\n"), programname);
+			_("%s: Could not map log\n"), progname);
 		exit_status++;
 		goto unlock_and_return;
 	    }
@@ -1281,7 +1277,7 @@ dump_db(argc, argv)
 	     */
 	    if (krb5_db_lock(util_context, KRB5_LOCKMODE_SHARED)) {
 		fprintf(stderr,
-			_("%s: Couldn't grab lock\n"), programname);
+			_("%s: Couldn't grab lock\n"), progname);
 		exit_status++;
 		goto unlock_and_return;
 	    }
@@ -1299,7 +1295,7 @@ dump_db(argc, argv)
 				    dump->dump_princ,
 				    (krb5_pointer) &arglist))) { /* TBD: backwards and recursive not supported */
 	     fprintf(stderr, dumprec_err,
-		     programname, dump->name, error_message(kret));
+		     progname, dump->name, error_message(kret));
 	     exit_status++;
 	     if (dump_sno)
 		 (void) krb5_db_unlock(util_context);
@@ -1307,7 +1303,7 @@ dump_db(argc, argv)
 	if (dump->dump_policy &&
 	    (kret = krb5_db_iter_policy( util_context, "*", dump->dump_policy,
 					 &arglist))) { 
-	     fprintf(stderr, dumprec_err, programname, dump->name,
+	     fprintf(stderr, dumprec_err, progname, dump->name,
 		     error_message(kret));
 	     exit_status++;
 	}
@@ -2249,7 +2245,6 @@ load_db(argc, argv)
     FILE		*f;
     extern char		*optarg;
     extern int		optind;
-    char		*programname;
     char		*dumpfile;
     char		*dbname;
     char		*dbname_tmp;
@@ -2267,9 +2262,6 @@ load_db(argc, argv)
     /*
      * Parse the arguments.
      */
-    programname = argv[0];
-    if (strrchr(programname, (int) '/'))
-	programname = strrchr(argv[0], (int) '/') + 1;
     dumpfile = (char *) NULL;
     dbname = global_params.dbname;
     load = NULL;
@@ -2318,7 +2310,7 @@ load_db(argc, argv)
 
     if (!(dbname_tmp = (char *) malloc(strlen(dbname)+
 				       strlen(dump_tmptrail)+1))) {
-	fprintf(stderr, no_name_mem_fmt, argv[0]);
+	fprintf(stderr, no_name_mem_fmt, progname);
 	exit_status++;
 	return;
     }
@@ -2329,7 +2321,7 @@ load_db(argc, argv)
      * Initialize the Kerberos context and error tables.
      */
     if ((kret = kadm5_init_krb5_context(&kcontext))) {
-	fprintf(stderr, ctx_err_fmt, programname);
+	fprintf(stderr, ctx_err_fmt, progname);
 	free(dbname_tmp);
 	exit_status++;
 	return;
@@ -2337,7 +2329,7 @@ load_db(argc, argv)
 
     if( (kret = krb5_set_default_realm(kcontext, util_context->default_realm)) )
     {
-	fprintf(stderr, "%s: Unable to set the default realm\n", programname);
+	fprintf(stderr, "%s: Unable to set the default realm\n", progname);
 	free(dbname_tmp);
 	exit_status++;
 	return;
@@ -2351,14 +2343,14 @@ load_db(argc, argv)
      */
     if (dumpfile) {
 	if ((f = fopen(dumpfile, "r")) == NULL) {
-	     fprintf(stderr, dfile_err_fmt, programname, dumpfile,
+	     fprintf(stderr, dfile_err_fmt, progname, dumpfile,
 		     error_message(errno)); 
 	     exit_status++;
 	     return;
 	}
 	if ((kret = krb5_lock_file(kcontext, fileno(f),
 				   KRB5_LOCKMODE_SHARED))) {
-	     fprintf(stderr, "%s: Cannot lock %s: %s\n", programname,
+	     fprintf(stderr, "%s: Cannot lock %s: %s\n", progname,
 		     dumpfile, error_message(errno));
 	     exit_status++;
 	     return;
@@ -2374,7 +2366,7 @@ load_db(argc, argv)
     if (load) {
 	 /* only check what we know; some headers only contain a prefix */
 	 if (strncmp(buf, load->header, strlen(load->header)) != 0) {
-	      fprintf(stderr, head_bad_fmt, programname, dumpfile);
+	      fprintf(stderr, head_bad_fmt, progname, dumpfile);
 	      exit_status++;
 	      if (dumpfile) fclose(f);
 	      return;
@@ -2393,7 +2385,7 @@ load_db(argc, argv)
 			  strlen(ov_version.header)) == 0)
 	      load = &ov_version;
 	 else {
-	      fprintf(stderr, head_bad_fmt, programname, dumpfile);
+	      fprintf(stderr, head_bad_fmt, progname, dumpfile);
 	      exit_status++;
 	      if (dumpfile) fclose(f);
 	      return;
@@ -2401,7 +2393,7 @@ load_db(argc, argv)
     }
     if (load->updateonly && !update) {
 	 fprintf(stderr, "%s: dump version %s can only be loaded with the "
-		 "-update flag\n", programname, load->name);
+		 "-update flag\n", progname, load->name);
 	 exit_status++;
 	 return;
     }
@@ -2418,7 +2410,7 @@ load_db(argc, argv)
 
 	 if ((kret = kadm5_get_config_params(kcontext, 1,
 					     &newparams, &newparams))) {
-	      com_err(argv[0], kret,
+	      com_err(progname, kret,
 		      "while retreiving new configuration parameters");
 	      exit_status++;
 	      return;
@@ -2442,11 +2434,11 @@ load_db(argc, argv)
 	     */
 
 	    if (emsg != NULL) {
-		fprintf(stderr, "%s: %s\n", programname, emsg);
+		fprintf(stderr, "%s: %s\n", progname, emsg);
 		krb5_free_error_message (kcontext, emsg);
 	    } else {
 		fprintf(stderr, dbcreaterr_fmt,
-			programname, dbname, error_message(kret));
+			progname, dbname, error_message(kret));
 	    }
 	    exit_status++;
 	    kadm5_free_config_params(kcontext, &newparams);
@@ -2467,11 +2459,11 @@ load_db(argc, argv)
 		 */
 
 		if (emsg != NULL) {
-		    fprintf(stderr, "%s: %s\n", programname, emsg);
+		    fprintf(stderr, "%s: %s\n", progname, emsg);
 		    krb5_free_error_message (kcontext, emsg);
 		} else {
 		    fprintf(stderr, dbinit_err_fmt,
-			    programname, error_message(kret));
+			    progname, error_message(kret));
 		}
 		exit_status++;
 		goto error;
@@ -2490,7 +2482,7 @@ load_db(argc, argv)
 	 */
 	if (kret != KRB5_PLUGIN_OP_NOTSUPP) {
 	    fprintf(stderr, "%s: %s while permanently locking database\n",
-		    programname, error_message(kret));
+		    progname, error_message(kret));
 	    exit_status++;
 	    goto error;
 	}
@@ -2507,7 +2499,7 @@ load_db(argc, argv)
 	if (ulog_map(kcontext, global_params.iprop_logfile,
 		     global_params.iprop_ulogsize, caller, db5util_db_args)) {
 	    fprintf(stderr, _("%s: Could not map log\n"),
-		    programname);
+		    progname);
 	    exit_status++;
 	    goto error;
 	}
@@ -2545,10 +2537,10 @@ load_db(argc, argv)
 	}
     }
 
-    if (restore_dump(programname, kcontext, (dumpfile) ? dumpfile : stdin_name,
+    if (restore_dump(progname, kcontext, (dumpfile) ? dumpfile : stdin_name,
 		     f, verbose, load)) {
 	 fprintf(stderr, restfail_fmt,
-		 programname, load->name);
+		 progname, load->name);
 	 exit_status++;
     }
 
@@ -2561,14 +2553,14 @@ load_db(argc, argv)
     if (db_locked && (kret = krb5_db_unlock(kcontext))) {
 	 /* change this error? */
 	 fprintf(stderr, dbunlockerr_fmt,
-		 programname, dbname, error_message(kret));
+		 progname, dbname, error_message(kret));
 	 exit_status++;
     }
 
 #if 0
     if ((kret = krb5_db_fini(kcontext))) {
 	 fprintf(stderr, close_err_fmt,
-		 programname, error_message(kret));
+		 progname, error_message(kret));
 	 exit_status++;
     }
 #endif
@@ -2583,7 +2575,7 @@ load_db(argc, argv)
 	 */
 	if (kret != 0 && kret != KRB5_PLUGIN_OP_NOTSUPP) {
 	    fprintf(stderr, "%s: cannot make newly loaded database live (%s)\n",
-		    programname, error_message(kret));
+		    progname, error_message(kret));
 	    exit_status++;
 	}
     }
@@ -2604,7 +2596,7 @@ error:
 	       */
 	      if (kret != 0 && kret != KRB5_PLUGIN_OP_NOTSUPP) {
 		   fprintf(stderr, dbdelerr_fmt,
-			   programname, dbname, error_message(kret));
+			   progname, dbname, error_message(kret));
 		   exit_status++;
 	      }
 	 }
diff --git a/src/kadmin/dbutil/kdb5_create.c b/src/kadmin/dbutil/kdb5_create.c
index b8959e102..eaeade163 100644
--- a/src/kadmin/dbutil/kdb5_create.c
+++ b/src/kadmin/dbutil/kdb5_create.c
@@ -167,9 +167,6 @@ void kdb5_create(argc, argv)
     krb5_data pwd, seed;
     kdb_log_context *log_ctx;
 	   
-    if (strrchr(argv[0], '/'))
-	argv[0] = strrchr(argv[0], '/')+1;
-
     while ((optchar = getopt(argc, argv, "s")) != -1) {
 	switch(optchar) {
 	case 's':
@@ -200,7 +197,7 @@ void kdb5_create(argc, argv)
     printf ("Loading random data\n");
     retval = krb5_c_random_os_entropy (util_context, 1, NULL);
     if (retval) {
-      com_err (argv[0], retval, "Loading random data");
+      com_err (progname, retval, "Loading random data");
       exit_status++; return;
     }
     
@@ -210,7 +207,7 @@ void kdb5_create(argc, argv)
 					  global_params.mkey_name,
 					  global_params.realm,  
 					  &mkey_fullname, &master_princ))) {
-	com_err(argv[0], retval, "while setting up master key name");
+	com_err(progname, retval, "while setting up master key name");
 	exit_status++; return;
     }
 
@@ -236,7 +233,7 @@ master key name '%s'\n",
 	retval = krb5_read_password(util_context, KRB5_KDC_MKEY_1, KRB5_KDC_MKEY_2,
 				    pw_str, &pw_size);
 	if (retval) {
-	    com_err(argv[0], retval, "while reading master key from keyboard");
+	    com_err(progname, retval, "while reading master key from keyboard");
 	    exit_status++; return;
 	}
 	mkey_password = pw_str;
@@ -246,14 +243,14 @@ master key name '%s'\n",
     pwd.length = strlen(mkey_password);
     retval = krb5_principal2salt(util_context, master_princ, &master_salt);
     if (retval) {
-	com_err(argv[0], retval, "while calculating master key salt");
+	com_err(progname, retval, "while calculating master key salt");
 	exit_status++; return;
     }
 
     retval = krb5_c_string_to_key(util_context, master_keyblock.enctype, 
 				  &pwd, &master_salt, &master_keyblock);
     if (retval) {
-	com_err(argv[0], retval, "while transforming master key from password");
+	com_err(progname, retval, "while transforming master key from password");
 	exit_status++; return;
     }
 
@@ -263,21 +260,21 @@ master key name '%s'\n",
     seed.data = master_keyblock.contents;
 
     if ((retval = krb5_c_random_seed(util_context, &seed))) {
-	com_err(argv[0], retval, "while initializing random key generator");
+	com_err(progname, retval, "while initializing random key generator");
 	exit_status++; return;
     }
     if ((retval = krb5_db_create(util_context,
 				 db5util_db_args))) {
-	com_err(argv[0], retval, "while creating database '%s'",
+	com_err(progname, retval, "while creating database '%s'",
 		global_params.dbname);
 	exit_status++; return;
     }
 /*     if ((retval = krb5_db_fini(util_context))) { */
-/*         com_err(argv[0], retval, "while closing current database"); */
+/*         com_err(progname, retval, "while closing current database"); */
 /*         exit_status++; return; */
 /*     } */
 /*     if ((retval = krb5_db_open(util_context, db5util_db_args, KRB5_KDB_OPEN_RW))) { */
-/* 	com_err(argv[0], retval, "while initializing the database '%s'", */
+/* 	com_err(progname, retval, "while initializing the database '%s'", */
 /* 		global_params.dbname); */
 /* 	exit_status++; return; */
 /*     } */
@@ -314,7 +311,7 @@ master key name '%s'\n",
     if ((retval = add_principal(util_context, master_princ, MASTER_KEY, &rblock)) ||
 	(retval = add_principal(util_context, &tgt_princ, TGT_KEY, &rblock))) {
 	(void) krb5_db_fini(util_context);
-	com_err(argv[0], retval, "while adding entries to the database");
+	com_err(progname, retval, "while adding entries to the database");
 	exit_status++; return;
     }
     /*
@@ -328,7 +325,7 @@ master key name '%s'\n",
 				      &master_keyblock,
 				      mkey_password);
     if (retval) {
-	com_err(argv[0], errno, "while storing key");
+	com_err(progname, errno, "while storing key");
 	printf("Warning: couldn't stash master key.\n");
     }
     /* clean up */
diff --git a/src/kadmin/dbutil/kdb5_destroy.c b/src/kadmin/dbutil/kdb5_destroy.c
index 160268f24..9640286ae 100644
--- a/src/kadmin/dbutil/kdb5_destroy.c
+++ b/src/kadmin/dbutil/kdb5_destroy.c
@@ -60,19 +60,16 @@ kdb5_destroy(argc, argv)
     retval1 = kadm5_init_krb5_context(&context);
     if( retval1 )
     {
-	com_err(argv[0], retval1, "while initializing krb5_context");
+	com_err(progname, retval1, "while initializing krb5_context");
 	exit(1);
     }
 
     if ((retval1 = krb5_set_default_realm(context,
 					  util_context->default_realm))) {
-	com_err(argv[0], retval1, "while setting default realm name");
+	com_err(progname, retval1, "while setting default realm name");
 	exit(1);
     }
     
-    if (strrchr(argv[0], '/'))
-	argv[0] = strrchr(argv[0], '/')+1;
-
     dbname = global_params.dbname;
 
     optind = 1;
@@ -102,7 +99,7 @@ kdb5_destroy(argc, argv)
 
     retval1 = krb5_db_destroy(context, db5util_db_args);
     if (retval1) {
-	com_err(argv[0], retval1, "deleting database '%s'",dbname);
+	com_err(progname, retval1, "deleting database '%s'",dbname);
 	exit_status++; return;
     }
 
diff --git a/src/kadmin/dbutil/kdb5_stash.c b/src/kadmin/dbutil/kdb5_stash.c
index 7e8fd3e8b..a34aa132a 100644
--- a/src/kadmin/dbutil/kdb5_stash.c
+++ b/src/kadmin/dbutil/kdb5_stash.c
@@ -82,19 +82,16 @@ kdb5_stash(argc, argv)
     char *keyfile = 0;
     krb5_context context;
 
-    if (strrchr(argv[0], '/'))
-	argv[0] = strrchr(argv[0], '/')+1;
-
     retval = kadm5_init_krb5_context(&context);
     if( retval )
     {
-	com_err(argv[0], retval, "while initializing krb5_context");
+	com_err(progname, retval, "while initializing krb5_context");
 	exit(1);
     }
 
     if ((retval = krb5_set_default_realm(context,
 					  util_context->default_realm))) {
-	com_err(argv[0], retval, "while setting default realm name");
+	com_err(progname, retval, "while setting default realm name");
 	exit(1);
     }
 
@@ -119,10 +116,10 @@ kdb5_stash(argc, argv)
     if (!krb5_c_valid_enctype(master_keyblock.enctype)) {
 	char tmp[32];
 	if (krb5_enctype_to_string(master_keyblock.enctype, tmp, sizeof(tmp)))
-	    com_err(argv[0], KRB5_PROG_KEYTYPE_NOSUPP,
+	    com_err(progname, KRB5_PROG_KEYTYPE_NOSUPP,
 		    "while setting up enctype %d", master_keyblock.enctype);
 	else
-	    com_err(argv[0], KRB5_PROG_KEYTYPE_NOSUPP, tmp);
+	    com_err(progname, KRB5_PROG_KEYTYPE_NOSUPP, tmp);
 	exit_status++; return; 
     }
 
@@ -130,14 +127,14 @@ kdb5_stash(argc, argv)
     retval = krb5_db_setup_mkey_name(context, mkey_name, realm, 
 				     &mkey_fullname, &master_princ);
     if (retval) {
-	com_err(argv[0], retval, "while setting up master key name");
+	com_err(progname, retval, "while setting up master key name");
 	exit_status++; return; 
     }
 
     retval = krb5_db_open(context, db5util_db_args, 
 			  KRB5_KDB_OPEN_RW | KRB5_KDB_SRV_TYPE_OTHER);
     if (retval) {
-	com_err(argv[0], retval, "while initializing the database '%s'",
+	com_err(progname, retval, "while initializing the database '%s'",
 		dbname);
 	exit_status++; return; 
     }
@@ -148,7 +145,7 @@ kdb5_stash(argc, argv)
 				TRUE, FALSE, (char *) NULL,
 				0, &master_keyblock);
     if (retval) {
-	com_err(argv[0], retval, "while reading master key");
+	com_err(progname, retval, "while reading master key");
 	(void) krb5_db_fini(context);
 	exit_status++; return; 
     }
@@ -156,7 +153,7 @@ kdb5_stash(argc, argv)
     retval = krb5_db_verify_master_key(context, master_princ, 
 				       &master_keyblock);
     if (retval) {
-	com_err(argv[0], retval, "while verifying master key");
+	com_err(progname, retval, "while verifying master key");
 	(void) krb5_db_fini(context);
 	exit_status++; return; 
     }	
@@ -164,7 +161,7 @@ kdb5_stash(argc, argv)
     retval = krb5_db_store_master_key(context, keyfile, master_princ, 
 				      &master_keyblock, NULL);
     if (retval) {
-	com_err(argv[0], errno, "while storing key");
+	com_err(progname, errno, "while storing key");
 	memset((char *)master_keyblock.contents, 0, master_keyblock.length);
 	(void) krb5_db_fini(context);
 	exit_status++; return; 
@@ -173,7 +170,7 @@ kdb5_stash(argc, argv)
 
     retval = krb5_db_fini(context);
     if (retval) {
-	com_err(argv[0], retval, "closing database '%s'", dbname);
+	com_err(progname, retval, "closing database '%s'", dbname);
 	exit_status++; return; 
     }
 
diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c
index 7da89c8f5..cfc3d0821 100644
--- a/src/kadmin/dbutil/kdb5_util.c
+++ b/src/kadmin/dbutil/kdb5_util.c
@@ -247,7 +247,7 @@ int main(argc, argv)
 	    }
        } else if (strcmp(*argv, "-k") == 0 && ARG_VAL) {
 	    if (krb5_string_to_enctype(koptarg, &global_params.enctype))
-		 com_err(argv[0], 0, "%s is an invalid enctype", koptarg);
+		 com_err(progname, 0, "%s is an invalid enctype", koptarg);
 	    else
 		 global_params.mask |= KADM5_CONFIG_ENCTYPE;
        } else if (strcmp(*argv, "-M") == 0 && ARG_VAL) {
@@ -289,7 +289,7 @@ int main(argc, argv)
     retval = kadm5_get_config_params(util_context, 1,
 				     &global_params, &global_params);
     if (retval) {
-	 com_err(argv[0], retval, "while retreiving configuration parameters");
+	 com_err(progname, retval, "while retreiving configuration parameters");
 	 exit(1);
     }
 
@@ -302,7 +302,7 @@ int main(argc, argv)
     master_keyblock.enctype = global_params.enctype;
     if ((master_keyblock.enctype != ENCTYPE_UNKNOWN) &&
 	(!krb5_c_valid_enctype(master_keyblock.enctype))) {
-	com_err(argv[0], KRB5_PROG_KEYTYPE_NOSUPP,
+	com_err(progname, KRB5_PROG_KEYTYPE_NOSUPP,
 		"while setting up enctype %d", master_keyblock.enctype);
     }
 
@@ -341,13 +341,13 @@ void set_dbname(argc, argv)
 
     if (argc < 3) {
 	com_err(argv[0], 0, "Too few arguments");
-	com_err(argv[0], 0, "Usage: %s dbpathname realmname", argv[0]);
+	com_err(progname, 0, "Usage: %s dbpathname realmname", argv[0]);
 	exit_status++;
 	return;
     }
     if (dbactive) {
 	if ((retval = krb5_db_fini(util_context)) && retval!= KRB5_KDB_DBNOTINITED) {
-	    com_err(argv[0], retval, "while closing previous database");
+	    com_err(progname, retval, "while closing previous database");
 	    exit_status++;
 	    return;
 	}
@@ -360,7 +360,7 @@ void set_dbname(argc, argv)
 	dbactive = FALSE;
     }
 
-    (void) set_dbname_help(argv[0], argv[1]);
+    (void) set_dbname_help(progname, argv[1]);
     return;
 }
 #endif
@@ -432,6 +432,7 @@ static int open_db_and_mkey()
 	retval = krb5_principal2salt(util_context, master_princ, &scratch);
 	if (retval) {
 	    com_err(progname, retval, "while calculated master key salt");
+	    exit_status++;
 	    return(1);
 	}
 
@@ -449,6 +450,7 @@ static int open_db_and_mkey()
 	if (retval) {
 	    com_err(progname, retval,
 		    "while transforming master key from password");
+	    exit_status++;
 	    return(1);
 	}
 	free(scratch.data);
@@ -526,7 +528,7 @@ add_random_key(argc, argv)
     krb5_int32 num_keysalts = 0;
 
     int free_keysalts;
-    char *me = argv[0];
+    char *me = progname;
     char *ks_str = NULL;
     char *pr_str;