Move declaration of std_ks_tuple from kdb5_edit.h to cpw.c (extern part)

as  not all sources include adm.h for the necessary structures.

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

diff --git a/src/admin/edit/ChangeLog b/src/admin/edit/ChangeLog
index 4409397cd4bfaedc5a651556e36feb459b6e428a..774762ef5e9bea6aad8ec79656e616d0f9f22161 100644 (file)
--- a/src/admin/edit/ChangeLog
+++ b/src/admin/edit/ChangeLog
@@ -1,3 +1,9 @@
+Thu Oct  5 10:35:35 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+       * cpw.c: Declare std_ks_tuple as extern.
+       * kdb5_edit.h: Remove std_ks_tuple declaration as not all sources
+               include adm.h for structures
+
 Tue Oct  3 23:10:57 1995  Theodore Y. Ts'o  <tytso@dcl>
 
        * cpw.c (enter_rnd_key, enter_pwd_key):

diff --git a/src/admin/edit/cpw.c b/src/admin/edit/cpw.c
index adb8e9c6b5ea680d155754c9d79b7463368616b0..1afc293e929cbaaeaf8679c24bb395668dae6060 100644 (file)
--- a/src/admin/edit/cpw.c
+++ b/src/admin/edit/cpw.c
@@ -36,6 +36,9 @@ extern char   *Err_no_master_msg;
 extern char    *Err_no_database;
 extern char    *current_dbname;
 
+extern krb5_key_salt_tuple *std_ks_tuple;
+extern int std_ks_tuple_count;
+
 /*
  * I can't figure out any way for this not to be global, given how ss
  * works.

diff --git a/src/admin/edit/kdb5_edit.h b/src/admin/edit/kdb5_edit.h
index c04f2ed96d9425cfc565881e6839fe1d4c041cae..cc988011d266e1d17476ffbe9985b6fcd791f3ea 100644 (file)
--- a/src/admin/edit/kdb5_edit.h
+++ b/src/admin/edit/kdb5_edit.h
@@ -36,9 +36,6 @@ struct mblock {
     krb5_kvno mkvno;
 };
 
-extern krb5_key_salt_tuple *std_ks_tuple;
-extern int std_ks_tuple_count;
-
 void add_key 
        PROTOTYPE((char const *, char const *, 
                   krb5_const_principal, const krb5_keyblock *,