* dumpv4.c: Pass C_Block * to des_read_password() as per prototype

	* loadv4.c: Include k5-int.h before des.h for des_read_password
	prototype. Pass C_Block * to des_read_password() as per prototype.

	* kdb5_util.h: Add prototype for usage.

	* kdb5_create.c, kdb5_destroy.c, kdb5_stash.c: Include kdb5_util.h
	for usage() prototype.

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

7 files changed, 23 insertions, 4 deletions

diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index 10e2df0343..c620f20ae5 100644
--- a/src/kadmin/dbutil/ChangeLog
+++ b/src/kadmin/dbutil/ChangeLog
@@ -1,3 +1,15 @@
+2001-06-08  Ezra Peisach  <epeisach@mit.edu>
+
+	* dumpv4.c: Pass C_Block * to des_read_password() as per prototype.
+
+	* loadv4.c: Include k5-int.h before des.h for des_read_password
+	prototype. Pass C_Block * to des_read_password() as per prototype.
+
+	* kdb5_util.h: Add prototype for usage.
+
+	* kdb5_create.c, kdb5_destroy.c, kdb5_stash.c: Include kdb5_util.h
+	for usage() prototype.
+
 2001-06-04  Ezra Peisach  <epeisach@mit.edu>
 
 	* kadm5_create.c: Add prototype for static
diff --git a/src/kadmin/dbutil/dumpv4.c b/src/kadmin/dbutil/dumpv4.c
index 0afbadae91..461da833d2 100644
--- a/src/kadmin/dbutil/dumpv4.c
+++ b/src/kadmin/dbutil/dumpv4.c
@@ -112,7 +112,7 @@ v4init(arg, manual)
 	}
     }
     if (!ok) {
-	des_read_password(arg->v4_master_key, "V4 Kerberos master key: ", 1);
+	des_read_password(&arg->v4_master_key, "V4 Kerberos master key: ", 1);
 	printf("\n");
     }
     arg->master_key_version = 1;
diff --git a/src/kadmin/dbutil/kdb5_create.c b/src/kadmin/dbutil/kdb5_create.c
index f10f6a4f87..02100db5b3 100644
--- a/src/kadmin/dbutil/kdb5_create.c
+++ b/src/kadmin/dbutil/kdb5_create.c
@@ -57,6 +57,7 @@
 #include <k5-int.h>
 #include <kadm5/admin.h>
 #include <kadm5/adb.h>
+#include "kdb5_util.h"
 
 enum ap_op {
     NULL_KEY,				/* setup null keys */
diff --git a/src/kadmin/dbutil/kdb5_destroy.c b/src/kadmin/dbutil/kdb5_destroy.c
index ea2fb7142a..62d65ed498 100644
--- a/src/kadmin/dbutil/kdb5_destroy.c
+++ b/src/kadmin/dbutil/kdb5_destroy.c
@@ -34,6 +34,7 @@
 #include "com_err.h"
 #include <kadm5/admin.h>
 #include <kadm5/adb.h>
+#include "kdb5_util.h"
 
 extern int errno;
 extern int exit_status;
diff --git a/src/kadmin/dbutil/kdb5_stash.c b/src/kadmin/dbutil/kdb5_stash.c
index 46a2c61921..0c6aed5ca4 100644
--- a/src/kadmin/dbutil/kdb5_stash.c
+++ b/src/kadmin/dbutil/kdb5_stash.c
@@ -57,6 +57,7 @@
 #include "com_err.h"
 #include <kadm5/admin.h>
 #include <stdio.h>
+#include "kdb5_util.h"
 
 extern int errno;
 
diff --git a/src/kadmin/dbutil/kdb5_util.h b/src/kadmin/dbutil/kdb5_util.h
index 52175e56fe..8c72754d14 100644
--- a/src/kadmin/dbutil/kdb5_util.h
+++ b/src/kadmin/dbutil/kdb5_util.h
@@ -81,3 +81,6 @@ extern void kdb5_stash PROTOTYPE((int argc, char **argv));
 extern void update_ok_file PROTOTYPE((char *file_name));
 
 extern int kadm5_create PROTOTYPE((kadm5_config_params *params));
+
+void usage PROTOTYPE((void));
+
diff --git a/src/kadmin/dbutil/loadv4.c b/src/kadmin/dbutil/loadv4.c
index d4de7572c0..a93f7aadff 100644
--- a/src/kadmin/dbutil/loadv4.c
+++ b/src/kadmin/dbutil/loadv4.c
@@ -56,6 +56,9 @@
 
 #ifdef KRB5_KRB4_COMPAT
 
+#include "k5-int.h"
+#include "com_err.h"
+
 #include <des.h>
 #include <krb.h>
 #include <krb_db.h>
@@ -67,8 +70,6 @@ static Key_schedule master_key_schedule;
 
 static char *v4_mkeyfile = "/.k";
 
-#include "k5-int.h"
-#include "com_err.h"
 #include <kadm5/admin.h>
 #include <stdio.h>
 /* Define to make certain blocks private */
@@ -463,7 +464,7 @@ char *dumpfile;
 	}
     }
     if (!ok) {
-	des_read_password(master_key, "V4 Kerberos master key: ", 0);
+	des_read_password(&master_key, "V4 Kerberos master key: ", 0);
 	printf("\n");
     }
     key_sched(master_key, master_key_schedule);