[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-17-ge184061

[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  e18406105c2995fe6eac7e537a213ef38816583e (commit)
      from  4e82f22597c920531e070443ed32bd0e66b30024 (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=e18406105c2995fe6eac7e537a213ef38816583e


commit e18406105c2995fe6eac7e537a213ef38816583e
Author: Mats Erik Andersson <address@hidden>
Date:   Wed Feb 1 01:36:44 2012 +0100

    Protect headers in Kerberos code.

diff --git a/ChangeLog b/ChangeLog
index f2830b2..ceff4e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,43 @@
+2012-02-01  Mats Erik Andersson <address@hidden>
+
+       Detect and protect header files for Kerberos support.
+       * configure.ac: Check for <com_err.h>, <kerberosIV/des.h>,
+       <kerberosIV/krb.h>, <kerberosV/krb5.h>, <krb5.h>, <krb5/asn1.h>,
+       <krb5/crc-32.h>, <krb5/ext-proto.h>, <krb5/krb5.h>, <krb5/los-proto.h>.
+
+       * libinetutils/des_rw.c
+       [ENCRYPTION && KERBEROS && HAVE_KERBEROSIV_DES_H]:
+       Include <kerberosIV/des.h>.
+       [ENCRYPTION && KERBEROS && HAVE_KERBEROSIV_KRB_H]:
+       Include <kerberosIV/krb.h>.
+       * libinetutils/kcmd.c, libinetutils/krcmd.c
+       [KERBEROS && HAVE_KERBEROSIV_DES_H]: Include <kerberosIV/des.h>.
+       [KERBEROS && HAVE_KERBEROSIV_KRB_H]: Include <kerberosIV/krb.h>.
+       * libtelnet/forward.c [KRB5 && FORWARD && HAVE_KRB5_KRB5_H]:
+       Include <krb5/krb5.h>.
+       [KRB5 && FORWARD && HAVE_KRB5_ASN1_H]: Include <krb5/asn1.h>.
+       [KRB5 && FORWARD && HAVE_KRB5_CRC_32_H]: Include <krb5/crc-32.h>.
+       [KRB5 && FORWARD && HAVE_KRB5_LOS_PROTO_H]: Include <krb5/los-proto.h>.
+       [KRB5 && FORWARD && HAVE_KRB5_EXT_PROTO_H]: Include <krb5/ext-proto.h>.
+       * libtelnet/kerberos.c [KRB4 && HAVE_DES_H]: Include <des.h>.
+       [KRB4 && HAVE_KRB_H]: Include <krb.h>.
+       * libtelnet/kerberos5.c [KRB5 && HAVE_KRB5_H]: Include <krb5.h>.
+       [KRB5 && HAVE_COM_ERR_H]: Include <com_err.h>.
+       * src/rcp.c
+       [KERBEROS && HAVE_KERBEROSIV_DES_H]: Include <kerberosIV/des.h>.
+       [KERBEROS && HAVE_KERBEROSIV_KRB_H]: Include <kerberosIV/krb.h>.
+       * src/rlogin.c: Likewise.
+       [SHISHI]: Do inclusions independently of conditional code.
+       * src/rlogind.c [KERBEROS && KRB4 && HAVE_KERBEROSIV_DES_H]: Include
+       <kerberosIV/des.h>.
+       [KERBEROS && KRB4 && HAVE_KERBEROSIV_KRB_H]: Include <kerberosIV/krb.h>.
+       [KERBEROS && KRB5 && HAVE_KRB5_H]: Include <krb5.h>.
+       [KERBEROS && KRB5 && HAVE_KERBEROSIV_KRB_H]: Include <kerberosIV/krb.h>.
+       * src/rsh.c, src/rshd.c [KERBEROS && HAVE_KERBEROSIV_DES_H]: Include
+       <kerberosIV/des.h>.
+       [KERBEROS && HAVE_KERBEROSIV_KRB_H]: Include <kerberosIV/krb.h>.
+       [SHISHI]: Do inclusions independently of conditional code.
+
 2012-01-31  Mats Erik Andersson <address@hidden>
 
        * libinetutils/kcmd.c: Include <fcntl.h>.
diff --git a/configure.ac b/configure.ac
index dbea667..91670a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -488,8 +488,11 @@ AC_HEADER_STDC
 AC_HEADER_TIME
 AC_HEADER_DIRENT
 
-AC_CHECK_HEADERS([arpa/nameser.h des.h errno.h fcntl.h features.h glob.h \
-                  krb.h memory.h netinet/in_systm.h netinet/ip.h \
+AC_CHECK_HEADERS([arpa/nameser.h com_err.h des.h errno.h fcntl.h features.h \
+                 glob.h kerberosIV/des.h kerberosIV/krb.h kerberosV/krb5.h \
+                 krb.h krb5.h krb5/asn1.h krb5/crc-32.h krb5/ext-proto.h \
+                 krb5/krb5.h krb5/los-proto.h \
+                 memory.h netinet/in_systm.h netinet/ip.h \
                   netinet/ip_icmp.h netinet/ip_var.h \
                  security/pam_appl.h \
                   shadow.h stdarg.h stdlib.h string.h stropts.h sys/tty.h \
diff --git a/libinetutils/des_rw.c b/libinetutils/des_rw.c
index 29796b4..e2ca3cc 100644
--- a/libinetutils/des_rw.c
+++ b/libinetutils/des_rw.c
@@ -53,8 +53,12 @@
 # ifdef KERBEROS
 #  include <sys/param.h>
 
-#  include <kerberosIV/des.h>
-#  include <kerberosIV/krb.h>
+#  ifdef HAVE_KERBEROSIV_DES_H
+#   include <kerberosIV/des.h>
+#  endif
+#  ifdef HAVE_KERBEROSIV_KRB_H
+#   include <kerberosIV/krb.h>
+#  endif
 
 #  include <stdlib.h>
 #  include <string.h>
diff --git a/libinetutils/kcmd.c b/libinetutils/kcmd.c
index 778edd7..58c6c0d 100644
--- a/libinetutils/kcmd.c
+++ b/libinetutils/kcmd.c
@@ -61,8 +61,12 @@
 # include <arpa/inet.h>
 
 # if defined KERBEROS
-#  include <kerberosIV/des.h>
-#  include <kerberosIV/krb.h>
+#  ifdef HAVE_KERBEROSIV_DES_H
+#   include <kerberosIV/des.h>
+#  endif
+#  ifdef HAVE_KERBEROSIV_KRB_H
+#   include <kerberosIV/krb.h>
+#  endif
 # elif defined(SHISHI)
 #  include <shishi.h>
 #  include "shishi_def.h"
diff --git a/libinetutils/krcmd.c b/libinetutils/krcmd.c
index 44e1a4b..d22caa5 100644
--- a/libinetutils/krcmd.c
+++ b/libinetutils/krcmd.c
@@ -58,8 +58,12 @@
 # include <netinet/in.h>
 
 # ifdef KERBEROS
-#  include <kerberosIV/des.h>
-#  include <kerberosIV/krb.h>
+#  ifdef HAVE_KERBEROSIV_DES_H
+#   include <kerberosIV/des.h>
+#  endif
+#  ifdef HAVE_KERBEROSIV_KRB_H
+#   include <kerberosIV/krb.h>
+#  endif
 # elif defined(SHISHI)
 #  include <shishi.h>
 #  include "shishi_def.h"
diff --git a/libtelnet/forward.c b/libtelnet/forward.c
index b1c5c2f..3da40e4 100644
--- a/libtelnet/forward.c
+++ b/libtelnet/forward.c
@@ -57,11 +57,21 @@
 # include <pwd.h>
 # include <netdb.h>
 
-# include <krb5/krb5.h>
-# include <krb5/asn1.h>
-# include <krb5/crc-32.h>
-# include <krb5/los-proto.h>
-# include <krb5/ext-proto.h>
+# ifdef HAVE_KRB5_KRB5_H
+#  include <krb5/krb5.h>
+# endif
+# ifdef HAVE_KRB5_ASN1_H
+#  include <krb5/asn1.h>
+# endif
+# ifdef HAVE_KRB5_CRC_32_H
+#  include <krb5/crc-32.h>
+# endif
+# ifdef HAVE_KRB5_LOS_PROTO_H
+#  include <krb5/los-proto.h>
+# endif
+# ifdef HAVE_KRB5_EXT_PROTO_H
+#  include <krb5/ext-proto.h>
+# endif
 
 # define KRB5_DEFAULT_LIFE 60*60*8     /* 8 hours */
 /* helper function: convert flags to necessary KDC options */
diff --git a/libtelnet/kerberos.c b/libtelnet/kerberos.c
index 2158c1d..8d80c5f 100644
--- a/libtelnet/kerberos.c
+++ b/libtelnet/kerberos.c
@@ -73,8 +73,12 @@
 # include <sys/types.h>
 # include <arpa/telnet.h>
 # include <stdio.h>
-# include <des.h>              /* BSD wont include this in krb.h, so we do it 
here */
-# include <krb.h>
+# ifdef HAVE_DES_H
+#  include <des.h>             /* BSD wont include this in krb.h, so we do it 
here */
+# endif
+# ifdef HAVE_KRB_H
+#  include <krb.h>
+# endif
 # include <stdlib.h>
 # include <string.h>
 
diff --git a/libtelnet/kerberos5.c b/libtelnet/kerberos5.c
index 5e4165b..ed71a26 100644
--- a/libtelnet/kerberos5.c
+++ b/libtelnet/kerberos5.c
@@ -24,10 +24,14 @@
 # include <stdlib.h>
 # include <stdio.h>
 # include <arpa/telnet.h>
-# include <krb5.h>
+# ifdef HAVE_KRB5_H
+#  include <krb5.h>
+# endif
 # include <assert.h>
 
-# include <com_err.h>
+# ifdef HAVE_COM_ERR_H
+#  include <com_err.h>
+# endif
 # include <netdb.h>
 # include <ctype.h>
 # include <syslog.h>
diff --git a/src/rcp.c b/src/rcp.c
index 534de5b..cd0c25b 100644
--- a/src/rcp.c
+++ b/src/rcp.c
@@ -102,8 +102,12 @@ int susystem (char *, int);
 void verifydir (char *);
 
 #ifdef KERBEROS
-# include <kerberosIV/des.h>
-# include <kerberosIV/krb.h>
+# ifdef HAVE_KERBEROSIV_DES_H
+#  include <kerberosIV/des.h>
+# endif
+# ifdef HAVE_KERBEROSIV_KRB_H
+#  include <kerberosIV/krb.h>
+# endif
 
 char *dest_realm = NULL;
 int use_kerberos = 1;
diff --git a/src/rlogin.c b/src/rlogin.c
index 298b3b6..aadf4eb 100644
--- a/src/rlogin.c
+++ b/src/rlogin.c
@@ -104,22 +104,29 @@
 #include "libinetutils.h"
 #include "unused-parameter.h"
 
+#ifdef KERBEROS
+# ifdef HAVE_KERBEROSIV_DES_H
+#  include <kerberosIV/des.h>
+# endif
+# ifdef HAVE_KERBEROSIV_KRB_H
+#  include <kerberosIV/krb.h>
+# endif
+#endif /* KERBEROS */
+
 #ifdef SHISHI
+# include <shishi.h>
+# include "shishi_def.h"
 # define REALM_SZ 1040
 #endif
 
 #if defined KERBEROS || defined SHISHI
 int use_kerberos = 1, doencrypt;
 # ifdef KERBEROS
-#  include <kerberosIV/des.h>
-#  include <kerberosIV/krb.h>
 char dest_realm_buf[REALM_SZ], *dest_realm = NULL;
 CREDENTIALS cred;
 Key_schedule schedule;
 
 # elif defined(SHISHI)
-#  include <shishi.h>
-#  include "shishi_def.h"
 char dest_realm_buf[REALM_SZ], *dest_realm = NULL;
 
 Shishi *handle;
@@ -131,8 +138,8 @@ int keytype;
 int keylen;
 int rc;
 int wlen;
-# endif
-#endif /* KERBEROS */
+# endif /* SHISHI */
+#endif /* KERBEROS || SHISHI */
 
 /*
   The TIOCPKT_* macros may not be implemented in the pty driver.
diff --git a/src/rlogind.c b/src/rlogind.c
index 98a25c2..9a23775 100644
--- a/src/rlogind.c
+++ b/src/rlogind.c
@@ -102,14 +102,22 @@
 #if defined KERBEROS || defined SHISHI
 # ifdef        KRB4
 #  define SECURE_MESSAGE "This rlogin session is using DES encryption for all 
transmissions.\r\n"
-#  include <kerberosIV/des.h>
-#  include <kerberosIV/krb.h>
+#  ifdef HAVE_KERBEROSIV_DES_H
+#   include <kerberosIV/des.h>
+#  endif
+#  ifdef HAVE_KERBEROSIV_KRB_H
+#   include <kerberosIV/krb.h>
+#  endif
 #  define kerberos_error_string(c) krb_err_txt[c]
 #  define AUTH_KERBEROS_DEFAULT AUTH_KERBEROS_4
 # elif defined(KRB5)
 #  define SECURE_MESSAGE "This rlogin session is using DES encryption for all 
transmissions.\r\n"
-#  include <krb5.h>
-#  include <kerberosIV/krb.h>
+#  ifdef HAVE_KRB5_H
+#   include <krb5.h>
+#  endif
+#  ifdef HAVE_KERBEROSIV_KRB_H
+#   include <kerberosIV/krb.h>
+#  endif
 #  define kerberos_error_string(c) error_message (c)
 #  define AUTH_KERBEROS_DEFAULT AUTH_KERBEROS_5
 # elif defined(SHISHI)
diff --git a/src/rsh.c b/src/rsh.c
index 4832c00..6f57c96 100644
--- a/src/rsh.c
+++ b/src/rsh.c
@@ -78,6 +78,20 @@
 #include <argp.h>
 #include <libinetutils.h>
 
+#ifdef KERBEROS
+# ifdef HAVE_KERBEROSIV_DES_H
+#  include <kerberosIV/des.h>
+# endif
+# ifdef KERBEROSIV_KRB_H
+#  include <kerberosIV/krb.h>
+# endif
+#endif /* KERBEROS */
+
+#ifdef SHISHI
+# include <shishi.h>
+# include "shishi_def.h"
+#endif
+
 int debug_option = 0;
 int null_input_option = 0;
 char *user = NULL;
@@ -85,16 +99,12 @@ char *user = NULL;
 #if defined KERBEROS || defined SHISHI
 int use_kerberos = 1, doencrypt;
 # ifdef KERBEROS
-#  include <kerberosIV/des.h>
-#  include <kerberosIV/krb.h>
 char *dest_realm = NULL;
 CREDENTIALS cred;
 Key_schedule schedule;
 extern char *krb_realmofhost ();
 
 # elif defined(SHISHI)
-#  include <shishi.h>
-#  include "shishi_def.h"
 char *dest_realm = NULL;
 
 Shishi *h;
@@ -106,8 +116,8 @@ int keytype;
 int keylen;
 int rc;
 int wlen;
-# endif
-#endif /* KERBEROS */
+# endif /* SHISHI */
+#endif /* KERBEROS || SHISHI */
 
 /*
  * rsh - remote shell
diff --git a/src/rshd.c b/src/rshd.c
index 93010d6..9cb559c 100644
--- a/src/rshd.c
+++ b/src/rshd.c
@@ -97,6 +97,20 @@
 #include <argp.h>
 #include <libinetutils.h>
 
+#ifdef KERBEROS
+# ifdef HAVE_KERBEROSIV_DES_H
+#  include <kerberosIV/des.h>
+# endif
+# ifdef HAVE_KERBEROSIV_KRB_H
+#  include <kerberosIV/krb.h>
+# endif
+#endif /* KERBEROS */
+
+#ifdef SHISHI
+# include <shishi.h>
+# include <shishi_def.h>
+#endif
+
 int keepalive = 1;             /* flag for SO_KEEPALIVE scoket option */
 int check_all;
 int log_success;               /* If TRUE, log all successful accesses */
@@ -110,14 +124,10 @@ const char *topdomain (const char *);
 
 #if defined KERBEROS || defined SHISHI
 # ifdef KERBEROS
-#  include <kerberosIV/des.h>
-#  include <kerberosIV/krb.h>
 Key_schedule schedule;
 char authbuf[sizeof (AUTH_DAT)];
 char tickbuf[sizeof (KTEXT_ST)];
 # elif defined(SHISHI)
-#  include <shishi.h>
-#  include <shishi_def.h>
 Shishi *h;
 Shishi_ap *ap;
 Shishi_key *enckey;

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

Summary of changes:
 ChangeLog             |   40 ++++++++++++++++++++++++++++++++++++++++
 configure.ac          |    7 +++++--
 libinetutils/des_rw.c |    8 ++++++--
 libinetutils/kcmd.c   |    8 ++++++--
 libinetutils/krcmd.c  |    8 ++++++--
 libtelnet/forward.c   |   20 +++++++++++++++-----
 libtelnet/kerberos.c  |    8 ++++++--
 libtelnet/kerberos5.c |    8 ++++++--
 src/rcp.c             |    8 ++++++--
 src/rlogin.c          |   19 +++++++++++++------
 src/rlogind.c         |   16 ++++++++++++----
 src/rsh.c             |   22 ++++++++++++++++------
 src/rshd.c            |   18 ++++++++++++++----
 13 files changed, 151 insertions(+), 39 deletions(-)


hooks/post-receive
-- 
GNU Inetutils