* krb5forw.h: File with prototype for rd_and_store_for_creds()

	* kerberos5.c: Include krb5forw.h for rd_and_store_for_creds()
	prototype which is removed from this file.

	* forward.c: Include krb5forw.h for prototype.

	* setenv.c: Include misc-proto.h for setenv/unsetenv prototypes.

	* parsetos.c: Include misc-proto.h for parsetos prototype.

	* misc-proto.h: Add prototype for parsetos(), setenv(), unsetenv()
	as needed.

	* kerberos5.c: Declare kerberos5_forward() static and flush out
	prototype.

	* gettytab.h: Flush out prototypes for getent() and getstr().

	* getent.c: Include gettytab.h for prototypes.

	* genget.c: Include misc.h for prototypes.

	* enc_des.c: Add prototype for fb64_printsub.

	* enc-proto.h: Add prototypes for encrypt_debug(),
	finddecryption(), EncryptAuthEnc(), EncryptAutoDec(),
	EncryptDebug(), EncryptVerbose().

	* encrypt.c: Declare encrypt_list_types() and encrypt_keyid() static.

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

diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog
index ed1b7a40e740ad8110c14222a7f99a54a61f3d38..44f6e02984a2ced626f19458c016d59b47ca5640 100644 (file)
--- a/src/appl/telnet/libtelnet/ChangeLog
+++ b/src/appl/telnet/libtelnet/ChangeLog
@@ -1,3 +1,36 @@
+2001-07-02  Ezra Peisach  <epeisach@mit.edu>
+
+       * krb5forw.h: File with prototype for rd_and_store_for_creds().
+
+       * kerberos5.c: Include krb5forw.h for rd_and_store_for_creds()
+       prototype which is removed from this file.
+
+       * forward.c: Include krb5forw.h for prototype.
+
+       * setenv.c: Include misc-proto.h for setenv/unsetenv prototypes.
+
+       * parsetos.c: Include misc-proto.h for parsetos prototype.
+
+       * misc-proto.h: Add prototype for parsetos(), setenv(), unsetenv()
+       as needed.
+
+       * kerberos5.c: Declare kerberos5_forward() static and flush out
+       prototype.
+
+       * gettytab.h: Flush out prototypes for getent() and getstr().
+
+       * getent.c: Include gettytab.h for prototypes.
+
+       * genget.c: Include misc.h for prototypes.
+
+       * enc_des.c: Add prototype for fb64_printsub.
+
+       * enc-proto.h: Add prototypes for encrypt_debug(),
+       finddecryption(), EncryptAuthEnc(), EncryptAutoDec(),
+       EncryptDebug(), EncryptVerbose().
+
+       * encrypt.c: Declare encrypt_list_types() and encrypt_keyid() static.
+
 2001-06-22  Ezra Peisach  <epeisach@mit.edu>
 
        * enc_des.c: Change local variable index to idx to not shadown

diff --git a/src/appl/telnet/libtelnet/enc-proto.h b/src/appl/telnet/libtelnet/enc-proto.h
index 064bfe0f176a67b988e60f90bb0b77809ce833c2..c0966909259765a56f94bb5efa62d13a876ebf6e 100644 (file)
--- a/src/appl/telnet/libtelnet/enc-proto.h
+++ b/src/appl/telnet/libtelnet/enc-proto.h
@@ -66,9 +66,11 @@
 #ifdef ENCRYPTION
 void encrypt_init P((char *, int));
 Encryptions *findencryption P((int));
+Encryptions *finddecryption P((int));
 void encrypt_send_supprt P((void));
 void encrypt_auto P((int));
 void decrypt_auto P((int));
+void encrypt_debug P((int));
 void encrypt_is P((unsigned char *, int));
 void encrypt_reply P((unsigned char *, int));
 void encrypt_start_input P((int));
@@ -81,8 +83,11 @@ void encrypt_send_request_end P((void));
 void encrypt_send_end P((void));
 void encrypt_wait P((void));
 int encrypt_is_encrypting P((void));
+int EncryptAutoEnc P((int));
+int EncryptAutoDec P((int));
 int EncryptEnable P((char *, char *));
 int EncryptDisable P((char *, char *));
+int EncryptDebug P((int));
 int EncryptType P((char *, char *));
 int EncryptStart P((char *));
 int EncryptStartInput P((void));
@@ -91,6 +96,7 @@ int EncryptStop P((char *));
 int EncryptStopInput P((void));
 int EncryptStopOutput P((void));
 int EncryptStatus P((void));
+int EncryptVerbose P((int));
 void encrypt_send_support P((void));
 void encrypt_send_keyid P((int, unsigned char *, int, int));
 int net_write P((unsigned char *, int));

diff --git a/src/appl/telnet/libtelnet/enc_des.c b/src/appl/telnet/libtelnet/enc_des.c
index 393ac3cdb0b37980b22d3640fb687ac19b6d547d..34825789c80530b28057c4f972bc250ff2803ba9 100644 (file)
--- a/src/appl/telnet/libtelnet/enc_des.c
+++ b/src/appl/telnet/libtelnet/enc_des.c
@@ -149,6 +149,8 @@ int fb64_reply P((unsigned char *, int, struct fb *));
 static void fb64_session P((Session_Key *, int, struct fb *));
 void fb64_stream_key P((Block, struct stinfo *));
 int fb64_keyid P((int, unsigned char *, int *, struct fb *));
+void fb64_printsub P((unsigned char *, int, unsigned char *, int, 
+                    unsigned char *));
 
 static void ecb_encrypt(stp, in, out)
      struct stinfo *stp;

diff --git a/src/appl/telnet/libtelnet/encrypt.c b/src/appl/telnet/libtelnet/encrypt.c
index 5f8ece66dae0166994dc75f0d4fa259e0492795b..0e252ebccba7cebd2fff701fec1241a3f37e6d4e 100644 (file)
--- a/src/appl/telnet/libtelnet/encrypt.c
+++ b/src/appl/telnet/libtelnet/encrypt.c
@@ -214,7 +214,7 @@ encrypt_init(name, server)
        str_send[str_suplen++] = SE;
 }
 
-       void
+static void
 encrypt_list_types()
 {
        Encryptions *ep = encryptions;
@@ -730,7 +730,7 @@ encrypt_request_start(data, cnt)
 
 static unsigned char str_keyid[(MAXKEYLEN*2)+5] = { IAC, SB, TELOPT_ENCRYPT };
 
-void encrypt_keyid();
+static void encrypt_keyid P((struct key_info *kp, unsigned char *, int));
                
 void encrypt_enc_keyid(keyid, len)
        unsigned char *keyid;
@@ -746,7 +746,7 @@ void encrypt_dec_keyid(keyid, len)
        encrypt_keyid(&ki[0], keyid, len);
 }
 
-void encrypt_keyid(kp, keyid, len)
+static void encrypt_keyid(kp, keyid, len)
        struct key_info *kp;
        unsigned char *keyid;
        int len;

diff --git a/src/appl/telnet/libtelnet/forward.c b/src/appl/telnet/libtelnet/forward.c
index e7059e002eaf5051a7aca07e1228896dc9ac70e8..62a59d5922a01fd1a3f537993e0ad7f84bc220dd 100644 (file)
--- a/src/appl/telnet/libtelnet/forward.c
+++ b/src/appl/telnet/libtelnet/forward.c
@@ -28,6 +28,7 @@
 #include <netdb.h>
  
 #include "k5-int.h"
+#include "krb5forw.h"
  
 #ifdef NEED_SETENV
 extern int setenv(char *, char *, int);

diff --git a/src/appl/telnet/libtelnet/genget.c b/src/appl/telnet/libtelnet/genget.c
index 5f6876d38e5d866149fb00424ebe8f04ffa7e9c0..bc307c81fb5818431978eec8c298de2d387c8869 100644 (file)
--- a/src/appl/telnet/libtelnet/genget.c
+++ b/src/appl/telnet/libtelnet/genget.c
@@ -34,6 +34,7 @@
 /* based on @(#)genget.c       8.1 (Berkeley) 6/4/93 */
 
 #include <ctype.h>
+#include "misc.h"
 
 #define        LOWER(x) (isupper((int) x) ? tolower((int) x) : (x))
 /*
@@ -95,7 +96,7 @@ genget(name, table, stlen)
  */
        int
 Ambiguous(s)
-       char *s;
+       void *s;
 {
        return((char **)s == &ambiguous);
 }

diff --git a/src/appl/telnet/libtelnet/getent.c b/src/appl/telnet/libtelnet/getent.c
index 8d77ba3bf25d949cd87cbf98a1a76fc24887bd70..b80439e6ea67215cfeff845471c3d38598113ab3 100644 (file)
--- a/src/appl/telnet/libtelnet/getent.c
+++ b/src/appl/telnet/libtelnet/getent.c
@@ -33,6 +33,8 @@
 
 /* based on @(#)getent.c       8.1 (Berkeley) 6/4/93 */
 
+#include "gettytab.h"
+
 #ifdef HAVE_CGETENT
 static char *area;
 #endif

