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, 87 insertions, 85 deletions

diff --git a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_policy.c b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_policy.c
index f75819a14..972176cf2 100644
--- a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_policy.c
+++ b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_policy.c
@@ -67,7 +67,7 @@ static krb5_error_code init_ldap_realm (int argc, char *argv[]) {
         retval = krb5_ldap_read_krbcontainer_params (util_context,
                 &(ldap_context->krbcontainer));
         if (retval != 0) {
-            com_err(argv[0], retval, "while reading kerberos container information");
+            com_err(progname, retval, "while reading kerberos container information");
             goto cleanup;
         }
     }
@@ -95,7 +95,7 @@ kdb5_ldap_create_policy(argc, argv)
     int argc;
     char *argv[];
 {
-    char *me = argv[0];
+    char *me = progname;
     krb5_error_code retval = 0;
     krb5_ldap_policy_params *policyparams = NULL;
     krb5_boolean print_usage = FALSE;
@@ -322,7 +322,7 @@ kdb5_ldap_destroy_policy(argc, argv)
     int argc;
     char *argv[];
 {
-    char *me = argv[0];
+    char *me = progname;
     krb5_error_code retval = 0;
     krb5_ldap_policy_params *policyparams = NULL;
     krb5_boolean print_usage = FALSE;
@@ -426,7 +426,7 @@ kdb5_ldap_modify_policy(argc, argv)
     int argc;
     char *argv[];
 {
-    char *me = argv[0];
+    char *me = progname;
     krb5_error_code retval = 0;
     krb5_ldap_policy_params *policyparams = NULL;
     krb5_boolean print_usage = FALSE;
@@ -683,7 +683,7 @@ kdb5_ldap_view_policy(argc, argv)
     int argc;
     char *argv[];
 {
-    char *me = argv[0];
+    char *me = progname;
     krb5_ldap_policy_params *policyparams = NULL;
     krb5_error_code retval = 0;
     krb5_boolean print_usage = FALSE;
@@ -804,7 +804,7 @@ void kdb5_ldap_list_policies(argc, argv)
     int argc;
     char *argv[];
 {
-    char *me = argv[0];
+    char *me = progname;
     krb5_error_code retval = 0;
     krb5_boolean print_usage = FALSE;
     char *basedn = NULL;
diff --git a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c
index 4a64143de..eb20a28ed 100644
--- a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c
+++ b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c
@@ -152,7 +152,7 @@ static int get_ticket_policy(rparams,i,argv,argc)
     krb5_boolean no_msg = FALSE;
 
     krb5_boolean print_usage = FALSE;
-    char *me = argv[0];
+    char *me = progname;
 
     time(&now);
     if (!strcmp(argv[*i], "-maxtktlife")) {
@@ -364,7 +364,7 @@ void kdb5_ldap_create(argc, argv)
 		rparams->subtree = list;
 	    } else if(strncmp(argv[i], "", strlen(argv[i]))==0) {
 		 /* dont allow subtree value to be set at the root(NULL, "") of the tree */
-		 com_err(argv[0], EINVAL,
+		 com_err(progname, EINVAL,
 			  "for subtree while creating realm '%s'",
 			   global_params.realm);
 		 goto err_nomsg;
@@ -376,7 +376,7 @@ void kdb5_ldap_create(argc, argv)
 		goto err_usage;
 	    if(strncmp(argv[i], "", strlen(argv[i]))==0) {
 		 /* dont allow containerref value to be set at the root(NULL, "") of the tree */
-		 com_err(argv[0], EINVAL,
+		 com_err(progname, EINVAL,
 			  "for container reference while creating realm '%s'",
 			   global_params.realm);
 		 goto err_nomsg;
@@ -401,7 +401,7 @@ void kdb5_ldap_create(argc, argv)
 		rparams->search_scope = atoi(argv[i]);
 		if ((rparams->search_scope != 1) &&
 		    (rparams->search_scope != 2)) {
-		    com_err(argv[0], EINVAL,
+		    com_err(progname, EINVAL,
 			    "invalid search scope while creating realm '%s'",
 			    global_params.realm);
 		    goto err_nomsg;
@@ -498,7 +498,7 @@ void kdb5_ldap_create(argc, argv)
 	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");
 	    goto err_nomsg;
 	}
 	mkey_password = pw_str;
@@ -516,7 +516,7 @@ void kdb5_ldap_create(argc, argv)
     rparams->realm_name = strdup(global_params.realm);
     if (rparams->realm_name == NULL) {
 	retval = ENOMEM;
-	com_err(argv[0], ENOMEM, "while creating realm '%s'",
+	com_err(progname, ENOMEM, "while creating realm '%s'",
 		global_params.realm);
 	goto err_nomsg;
     }
@@ -588,11 +588,11 @@ void kdb5_ldap_create(argc, argv)
 	retval = krb5_ldap_read_krbcontainer_params(util_context,
 						    &(ldap_context->krbcontainer));
 	if (retval) {
-	    com_err(argv[0], retval, "while reading kerberos container information");
+	    com_err(progname, retval, "while reading kerberos container information");
 	    goto cleanup;
 	}
     } else if (retval) {
-	com_err(argv[0], retval, "while reading kerberos container information");
+	com_err(progname, retval, "while reading kerberos container information");
 	goto cleanup;
     }
 
@@ -608,7 +608,7 @@ void kdb5_ldap_create(argc, argv)
 					      global_params.realm,
 					      &(ldap_context->lrparams),
 					      &mask))) {
-	com_err(argv[0], retval, "while reading information of realm '%s'",
+	com_err(progname, retval, "while reading information of realm '%s'",
 		global_params.realm);
 	goto err_nomsg;
     }
@@ -623,7 +623,7 @@ void kdb5_ldap_create(argc, argv)
 					  global_params.mkey_name,
 					  global_params.realm,
 					  0, &master_princ))) {
-	com_err(argv[0], retval, "while setting up master key name");
+	com_err(progname, retval, "while setting up master key name");
 	goto err_nomsg;
     }
 
@@ -635,7 +635,7 @@ void kdb5_ldap_create(argc, argv)
 	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");
 	    goto err_nomsg;
 	}
 
@@ -646,7 +646,7 @@ void kdb5_ldap_create(argc, argv)
 	    free(master_salt.data);
 
 	if (retval) {
-	    com_err(argv[0], retval, "while transforming master key from password");
+	    com_err(progname, retval, "while transforming master key from password");
 	    goto err_nomsg;
 	}
 
@@ -689,28 +689,28 @@ void kdb5_ldap_create(argc, argv)
 	/* Create 'K/M' ... */
 	rblock.flags |= KRB5_KDB_DISALLOW_ALL_TIX;
 	if ((retval = kdb_ldap_create_principal(util_context, master_princ, MASTER_KEY, &rblock))) {
-	    com_err(argv[0], retval, "while adding entries to the database");
+	    com_err(progname, retval, "while adding entries to the database");
 	    goto err_nomsg;
 	}
 
 	/* Create 'krbtgt' ... */
 	rblock.flags = 0; /* reset the flags */
 	if ((retval = kdb_ldap_create_principal(util_context, &tgt_princ, TGT_KEY, &rblock))) {
-	    com_err(argv[0], retval, "while adding entries to the database");
+	    com_err(progname, retval, "while adding entries to the database");
 	    goto err_nomsg;
 	}
 
 	/* Create 'kadmin/admin' ... */
 	snprintf(princ_name, sizeof(princ_name), "%s@%s", KADM5_ADMIN_SERVICE, global_params.realm);
 	if ((retval = krb5_parse_name(util_context, princ_name, &p))) {
-	    com_err(argv[0], retval, "while adding entries to the database");
+	    com_err(progname, retval, "while adding entries to the database");
 	    goto err_nomsg;
 	}
 	rblock.max_life = ADMIN_LIFETIME;
 	rblock.flags = KRB5_KDB_DISALLOW_TGT_BASED;
 	if ((retval = kdb_ldap_create_principal(util_context, p, TGT_KEY, &rblock))) {
 	    krb5_free_principal(util_context, p);
-	    com_err(argv[0], retval, "while adding entries to the database");
+	    com_err(progname, retval, "while adding entries to the database");
 	    goto err_nomsg;
 	}
 	krb5_free_principal(util_context, p);
@@ -718,7 +718,7 @@ void kdb5_ldap_create(argc, argv)
 	/* Create 'kadmin/changepw' ... */
 	snprintf(princ_name, sizeof(princ_name), "%s@%s", KADM5_CHANGEPW_SERVICE, global_params.realm);
 	if ((retval = krb5_parse_name(util_context, princ_name, &p))) {
-	    com_err(argv[0], retval, "while adding entries to the database");
+	    com_err(progname, retval, "while adding entries to the database");
 	    goto err_nomsg;
 	}
 	rblock.max_life = CHANGEPW_LIFETIME;
@@ -726,7 +726,7 @@ void kdb5_ldap_create(argc, argv)
 	    KRB5_KDB_PWCHANGE_SERVICE;
 	if ((retval = kdb_ldap_create_principal(util_context, p, TGT_KEY, &rblock))) {
 	    krb5_free_principal(util_context, p);
-	    com_err(argv[0], retval, "while adding entries to the database");
+	    com_err(progname, retval, "while adding entries to the database");
 	    goto err_nomsg;
 	}
 	krb5_free_principal(util_context, p);
@@ -734,26 +734,26 @@ void kdb5_ldap_create(argc, argv)
 	/* Create 'kadmin/history' ... */
 	snprintf(princ_name, sizeof(princ_name), "%s@%s", KADM5_HIST_PRINCIPAL, global_params.realm);
 	if ((retval = krb5_parse_name(util_context, princ_name, &p))) {
-	    com_err(argv[0], retval, "while adding entries to the database");
+	    com_err(progname, retval, "while adding entries to the database");
 	    goto err_nomsg;
 	}
 	rblock.max_life = global_params.max_life;
 	rblock.flags = 0;
 	if ((retval = kdb_ldap_create_principal(util_context, p, TGT_KEY, &rblock))) {
 	    krb5_free_principal(util_context, p);
-	    com_err(argv[0], retval, "while adding entries to the database");
+	    com_err(progname, retval, "while adding entries to the database");
 	    goto err_nomsg;
 	}
 	krb5_free_principal(util_context, p);
 
 	/* Create 'kadmin/<hostname>' ... */
 	if ((retval=krb5_sname_to_principal(util_context, NULL, "kadmin", KRB5_NT_SRV_HST, &p))) {
-	    com_err(argv[0], retval, "krb5_sname_to_principal, while adding entries to the database");
+	    com_err(progname, retval, "krb5_sname_to_principal, while adding entries to the database");
 	    goto err_nomsg;
 	}
 
 	if ((retval=krb5_copy_principal(util_context, p, &temp_p))) {
-	    com_err(argv[0], retval, "krb5_copy_principal, while adding entries to the database");
+	    com_err(progname, retval, "krb5_copy_principal, while adding entries to the database");
 	    goto err_nomsg;
 	}
 
@@ -762,7 +762,7 @@ void kdb5_ldap_create(argc, argv)
 	temp_p->realm.length = strlen(util_context->default_realm);
 	temp_p->realm.data = strdup(util_context->default_realm);
 	if (temp_p->realm.data == NULL) {
-	    com_err(argv[0], ENOMEM, "while adding entries to the database");
+	    com_err(progname, ENOMEM, "while adding entries to the database");
 	    goto err_nomsg;
 	}
 
@@ -770,7 +770,7 @@ void kdb5_ldap_create(argc, argv)
 	rblock.flags = KRB5_KDB_DISALLOW_TGT_BASED;
 	if ((retval = kdb_ldap_create_principal(util_context, temp_p, TGT_KEY, &rblock))) {
 	    krb5_free_principal(util_context, p);
-	    com_err(argv[0], retval, "while adding entries to the database");
+	    com_err(progname, retval, "while adding entries to the database");
 	    goto err_nomsg;
 	}
 	krb5_free_principal(util_context, temp_p);
@@ -798,7 +798,7 @@ void kdb5_ldap_create(argc, argv)
 							 LDAP_KDC_SERVICE, rparams->kdcservers[i],
 							 rparams->realm_name, rparams->subtree, rightsmask)) != 0) {
 		    printf("failed\n");
-		    com_err(argv[0], retval, "while assigning rights to '%s'",
+		    com_err(progname, retval, "while assigning rights to '%s'",
 			    rparams->realm_name);
 		    goto err_nomsg;
 		}
@@ -814,7 +814,7 @@ void kdb5_ldap_create(argc, argv)
 							 LDAP_ADMIN_SERVICE, rparams->adminservers[i],
 							 rparams->realm_name, rparams->subtree, rightsmask)) != 0) {
 		    printf("failed\n");
-		    com_err(argv[0], retval, "while assigning rights to '%s'",
+		    com_err(progname, retval, "while assigning rights to '%s'",
 			    rparams->realm_name);
 		    goto err_nomsg;
 		}
@@ -830,7 +830,7 @@ void kdb5_ldap_create(argc, argv)
 							 LDAP_PASSWD_SERVICE, rparams->passwdservers[i],
 							 rparams->realm_name, rparams->subtree, rightsmask)) != 0) {
 		    printf("failed\n");
-		    com_err(argv[0], retval, "while assigning rights to '%s'",
+		    com_err(progname, retval, "while assigning rights to '%s'",
 			    rparams->realm_name);
 		    goto err_nomsg;
 		}
@@ -850,7 +850,7 @@ void kdb5_ldap_create(argc, argv)
 				     master_princ,
 				     &master_keyblock, NULL);
 	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");
 	}
     }
