From: Tom Yu <tlyu@mit.edu>
Date: Tue, 23 Mar 2010 01:31:49 +0000 (+0000)
Subject: pull up r23679 from trunk
X-Git-Tag: krb5-1.7.2-final~12
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a0837453f25a38e30fad3844604bd95c147c409a;p=krb5.git

pull up r23679 from trunk

 ------------------------------------------------------------------------
 r23679 | ghudson | 2010-01-31 13:04:48 -0800 (Sun, 31 Jan 2010) | 4 lines

 ticket: 6650

 Fix minor error-handling bug in r23676.

ticket: 6650
version_fixed: 1.7.2
status: resolved

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

diff --git a/src/kadmin/dbutil/kdb5_mkey.c b/src/kadmin/dbutil/kdb5_mkey.c
index d236c8964..16280d4df 100644
--- a/src/kadmin/dbutil/kdb5_mkey.c
+++ b/src/kadmin/dbutil/kdb5_mkey.c
@@ -1194,7 +1194,7 @@ kdb5_purge_mkeys(int argc, char *argv[])
     }
 
     if (master_keylist == NULL) {
-        com_err(progname, retval, "master keylist not initialized");
+        com_err(progname, 0, "master keylist not initialized");
         exit_status++;
         return;
     }