summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzra Peisach <epeisach@mit.edu>1995-09-08 11:38:11 +0000
committerEzra Peisach <epeisach@mit.edu>1995-09-08 11:38:11 +0000
commita0455835a55a389676fdb2fb948a8e2bfa74a7ae (patch)
tree08ad526ad52659840c4dbf704d9aa4de1ba4ffff
parent8d95866938341408220f57d8fd3bc661778715fd (diff)
downloadkrb5-a0455835a55a389676fdb2fb948a8e2bfa74a7ae.tar.gz
krb5-a0455835a55a389676fdb2fb948a8e2bfa74a7ae.tar.xz
krb5-a0455835a55a389676fdb2fb948a8e2bfa74a7ae.zip
If V4 compatibility is not enabled, provide a dummy routine for
loading a v4 database. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6741 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/admin/edit/ChangeLog5
-rw-r--r--src/admin/edit/loadv4.c12
2 files changed, 16 insertions, 1 deletions
diff --git a/src/admin/edit/ChangeLog b/src/admin/edit/ChangeLog
index 5814b01460..859569cf5f 100644
--- a/src/admin/edit/ChangeLog
+++ b/src/admin/edit/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 7 20:41:24 1995 Ezra Peisach <epeisach@kangaroo.mit.edu>
+
+ * loadv4.c (load_v4db): Provide a dummy routine if krb4
+ compatibility is not compiled in.
+
Wed Sep 06 14:20:57 1995 Chris Provenzano (proven@mit.edu)
* cpw.c, dump.c, dumpv4.c, kdb5_edit.c, loadv4.c :
diff --git a/src/admin/edit/loadv4.c b/src/admin/edit/loadv4.c
index e72c7996a7..d2d063a1d7 100644
--- a/src/admin/edit/loadv4.c
+++ b/src/admin/edit/loadv4.c
@@ -25,6 +25,8 @@
* entries from a V4 database.
*/
+#ifdef KRB5_KRB4_COMPAT
+
#include <des.h>
#include <krb.h>
#include <krb_db.h>
@@ -863,5 +865,13 @@ static krb5_error_code fixup_database(context, realm)
return retval;
}
-
+#else /* KRB5_KRB4_COMPAT */
+void
+load_v4db(argc, argv)
+ int argc;
+ char *argv[];
+{
+ printf("This version of krb5_edit does not support the V4 load command.\n");
+}
+#endif /* KRB5_KRB4_COMPAT */