@@ -879,7 +879,7 @@ cleanup:
 
     if (retval) {
 	if (!no_msg) {
-	    com_err(argv[0], retval, "while creating realm '%s'",
+	    com_err(progname, retval, "while creating realm '%s'",
 		    global_params.realm);
 	}
 	exit_status++;
@@ -932,7 +932,7 @@ void kdb5_ldap_modify(argc, argv)
 
     if ((retval = krb5_ldap_read_krbcontainer_params(util_context,
 						     &(ldap_context->krbcontainer)))) {
-	com_err(argv[0], retval, "while reading Kerberos container information");
+	com_err(progname, retval, "while reading Kerberos container information");
 	goto err_nomsg;
     }
 
@@ -986,7 +986,7 @@ void kdb5_ldap_modify(argc, argv)
 		rparams->subtree =  slist;
 	    } else if(strncmp(argv[i], "", strlen(argv[i]))==0) {
 		 /* dont allow subtree value to be set at the root(NULL, "") of the tree */
-		    com_err(argv[0], EINVAL,
+		    com_err(progname, EINVAL,
 			    "for subtree while modifying realm '%s'",
 			    global_params.realm);
 		    goto err_nomsg;
@@ -998,7 +998,7 @@ void kdb5_ldap_modify(argc, argv)
 		goto err_usage;
 	    if(strncmp(argv[i], "", strlen(argv[i]))==0) {
 		 /* dont allow containerref value to be set at the root(NULL, "") of the tree */
-		 com_err(argv[0], EINVAL,
+		 com_err(progname, EINVAL,
 			  "for container reference while modifying realm '%s'",
 			   global_params.realm);
 		 goto err_nomsg;
@@ -1024,7 +1024,7 @@ void kdb5_ldap_modify(argc, argv)
 		if ((rparams->search_scope != 1) &&
 		    (rparams->search_scope != 2)) {
 		    retval = EINVAL;
-		    com_err(argv[0], retval,
+		    com_err(progname, retval,
 			    "specified for search scope while modifying information of realm '%s'",
 			    global_params.realm);
 		    goto err_nomsg;
@@ -1529,7 +1529,7 @@ void kdb5_ldap_modify(argc, argv)
 								LDAP_KDC_SERVICE, oldkdcdns[i],
 								rparams->realm_name, oldsubtrees, rightsmask)) != 0) {
 			printf("failed\n");
-			com_err(argv[0], retval, "while assigning rights '%s'",
+			com_err(progname, retval, "while assigning rights '%s'",
 				rparams->realm_name);
 			goto err_nomsg;
 		    }
@@ -1546,7 +1546,7 @@ void kdb5_ldap_modify(argc, argv)
 							     LDAP_KDC_SERVICE, newkdcdns[i], rparams->realm_name,
 							     rparams->subtree, rightsmask)) != 0) {
 			printf("failed\n");
-			com_err(argv[0], retval, "while assigning rights to '%s'",
+			com_err(progname, retval, "while assigning rights to '%s'",
 				rparams->realm_name);
 			goto err_nomsg;
 		    }
@@ -1608,7 +1608,7 @@ void kdb5_ldap_modify(argc, argv)
 								LDAP_ADMIN_SERVICE, oldadmindns[i],
 								rparams->realm_name, oldsubtrees, rightsmask)) != 0) {
 			printf("failed\n");
-			com_err(argv[0], retval, "while assigning rights '%s'",
+			com_err(progname, retval, "while assigning rights '%s'",
 				rparams->realm_name);
 			goto err_nomsg;
 		    }
@@ -1626,7 +1626,7 @@ void kdb5_ldap_modify(argc, argv)
 							     LDAP_ADMIN_SERVICE, newadmindns[i],
 							     rparams->realm_name, rparams->subtree, rightsmask)) != 0) {
 			printf("failed\n");
-			com_err(argv[0], retval, "while assigning rights to '%s'",
+			com_err(progname, retval, "while assigning rights to '%s'",
 				rparams->realm_name);
 			goto err_nomsg;
 		    }
@@ -1688,7 +1688,7 @@ void kdb5_ldap_modify(argc, argv)
 								  LDAP_PASSWD_SERVICE, oldpwddns[i],
 								  rparams->realm_name, oldsubtrees, rightsmask))) {
 			printf("failed\n");
-			com_err(argv[0], retval, "while assigning rights '%s'",
+			com_err(progname, retval, "while assigning rights '%s'",
 				rparams->realm_name);
 			goto err_nomsg;
 		    }
@@ -1705,7 +1705,7 @@ void kdb5_ldap_modify(argc, argv)
 							       LDAP_PASSWD_SERVICE, newpwddns[i],
 							       rparams->realm_name, rparams->subtree, rightsmask))) {
 			printf("failed\n");
-			com_err(argv[0], retval, "while assigning rights to '%s'",
+			com_err(progname, retval, "while assigning rights to '%s'",
 				rparams->realm_name);
 			goto err_nomsg;
 		    }
@@ -1777,7 +1777,7 @@ cleanup:
 
     if (retval) {
 	if (!no_msg)
-	    com_err(argv[0], retval, "while modifying information of realm '%s'",
+	    com_err(progname, retval, "while modifying information of realm '%s'",
 		    global_params.realm);
 	exit_status++;
     }
@@ -1804,7 +1804,7 @@ void kdb5_ldap_view(argc, argv)
     ldap_context = (krb5_ldap_context *) dal_handle->db_context;
     if (!(ldap_context)) {
 	retval = EINVAL;
-	com_err(argv[0], retval, "while initializing database");
+	com_err(progname, retval, "while initializing database");
 	exit_status++;
 	return;
     }
@@ -1812,14 +1812,14 @@ void kdb5_ldap_view(argc, argv)
     /* Read the kerberos container information */
     if ((retval = krb5_ldap_read_krbcontainer_params(util_context,
 						     &(ldap_context->krbcontainer))) != 0) {
-	com_err(argv[0], retval, "while reading kerberos container information");
+	com_err(progname, retval, "while reading kerberos container information");
 	exit_status++;
 	return;
     }
 
     if ((retval = krb5_ldap_read_realm_params(util_context,
 					      global_params.realm, &rparams, &mask)) || (!rparams)) {
-	com_err(argv[0], retval, "while reading information of realm '%s'",
+	com_err(progname, retval, "while reading information of realm '%s'",
 		global_params.realm);
 	exit_status++;
 	return;
@@ -2009,7 +2009,7 @@ void kdb5_ldap_list(argc, argv)
     /* Read the kerberos container information */
     if ((retval = krb5_ldap_read_krbcontainer_params(util_context,
 						     &(ldap_context->krbcontainer))) != 0) {
-	com_err(argv[0], retval, "while reading kerberos container information");
+	com_err(progname, retval, "while reading kerberos container information");
 	exit_status++;
 	return;
     }
@@ -2018,7 +2018,7 @@ void kdb5_ldap_list(argc, argv)
     if (retval != 0) {
 	krb5_ldap_free_krbcontainer_params(ldap_context->krbcontainer);
 	ldap_context->krbcontainer = NULL;
-	com_err (argv[0], retval, "while listing realms");
+	com_err (progname, retval, "while listing realms");
 	exit_status++;
 	return;
     }
@@ -2434,7 +2434,7 @@ kdb5_ldap_destroy(argc, argv)
     dal_handle = util_context->dal_handle;
     ldap_context = (krb5_ldap_context *) dal_handle->db_context;
     if (!(ldap_context)) {
-	com_err(argv[0], EINVAL, "while initializing database");
+	com_err(progname, EINVAL, "while initializing database");
 	exit_status++;
 	return;
     }
@@ -2442,7 +2442,7 @@ kdb5_ldap_destroy(argc, argv)
     /* Read the kerberos container from the LDAP Server */
     if ((retval = krb5_ldap_read_krbcontainer_params(util_context,
 						     &(ldap_context->krbcontainer))) != 0) {
-	com_err(argv[0], retval, "while reading kerberos container information");
+	com_err(progname, retval, "while reading kerberos container information");
 	exit_status++;
 	return;
     }
@@ -2450,7 +2450,7 @@ kdb5_ldap_destroy(argc, argv)
     /* Read the Realm information from the LDAP Server */
     if ((retval = krb5_ldap_read_realm_params(util_context, global_params.realm,
 					      &(ldap_context->lrparams), &mask)) != 0) {
-	com_err(argv[0], retval, "while reading realm information");
+	com_err(progname, retval, "while reading realm information");
 	exit_status++;
 	return;
     }
@@ -2472,7 +2472,7 @@ kdb5_ldap_destroy(argc, argv)
 							      LDAP_KDC_SERVICE, rparams->kdcservers[i],
 							      rparams->realm_name, rparams->subtree, rightsmask)) != 0) {
 		    printf("failed\n");
-		    com_err(argv[0], retval, "while assigning rights to '%s'",
+		    com_err(progname, retval, "while assigning rights to '%s'",
 			    rparams->realm_name);
 		    return;
 		}
@@ -2487,7 +2487,7 @@ kdb5_ldap_destroy(argc, argv)
 							      LDAP_ADMIN_SERVICE, rparams->adminservers[i],
 							      rparams->realm_name, rparams->subtree, rightsmask)) != 0) {
 		    printf("failed\n");
-		    com_err(argv[0], retval, "while assigning rights to '%s'",
+		    com_err(progname, retval, "while assigning rights to '%s'",
 			    rparams->realm_name);
 		    return;
 		}
@@ -2502,7 +2502,7 @@ kdb5_ldap_destroy(argc, argv)
 							      LDAP_PASSWD_SERVICE, rparams->passwdservers[i],
 							      rparams->realm_name, rparams->subtree, rightsmask)) != 0) {
 		    printf("failed\n");
-		    com_err(argv[0], retval, "while assigning rights to '%s'",
+		    com_err(progname, retval, "while assigning rights to '%s'",
 			    rparams->realm_name);
 		    return;
 		}
@@ -2514,7 +2514,7 @@ kdb5_ldap_destroy(argc, argv)
     /* Delete the realm container and all the associated principals */
     retval = krb5_ldap_delete_realm(util_context, global_params.realm);
     if (retval) {
-	com_err(argv[0], retval, "deleting database of '%s'", global_params.realm);
+	com_err(progname, retval, "deleting database of '%s'", global_params.realm);
 	exit_status++;
 	return;
     }
diff --git a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c
index f892e9659..e2c799a89 100644
--- a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c
+++ b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c
@@ -204,7 +204,7 @@ void kdb5_ldap_create_service(argc, argv)
     int argc;
     char *argv[];
 {
-    char *me = argv[0];
+    char *me = progname;
     krb5_error_code retval = 0;
     krb5_ldap_service_params *srvparams = NULL;
     krb5_boolean print_usage = FALSE;
@@ -502,7 +502,7 @@ void kdb5_ldap_modify_service(argc, argv)
     int argc;
     char *argv[];
 {
-    char *me = argv[0];
+    char *me = progname; 
     krb5_error_code retval = 0;
     krb5_ldap_service_params *srvparams = NULL;
     krb5_boolean print_usage = FALSE;
@@ -575,7 +575,7 @@ void kdb5_ldap_modify_service(argc, argv)
 
     retval = krb5_ldap_read_service(util_context, servicedn, &srvparams, &in_mask);
     if (retval) {
-	com_err(argv[0], retval, "while reading information of service '%s'",
+	com_err(me, retval, "while reading information of service '%s'",
 		servicedn);
 	goto err_nomsg;
     }
@@ -1067,7 +1067,7 @@ rem_service_entry_from_file(argc, argv, file_name, service_object)
     char *service_object;
 {
     int     st        = EINVAL;
-    char    *me       = argv[0];
+    char    *me       = progname;
     char    *tmp_file = NULL;
     int     tmpfd     = -1;
     FILE    *pfile    = NULL;
@@ -1182,7 +1182,7 @@ kdb5_ldap_destroy_service(argc, argv)
 	    if (argv[i+1]) {
 		stashfilename=strdup(argv[i+1]);
 		if (stashfilename == NULL) {
-		    com_err(argv[0], ENOMEM, "while destroying service");
+		    com_err(progname, ENOMEM, "while destroying service");
 		    exit_status++;
 		    goto cleanup;
 		}
@@ -1195,7 +1195,7 @@ kdb5_ldap_destroy_service(argc, argv)
 	    if ((argv[i]) && (servicedn == NULL)) {
 		servicedn=strdup(argv[i]);
 		if (servicedn == NULL) {
-		    com_err(argv[0], ENOMEM, "while destroying service");
+		    com_err(progname, ENOMEM, "while destroying service");
 		    exit_status++;
 		    goto cleanup;
 		}
@@ -1226,7 +1226,7 @@ kdb5_ldap_destroy_service(argc, argv)
 
     if ((retval = krb5_ldap_read_service(util_context, servicedn,
 					 &lserparams, &mask))) {
-	com_err(argv[0], retval, "while destroying service '%s'",servicedn);
+	com_err(progname, retval, "while destroying service '%s'",servicedn);
 	exit_status++;
 	goto cleanup;
     }
@@ -1234,7 +1234,7 @@ kdb5_ldap_destroy_service(argc, argv)
     retval = krb5_ldap_delete_service(util_context, lserparams, servicedn);
 
     if (retval) {
-	com_err(argv[0], retval, "while destroying service '%s'", servicedn);
+	com_err(progname, retval, "while destroying service '%s'", servicedn);
 	exit_status++;
 	goto cleanup;
     }
@@ -1242,7 +1242,7 @@ kdb5_ldap_destroy_service(argc, argv)
     if (stashfilename == NULL) {
 	stashfilename = strdup(DEF_SERVICE_PASSWD_FILE);
 	if (stashfilename == NULL) {
-	    com_err(argv[0], ENOMEM, "while destroying service");
+	    com_err(progname, ENOMEM, "while destroying service");
 	    exit_status++;
 	    goto cleanup;
 	}
@@ -1302,13 +1302,13 @@ void kdb5_ldap_view_service(argc, argv)
 
     servicedn=strdup(argv[1]);
     if (servicedn == NULL) {
-	com_err(argv[0], ENOMEM, "while viewing service");
+	com_err(progname, ENOMEM, "while viewing service");
 	exit_status++;
 	goto cleanup;
     }
 
     if ((retval = krb5_ldap_read_service(util_context, servicedn, &lserparams, &mask))) {
-	com_err(argv[0], retval, "while viewing service '%s'",servicedn);
+	com_err(progname, retval, "while viewing service '%s'",servicedn);
 	exit_status++;
 	goto cleanup;
     }
@@ -1345,7 +1345,7 @@ void kdb5_ldap_list_services(argc, argv)
     int argc;
     char *argv[];
 {
-    char *me = argv[0];
+    char *me = progname;
     krb5_error_code retval = 0;
     char *basedn = NULL;
     char **list = NULL;
@@ -1526,7 +1526,7 @@ kdb5_ldap_set_service_password(argc, argv)
     krb5_ldap_context *lparams = NULL;
     char *file_name = NULL;
     char *tmp_file = NULL;
-    char *me = argv[0];
+    char *me = progname;
     int filelen = 0;
     int random_passwd = 0;
     int set_dir_pwd = 1;
@@ -1910,7 +1910,7 @@ kdb5_ldap_stash_service_password(argc, argv)
 {
     int ret = 0;
     unsigned int passwd_len = 0;
-    char *me = argv[0];
+    char *me = progname;
     char *service_object = NULL;
     char *file_name = NULL, *tmp_file = NULL;
     char passwd[MAX_SERVICE_PASSWD_LEN];
diff --git a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
index e2776b985..704bb163e 100644
--- a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
+++ b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
@@ -347,7 +347,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) {
@@ -469,7 +469,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_status++;
 	    goto cleanup;
 	}
@@ -477,7 +477,7 @@ int main(argc, argv)
     }
 
     if ((retval = krb5_ldap_lib_init()) != 0) {
-	com_err(argv[0], retval, "while initializing error handling");
+	com_err(progname, retval, "while initializing error handling");
 	exit_status++;
 	goto cleanup;
     }
@@ -485,7 +485,7 @@ int main(argc, argv)
     /* Initialize the ldap context */
     ldap_context = calloc(sizeof(krb5_ldap_context), 1);
     if (ldap_context == NULL) {
-	com_err(argv[0], ENOMEM, "while initializing ldap handle");
+	com_err(progname, ENOMEM, "while initializing ldap handle");
 	exit_status++;
 	goto cleanup;
     }
@@ -498,7 +498,7 @@ int main(argc, argv)
 	if (passwd == NULL) {
 	    passwd = (char *)malloc(MAX_PASSWD_LEN);
 	    if (passwd == NULL) {
-		com_err(argv[0], ENOMEM, "while retrieving ldap configuration");
+		com_err(progname, ENOMEM, "while retrieving ldap configuration");
 		exit_status++;
 		goto cleanup;
 	    }
@@ -506,7 +506,7 @@ int main(argc, argv)
 	    if (prompt == NULL) {
 		free(passwd);
 		passwd = NULL;
-		com_err(argv[0], ENOMEM, "while retrieving ldap configuration");
+		com_err(progname, ENOMEM, "while retrieving ldap configuration");
 		exit_status++;
 		goto cleanup;
 	    }
@@ -517,7 +517,7 @@ int main(argc, argv)
 	    db_retval = krb5_read_password(util_context, prompt, NULL, passwd, &passwd_len);
 
 	    if ((db_retval) || (passwd_len == 0)) {
-		com_err(argv[0], ENOMEM, "while retrieving ldap configuration");
+		com_err(progname, ENOMEM, "while retrieving ldap configuration");
 		free(passwd);
 		passwd = NULL;
 		exit_status++;
@@ -533,14 +533,14 @@ int main(argc, argv)
 
 	ldap_context->server_info_list = (krb5_ldap_server_info **) calloc (2, sizeof (krb5_ldap_server_info *)) ;
 	if (ldap_context->server_info_list == NULL) {
-	    com_err(argv[0], ENOMEM, "while initializing server list");
+	    com_err(progname, ENOMEM, "while initializing server list");
 	    exit_status++;
 	    goto cleanup;
 	}
 
 	ldap_context->server_info_list[0] = (krb5_ldap_server_info *) calloc (1, sizeof (krb5_ldap_server_info));
 	if (ldap_context->server_info_list[0] == NULL) {
-	    com_err(argv[0], ENOMEM, "while initializing server list");
+	    com_err(progname, ENOMEM, "while initializing server list");
 	    exit_status++;
 	    goto cleanup;
 	}
@@ -549,7 +549,7 @@ int main(argc, argv)
 
 	ldap_context->server_info_list[0]->server_name = strdup(ldap_server);
 	if (ldap_context->server_info_list[0]->server_name == NULL) {
-	    com_err(argv[0], ENOMEM, "while initializing server list");
+	    com_err(progname, ENOMEM, "while initializing server list");
 	    exit_status++;
 	    goto cleanup;
 	}
@@ -557,7 +557,7 @@ int main(argc, argv)
     if (bind_dn) {
 	ldap_context->bind_dn = strdup(bind_dn);
 	if (ldap_context->bind_dn == NULL) {
-	    com_err(argv[0], ENOMEM, "while retrieving ldap configuration");
+	    com_err(progname, ENOMEM, "while retrieving ldap configuration");
 	    exit_status++;
 	    goto cleanup;
 	}
@@ -569,7 +569,7 @@ int main(argc, argv)
     if (realm_name_required) {
 	if ((global_params.enctype != ENCTYPE_UNKNOWN) &&
 	    (!krb5_c_valid_enctype(global_params.enctype))) {
-	    com_err(argv[0], KRB5_PROG_KEYTYPE_NOSUPP,
+	    com_err(progname, KRB5_PROG_KEYTYPE_NOSUPP,
 		    "while setting up enctype %d", global_params.enctype);
 	}
     }
@@ -586,7 +586,7 @@ int main(argc, argv)
 
     db_retval = krb5_ldap_read_server_params(util_context, conf_section, KRB5_KDB_SRV_TYPE_OTHER);
     if (db_retval) {
-	com_err(argv[0], db_retval, "while reading ldap configuration");
+	com_err(progname, db_retval, "while reading ldap configuration");
 	exit_status++;
 	goto cleanup;
     }
diff --git a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.h b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.h
index f2c49a57e..a2b3bb802 100644
--- a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.h
+++ b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.h
@@ -58,6 +58,8 @@
 #define DESTROY_POLICY        14
 #define LIST_POLICY           15
 
+extern char *progname;
+
 extern int exit_status;
 extern krb5_context util_context;