* configure.in: Check for need to provide setenv prototype if

	setenv is in the C library.

	* forward.c: Provide setenv prototype if needed.

	* auth.c (auth_name): Cast result of sizeof() to int to match
	printf format specification.

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

diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog
index f1b5e16001035008d123b7705e21dd3635f6c9a4..82424a67b7e776fc5c2391f57207cde1ce9bf9a4 100644 (file)
--- a/src/appl/telnet/libtelnet/ChangeLog
+++ b/src/appl/telnet/libtelnet/ChangeLog
@@ -1,3 +1,13 @@
+2001-07-06  Ezra Peisach  <epeisach@mit.edu>
+
+       * configure.in: Check for need to provide setenv prototype if
+       setenv is in the C library.
+
+       * forward.c: Provide setenv prototype if needed.
+
+       * auth.c (auth_name): Cast result of sizeof() to int to match
+       printf format specification.
+
 2001-07-05  Ezra Peisach  <epeisach@mit.edu>
 
        * encrypt.c (encrypt_reply): Cast arguments to printf to match

diff --git a/src/appl/telnet/libtelnet/auth.c b/src/appl/telnet/libtelnet/auth.c
index d3150846a9b3e82b17cffc78a7d4ee34ea9b3f24..f03c23b5df58e38a7923550b9c6f2efa69096f20 100644 (file)
--- a/src/appl/telnet/libtelnet/auth.c
+++ b/src/appl/telnet/libtelnet/auth.c
@@ -510,7 +510,7 @@ auth_name(data, cnt)
        if (cnt > sizeof(savename) - 1) {
                if (auth_debug_mode)
                        printf(">>>%s: Name in NAME (%d) exceeds %d length\r\n",
-                                       Name, cnt, sizeof(savename)-1);
+                                       Name, cnt, (int) sizeof(savename)-1);
                return;
        }
        memcpy((void *)savename, (void *)data, cnt);

diff --git a/src/appl/telnet/libtelnet/configure.in b/src/appl/telnet/libtelnet/configure.in
index 3b55d3ddb0d0fee304ff89decbfec687c9a56713..81703e1592ef6e37ff259b095119a45a3b268ad5 100644 (file)
--- a/src/appl/telnet/libtelnet/configure.in
+++ b/src/appl/telnet/libtelnet/configure.in
@@ -12,6 +12,8 @@ if test $ac_cv_func_setenv = no || test $ac_cv_func_unsetenv = no \
   LIBOBJS="$LIBOBJS setenv.o"
   AC_DEFINE([NEED_SETENV])
 fi
+dnl
+KRB5_NEED_PROTO([#include <stdlib.h>],setenv)
 AC_C_CONST
 if test "$KRB4_LIB" = ''; then
        AC_MSG_RESULT(No Kerberos 4 authentication)

diff --git a/src/appl/telnet/libtelnet/forward.c b/src/appl/telnet/libtelnet/forward.c
index 62a59d5922a01fd1a3f537993e0ad7f84bc220dd..d161e78dca47bc1968ded93e449165e32f98c50a 100644 (file)
--- a/src/appl/telnet/libtelnet/forward.c
+++ b/src/appl/telnet/libtelnet/forward.c
@@ -30,7 +30,7 @@
 #include "k5-int.h"
 #include "krb5forw.h"
  
-#ifdef NEED_SETENV
+#if defined(NEED_SETENV) || defined(NEED_SETENV_PROTO)
 extern int setenv(char *, char *, int);
 #endif