diff --git a/src/appl/telnet/libtelnet/gettytab.h b/src/appl/telnet/libtelnet/gettytab.h
index a96dcf31eb5644fb00a9db8153a4ca10cde19140..02e5050a8d67b97998b00aed1497ba1ea0de14c3 100644 (file)
--- a/src/appl/telnet/libtelnet/gettytab.h
+++ b/src/appl/telnet/libtelnet/gettytab.h
@@ -107,10 +107,12 @@ struct gettyflags {
 #define DX     gettyflags[20].value
 #define RM     gettyflags[21].value
 
-int    getent();
+int    getent (char *, char *);
 long   getnum();
 int    getflag();
-char   *getstr();
+#ifndef SOLARIS
+char   *getstr(char *, char **);
+#endif
 
 extern struct gettyflags gettyflags[];
 extern struct gettynums gettynums[];

diff --git a/src/appl/telnet/libtelnet/kerberos5.c b/src/appl/telnet/libtelnet/kerberos5.c
index 44390d8851770f04bf4ad973ae551f2a2516ce86..d57a735b0bfb38c2f7be1f5ec8a3e5299bd23702 100644 (file)
--- a/src/appl/telnet/libtelnet/kerberos5.c
+++ b/src/appl/telnet/libtelnet/kerberos5.c
@@ -91,11 +91,9 @@ extern int net;
 #ifdef FORWARD
 int forward_flags = 0;  /* Flags get set in telnet/main.c on -f and -F */
 
-void kerberos5_forward();
+static void kerberos5_forward(Authenticator *);
 
-extern krb5_error_code
-rd_and_store_for_creds(krb5_context, krb5_auth_context, krb5_data *, 
-                      krb5_ticket *);
+#include "krb5forw.h"
 
 #endif /* FORWARD */
 
@@ -802,7 +800,7 @@ kerberos5_printsub(data, cnt, buf, buflen)
 
 #ifdef FORWARD
 
-void
+static void
 kerberos5_forward(ap)
      Authenticator *ap;
 {

diff --git a/src/appl/telnet/libtelnet/krb5forw.h b/src/appl/telnet/libtelnet/krb5forw.h
new file mode 100644 (file)
index 0000000..1fb757d
--- /dev/null
+++ b/src/appl/telnet/libtelnet/krb5forw.h
@@ -0,0 +1,4 @@
+extern krb5_error_code 
+rd_and_store_for_creds(krb5_context, krb5_auth_context, krb5_data *, 
+                      krb5_ticket *);
+

diff --git a/src/appl/telnet/libtelnet/misc-proto.h b/src/appl/telnet/libtelnet/misc-proto.h
index 9046fa3652c89b84edcc4edb0a175973d439a165..6e495c81dd3241b41dd3faced60bb3f0869b33f3 100644 (file)
--- a/src/appl/telnet/libtelnet/misc-proto.h
+++ b/src/appl/telnet/libtelnet/misc-proto.h
@@ -80,4 +80,17 @@ void net_encrypt P((void));
 int telnet_spin P((void));
 char *telnet_getenv P((char *));
 char *telnet_gets P((char *, char *, int, int));
+
+
+#ifdef NEED_PARSETOS
+int parsetos(char *, char *);
+#endif
+
+#ifdef NEED_SETENV
+int setenv(const char *, const char *, int);
+#ifndef HAVE_UNSETENV
+void unsetenv(const char *);
+#endif
+#endif
+
 #endif

diff --git a/src/appl/telnet/libtelnet/parsetos.c b/src/appl/telnet/libtelnet/parsetos.c
index c88205e480e7f281f4600a57335d23bdbaeb8d7a..303d7c3e52d2c8ff7c6ef03b099efa4df9c444e9 100644 (file)
--- a/src/appl/telnet/libtelnet/parsetos.c
+++ b/src/appl/telnet/libtelnet/parsetos.c
@@ -9,7 +9,8 @@
 #include <sys/types.h>
 #include <netdb.h>
 #include <errno.h>
-
+#define NEED_PARSETOS
+#include "misc-proto.h"
 
 #define        MIN_TOS 0
 #define        MAX_TOS 255

diff --git a/src/appl/telnet/libtelnet/setenv.c b/src/appl/telnet/libtelnet/setenv.c
index b8e153835f0f3f01a9db2c499be30498e58c0642..f19c8a144cb9f9569ab389f6dc6b840a057aec4a 100644 (file)
--- a/src/appl/telnet/libtelnet/setenv.c
+++ b/src/appl/telnet/libtelnet/setenv.c
@@ -42,10 +42,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifndef        __P
-#define __P(x) ()
-#endif
-static char *__findenv __P((const char *, int *)); 
+#include "misc-proto.h"
+
+static char *__findenv P((const char *, int *)); 
 
 /*
  * setenv --