* kdb5_util.c (ARG_VAL): case second half of ?: operator to char *

 	to fix problem on AIX; this should have worked anyway because of
 	the , operator but it is easy enough to force the solution, too.
	[krb5-admin/41]

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

diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index e0f8c50212f4de6cb4d15f5e4a99915fd677afce..67ca0370c2baa417ee3b9dd607e00ff7a56274af 100644 (file)
--- a/src/kadmin/dbutil/ChangeLog
+++ b/src/kadmin/dbutil/ChangeLog
@@ -1,3 +1,10 @@
+Thu Oct  3 18:17:36 1996  Barry Jaspan  <bjaspan@mit.edu>
+
+       * kdb5_util.c (ARG_VAL): case second half of ?: operator to char *
+       to fix problem on AIX; this should have worked anyway because of
+       the , operator but it is easy enough to force the solution, too.
+       [krb5-admin/41]
+
 Tue Sep 10 14:16:40 1996  Tom Yu  <tlyu@mit.edu>
 
        * kdb5_edit.M: remove extra args from .TH

diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c
index f207aaa71493bbd8f6f1c4870993d13d61bd947f..06597e7dfca132f69871b88ef09e5a496a1cebf5 100644 (file)
--- a/src/kadmin/dbutil/kdb5_util.c
+++ b/src/kadmin/dbutil/kdb5_util.c
@@ -82,6 +82,7 @@ int dump_db(int, char **);
 int load_db(int, char **);
 int dump_v4db(int, char **);
 int load_v4db(int, char **);
+int open_db_and_mkey();
    
 typedef int (*cmd_func)(int, char **);
 
@@ -114,7 +115,7 @@ struct _cmd_table *cmd_lookup(name)
      return NULL;
 }
 
-#define ARG_VAL (--argc > 0 ? optarg = *(++argv) : (usage(), NULL))
+#define ARG_VAL (--argc > 0 ? (optarg = *(++argv)) : (char *)(usage(), NULL))
      
 int main(argc, argv)
     int argc;
@@ -280,7 +281,7 @@ void set_dbname(argc, argv)
 int open_db_and_mkey()
 {
     krb5_error_code retval;
-    int nentries, i;
+    int nentries;
     krb5_boolean more;
     krb5_data scratch, pwd;