pull up r20531 from trunk

 r20531@cathode-dark-space:  tlyu | 2008-07-16 19:01:54 -0400
 ticket: 6028
 target_version: 1.6.4
 tags: pullup

 Apply patch from Mark Phalan to initialize progname before use.

ticket: 6028
status: resolved
version_fixed: 1.6.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@20548 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c
index 1807d1ad00fcfe164e659b9ad9697f557673b23d..ff52e4c4246e2830bbe6a8730b80a69d7ac12926 100644 (file)
--- a/src/kadmin/dbutil/kdb5_util.c
+++ b/src/kadmin/dbutil/kdb5_util.c
@@ -186,16 +186,18 @@ int main(argc, argv)
 
     set_com_err_hook(extended_com_err_fn);
 
+    /*
+     * Ensure that "progname" is set before calling com_err.
+     */
+    progname = (strrchr(argv[0], '/') ?
+           strrchr(argv[0], '/') + 1 : argv[0]);
+
     retval = kadm5_init_krb5_context(&util_context);
     if (retval) {
            com_err (progname, retval, "while initializing Kerberos code");
            exit(1);
     }
 
-/*     initialize_adb_error_table(); */
-
-    progname = (strrchr(argv[0], '/') ? strrchr(argv[0], '/')+1 : argv[0]);
-
     cmd_argv = (char **) malloc(sizeof(char *)*argc);
     if (cmd_argv == NULL) {
         com_err(progname, ENOMEM, "while creating sub-command arguments");

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 9fcc7b79d435a09eac0bb3611b79385dab1f31e4..d7a05a3d81719b74b54c4cff635308be63df336d 100644 (file)
--- a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
+++ b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
@@ -303,6 +303,11 @@ int main(argc, argv)
     krb5_boolean realm_name_required = TRUE;
     krb5_boolean print_help_message = FALSE;
 
+    /*
+     * Ensure that "progname" is set before calling com_err.
+     */
+    progname = (strrchr(argv[0], '/') ? strrchr(argv[0], '/')+1 : argv[0]);
+
     retval = krb5_init_context(&util_context);
     set_com_err_hook(extended_com_err_fn);
     if (retval) {
@@ -311,8 +316,6 @@ int main(argc, argv)
        goto cleanup;
     }
 
-    progname = (strrchr(argv[0], '/') ? strrchr(argv[0], '/')+1 : argv[0]);
-
     cmd_argv = (char **) malloc(sizeof(char *)*argc);
     if (cmd_argv == NULL) {
        com_err(progname, ENOMEM, "while creating sub-command arguments");