* g_pw_in_tkt.c: Include krb5.h so that des_read_password()

	prototype is present in des.h. Cast argument to des_read_password.

	* getst.c, put_svc_key.c, rd_svc_key.c, save_creds.c, tf_util.c:
	Include krb4int.h for prototypes.

	* krb4int.h: New file containing private prototypes for krb4
	functions not used outside the library. Contains getst() and
	tf_save_cred().

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

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 9b6c2ca76aacf3666be6af7c62ba1f0490b12b7d..094e2f841fae7287e948a44d4e24c87a8a26136f 100644 (file)
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,15 @@
+2001-06-18  Ezra Peisach  <epeisach@mit.edu>
+
+       * g_pw_in_tkt.c: Include krb5.h so that des_read_password()
+       prototype is present in des.h. Cast argument to des_read_password.
+
+       * getst.c, put_svc_key.c, rd_svc_key.c, save_creds.c, tf_util.c:
+       Include krb4int.h for prototypes.
+
+       * krb4int.h: New file containing private prototypes for krb4
+       functions not used outside the library. Contains getst() and
+       tf_save_cred().
+
 2001-06-11  Ezra Peisach  <epeisach@mit.edu>
 
        * sendauth.c (krb_sendauth): Add KRB5_DLLIMP/KRB5_CALLCONV definitions

diff --git a/src/lib/krb4/g_pw_in_tkt.c b/src/lib/krb4/g_pw_in_tkt.c
index 13f762b0110a3a755f6b8e3a88e252d11e8e2c2e..91e24a1c638e0c46b0a397295e65377940f03c5a 100644 (file)
--- a/src/lib/krb4/g_pw_in_tkt.c
+++ b/src/lib/krb4/g_pw_in_tkt.c
@@ -8,6 +8,7 @@
  */
 
 #include "mit-copyright.h"
+#include <krb5.h>
 #include "krb.h"
 #include "krb_err.h"
 #include "prot.h"
@@ -61,7 +62,7 @@ passwd_to_key(user,instance,realm,passwd,key)
     if (passwd)
         string_to_key(passwd, key);
     else {
-        des_read_password(key, "Password: ", 0);
+        des_read_password((des_cblock *)key, "Password: ", 0);
     }
 #endif /* NOENCRYPTION */
 #endif /* unix */

diff --git a/src/lib/krb4/getst.c b/src/lib/krb4/getst.c
index 763f89f7e1a86ad7adf260d0bd7c0620ad46b480..ebcf54a70974a72338a5eaab2e3458dff100f24e 100644 (file)
--- a/src/lib/krb4/getst.c
+++ b/src/lib/krb4/getst.c
@@ -9,6 +9,7 @@
 
 #include "mit-copyright.h"
 #include "krb.h"
+#include "krb4int.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/lib/krb4/krb4int.h b/src/lib/krb4/krb4int.h
new file mode 100644 (file)
index 0000000..bdd3281
--- /dev/null
+++ b/src/lib/krb4/krb4int.h
@@ -0,0 +1,8 @@
+/* A series of private prototypes that we are not exporting but should
+ * be available for self consistancy in the library.
+ */
+
+
+int getst(int, char *, int);
+
+int tf_save_cred(char *, char *, char *, C_Block, int , int, KTEXT, long);

diff --git a/src/lib/krb4/put_svc_key.c b/src/lib/krb4/put_svc_key.c
index f520b17dc3bb9ec9425dc05496066379d74835f0..e2eb24d84d1feca9828dbc7cb081201069c7e35f 100644 (file)
--- a/src/lib/krb4/put_svc_key.c
+++ b/src/lib/krb4/put_svc_key.c
@@ -23,6 +23,7 @@
  */
 
 #include "krb.h"
+#include "krb4int.h"
 
 #include <string.h>
 #include <stdio.h>

diff --git a/src/lib/krb4/rd_svc_key.c b/src/lib/krb4/rd_svc_key.c
index 9659b7434604c985941cbdb960702490e68aab58..15d0f463c6862c27d149adada454bbf7e3f6a2ce 100644 (file)
--- a/src/lib/krb4/rd_svc_key.c
+++ b/src/lib/krb4/rd_svc_key.c
@@ -10,6 +10,7 @@
 
 #include "mit-copyright.h"
 #include "krb.h"
+#include "krb4int.h"
 #include <stdio.h>
 #include <string.h>
 

diff --git a/src/lib/krb4/save_creds.c b/src/lib/krb4/save_creds.c
index 40f7ca5b47b2148da8f58f640b694f49c39d3aef..4f2a0e6ccfe51b7950a75621e6ecf5231c9be1b5 100644 (file)
--- a/src/lib/krb4/save_creds.c
+++ b/src/lib/krb4/save_creds.c
@@ -11,6 +11,7 @@
 #include "mit-copyright.h"
 #include <stdio.h>
 #include "krb.h"
+#include "krb4int.h"
 
 /*
  * This routine takes a ticket and associated info and calls

diff --git a/src/lib/krb4/tf_util.c b/src/lib/krb4/tf_util.c
index 71706c0e19fb6bbe60f5209645c5440a488d87fe..bda4d4142d862a404bf142b1132da642cdb2f67e 100644 (file)
--- a/src/lib/krb4/tf_util.c
+++ b/src/lib/krb4/tf_util.c
@@ -26,6 +26,7 @@
 
 #include "krb.h"
 #include "k5-int.h"
+#include "krb4int.h"
 
 #include <stdio.h>
 #include <string.h>