[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-21-g5797e60

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  5797e60bbe497ace08232d4e76801b0a69b717c3 (commit)
      from  304585e609b5caa16bb9216a0645cb697d3a3388 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=5797e60bbe497ace08232d4e76801b0a69b717c3


commit 5797e60bbe497ace08232d4e76801b0a69b717c3
Author: Mats Erik Andersson <address@hidden>
Date:   Thu Feb 2 12:37:44 2012 +0100

    Missing prototypes with libshishi.

diff --git a/ChangeLog b/ChangeLog
index 72e0c57..fd564cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2012-02-02  Mats Erik Andersson <address@hidden>
+
+       Full set of prototypes for Shishi enabled builds.
+       * libinetutils/shishi_def.h [SHISHI] (krcmd, krcmd_mutual):
+       New prototypes.
+       * libtelnet/auth-proto.h [AUTHENTICATION] (auth_name): Likewise.
+       * libtelnet/auth.c [AUTHENTICATION] (auth_onoff): Likewise.
+       * libtelnet/enc-proto.h [ENCRYPTION] (EncryptStart, EncryptStartInput)
+       (EncryptStartOutput, EncryptStatus, EncryptStop, EncryptStopInput)
+       (EncryptStopOutput, EncryptType, encrypt_start, encrypt_end)
+       (encrypt_request_start, encrypt_request_end, encrypt_support)
+       (encrypt_dec_keyid, encrypt_enc_keyid): Likewise.
+       * libtelnet/genget.h (Ambiguous): Likewise.
+       * libtelnet/misc-proto.h (auth_encrypt_user): Likewise.
+       * src/rlogind.c [SHISHI] (do_shishi_login): New prototype.
+       * telnet/commands.c [ENCRYPTION]: Include <libtelnet/encrypt.h>.
+       [AUTHENTICATION || ENCRYPTION]: Include <libtelnet/misc.h>.
+       * telnet/main.c [AUTHENTICATION]: Include <libtelnet/auth.h>.
+       [ENCRYPTION]: Include <libtelnet/encrypt.h>.
+       * telnet/telnet.c [AUTHENTICATION]: Include <libtelnet/auth.h>.
+       [ENCRYPTION]: Include <libtelnet/encrypt.h>.
+       [AUTHENTICATION || ENCRYPTION]: Include <libtelnet/misc.h>.
+       * telnet/terminal.c [ENCRYPTION]: Include <libtelnet/encrypt.h>.
+       * telnetd/telnetd.c [AUTHENTICATION || ENCRYPTION]: Include
+       <libtelnet/misc.h>.
+
 2012-02-01  Mats Erik Andersson <address@hidden>
 
        * tests/syslogd.sh (do_inet_socket): New variable.
diff --git a/libinetutils/shishi_def.h b/libinetutils/shishi_def.h
index fe885c4..8a43b10 100644
--- a/libinetutils/shishi_def.h
+++ b/libinetutils/shishi_def.h
@@ -68,4 +68,11 @@ extern int readenc (Shishi * h, int sock, char *buf, int 
*len,
 extern int writeenc (Shishi * h, int sock, char *buf, int wlen, int *len,
                     shishi_ivector * iv, Shishi_key * enckey, int proto);
 
+extern int krcmd (Shishi ** h, char **ahost, unsigned short rport,
+                 char **remuser, char *cmd, int *fd2p, char *realm);
+
+extern int krcmd_mutual (Shishi ** h, char **ahost, unsigned short rport,
+                        char **remuser, char *cmd, int *fd2p, char *realm,
+                        Shishi_key ** key);
+
 #endif
diff --git a/libtelnet/auth-proto.h b/libtelnet/auth-proto.h
index f155d36..7d21375 100644
--- a/libtelnet/auth-proto.h
+++ b/libtelnet/auth-proto.h
@@ -79,6 +79,7 @@ void auth_is (unsigned char *, int);
 void auth_reply (unsigned char *, int);
 void auth_finished (TN_Authenticator *, int);
 int auth_wait (char *);
+void auth_name (unsigned char *, int);
 void auth_disable_name (char *);
 void auth_printsub (unsigned char *, int, unsigned char *, int);
 int auth_sendname (unsigned char *, int);
diff --git a/libtelnet/auth.c b/libtelnet/auth.c
index 9f3f24f..886b0ef 100644
--- a/libtelnet/auth.c
+++ b/libtelnet/auth.c
@@ -307,6 +307,8 @@ getauthmask (char *type, int *maskp)
   return (0);
 }
 
+int auth_onoff (char *, int);
+
 int
 auth_enable (char *type)
 {
diff --git a/libtelnet/enc-proto.h b/libtelnet/enc-proto.h
index d0c5f1b..8632733 100644
--- a/libtelnet/enc-proto.h
+++ b/libtelnet/enc-proto.h
@@ -68,6 +68,15 @@
  */
 
 #ifdef ENCRYPTION
+int EncryptStart (char *);
+int EncryptStartInput (void);
+int EncryptStartOutput (void);
+int EncryptStatus (void);
+int EncryptStop (char *);
+int EncryptStopInput (void);
+int EncryptStopOutput (void);
+int EncryptType (char *, char *);
+
 void encrypt_init (char *, int);
 Encryptions *findencryption (int);
 void encrypt_send_supprt (void);
@@ -75,16 +84,23 @@ void encrypt_auto (int);
 void decrypt_auto (int);
 void encrypt_is (unsigned char *, int);
 void encrypt_reply (unsigned char *, int);
+void encrypt_start (unsigned char *, int);
 void encrypt_start_input (int);
 void encrypt_session_key (Session_Key *, int);
+void encrypt_end (void);
 void encrypt_end_input (void);
 void encrypt_start_output (int);
 void encrypt_end_output (void);
+void encrypt_request_start (unsigned char *, int);
 void encrypt_send_request_start (void);
+void encrypt_request_end (void);
 void encrypt_send_request_end (void);
 void encrypt_send_end (void);
 void encrypt_wait (void);
+void encrypt_support (unsigned char *, int);
 void encrypt_send_support (void);
+void encrypt_dec_keyid (unsigned char *, int);
+void encrypt_enc_keyid (unsigned char *, int);
 void encrypt_send_keyid (int, unsigned char *, int, int);
 void encrypt_printsub (unsigned char *, int, unsigned char *, int);
 int net_write (unsigned char *, int);
diff --git a/libtelnet/genget.h b/libtelnet/genget.h
index 7321de3..0b56f7d 100644
--- a/libtelnet/genget.h
+++ b/libtelnet/genget.h
@@ -18,3 +18,4 @@
 
 int isprefix (register char *s1, register char *s2);
 char **genget (char *name, char **table, int stlen);
+int Ambiguous (char *s);
diff --git a/libtelnet/misc-proto.h b/libtelnet/misc-proto.h
index 96d8d22..009d9b2 100644
--- a/libtelnet/misc-proto.h
+++ b/libtelnet/misc-proto.h
@@ -71,6 +71,7 @@
 # define __MISC_PROTO__
 
 void auth_encrypt_init (char *, char *, char *, int);
+void auth_encrypt_user (char *);
 void auth_encrypt_connect (int);
 void printd (unsigned char *, int);
 
diff --git a/src/rlogind.c b/src/rlogind.c
index 9888940..663da5b 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -211,6 +211,10 @@ void fatal (int f, const char *msg, int syserr);
 int in_local_domain (char *hostname);
 char *topdomain (char *name, int max_dots);
 
+#ifdef SHISHI
+int do_shishi_login (int infd, struct auth_data *ad, const char **err_msg);
+#endif
+
 void
 rlogind_sigchld (int sig)
 {
diff --git a/telnet/commands.c b/telnet/commands.c
index 7c2a7f4..aca45ca 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -86,6 +86,13 @@
 #include "xalloc.h"
 #include "xvasprintf.h"
 
+#ifdef ENCRYPTION
+# include <libtelnet/encrypt.h>
+#endif
+#if defined AUTHENTICATION || defined ENCRYPTION
+# include <libtelnet/misc.h>
+#endif
+
 #if !defined CRAY && !defined sysV88
 # ifdef HAVE_NETINET_IN_SYSTM_H
 #  include <netinet/in_systm.h>
diff --git a/telnet/main.c b/telnet/main.c
index 7ca93a7..a1a35c9 100644
--- a/telnet/main.c
+++ b/telnet/main.c
@@ -62,6 +62,13 @@
 #include <argp.h>
 #include <libinetutils.h>
 
+#ifdef AUTHENTICATION
+# include <libtelnet/auth.h>
+#endif
+#ifdef ENCRYPTION
+# include <libtelnet/encrypt.h>
+#endif
+
 /* These values need to be the same as defined in libtelnet/kerberos5.c */
 /* Either define them in both places, or put in some common header file. */
 #define OPTS_FORWARD_CREDS           0x00000002
diff --git a/telnet/telnet.c b/telnet/telnet.c
index 768e316..70f24ca 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -79,6 +79,16 @@
 # include <curses.h>
 # include <term.h>
 #endif
+
+#ifdef AUTHENTICATION
+# include <libtelnet/auth.h>
+#endif
+#ifdef ENCRYPTION
+# include <libtelnet/encrypt.h>
+#endif
+#if defined AUTHENTICATION || defined ENCRYPTION
+# include <libtelnet/misc.h>
+#endif
 
 
 #define strip(x) ((my_want_state_is_wont(TELOPT_BINARY)) ? ((x)&0x7f) : (x))
diff --git a/telnet/terminal.c b/telnet/terminal.c
index d47bffa..b0e5a1e 100644
--- a/telnet/terminal.c
+++ b/telnet/terminal.c
@@ -59,6 +59,10 @@
 #include "externs.h"
 #include "types.h"
 
+#ifdef  ENCRYPTION
+# include <libtelnet/encrypt.h>
+#endif
+
 Ring ttyoring, ttyiring;
 unsigned char ttyobuf[2 * BUFSIZ], ttyibuf[BUFSIZ];
 
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index 22f1a96..d844d37 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -28,6 +28,10 @@
 #include <error.h>
 #include <libinetutils.h>
 
+#if defined AUTHENTICATION || defined ENCRYPTION
+# include <libtelnet/misc.h>
+#endif
+
 static void parse_authmode (char *str);
 static void parse_linemode (char *str);
 static void parse_debug_level (char *str);

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                 |   26 ++++++++++++++++++++++++++
 libinetutils/shishi_def.h |    7 +++++++
 libtelnet/auth-proto.h    |    1 +
 libtelnet/auth.c          |    2 ++
 libtelnet/enc-proto.h     |   16 ++++++++++++++++
 libtelnet/genget.h        |    1 +
 libtelnet/misc-proto.h    |    1 +
 src/rlogind.c             |    4 ++++
 telnet/commands.c         |    7 +++++++
 telnet/main.c             |    7 +++++++
 telnet/telnet.c           |   10 ++++++++++
 telnet/terminal.c         |    4 ++++
 telnetd/telnetd.c         |    4 ++++
 13 files changed, 90 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils