Only in inetutils-1.4.2: build.sh Only in inetutils-1.4.2: extra-includes diff -ur inetutils-1.4.2-orig/rcp/rcp.c inetutils-1.4.2/rcp/rcp.c --- inetutils-1.4.2-orig/rcp/rcp.c 2002-09-02 15:14:39.000000000 +0100 +++ inetutils-1.4.2/rcp/rcp.c 2005-01-22 23:07:25.728412800 +0000 @@ -498,7 +498,7 @@ #endif snprintf (buf, sizeof(buf), "T%ld %ld %ld %ld\n", - a_sec, a_usec, m_sec, m_usec); + m_sec, m_usec, a_sec, a_usec); return write (fd, buf, strlen (buf)); } diff -ur inetutils-1.4.2-orig/rlogind/rlogind.c inetutils-1.4.2/rlogind/rlogind.c --- inetutils-1.4.2-orig/rlogind/rlogind.c 2002-06-26 04:15:06.000000000 +0100 +++ inetutils-1.4.2/rlogind/rlogind.c 2005-01-29 00:50:22.808950400 +0000 @@ -73,6 +73,8 @@ #include #include /* Needed for chmod() */ +#define LDPATH "LD_LIBRARY_PATH" + /* The TIOCPKT_* macros may not be implemented in the pty driver. Defining them here allows the program to be compiled. */ @@ -91,10 +93,10 @@ #ifndef TTYDEF_IFLAG #define TTYDEF_IFLAG (BRKINT | ISTRIP | ICRNL | IMAXBEL | IXON | IXANY) #endif -#ifndef TTYDEF_OFLAG #ifndef OXTABS #define OXTABS 0 #endif +#ifndef TTYDEF_OFLAG #define TTYDEF_OFLAG (OPOST | ONLCR | OXTABS) #endif #ifndef TTYDEF_LFLAG @@ -137,7 +139,7 @@ char *lusername; char *rusername; char *term; - char *env[2]; + char *env[3]; #ifdef KERBEROS #ifdef KERBEROS_V int kerberos_version; @@ -578,6 +580,15 @@ register char *cp = strchr (ap->term + ENVSIZE, '/'); char *speed; struct termios tt; + char *ld, *ldset= 0; + +#ifdef LDPATH + if ((ld= getenv (LDPATH))) { + ldset= malloc (sizeof (LDPATH) + 1 + strlen (ld)); + strcpy (ldset, LDPATH "="); + strcat (ldset, ld); + } +#endif tcgetattr (fd, &tt); if (cp) @@ -599,7 +610,8 @@ tt.c_lflag = TTYDEF_LFLAG; tcsetattr (fd, TCSAFLUSH, &tt); ap->env[0] = ap->term; - ap->env[1] = 0; + ap->env[1] = ldset; + ap->env[2] = 0; } #ifdef UTMPX diff -ur inetutils-1.4.2-orig/rsh/rsh.c inetutils-1.4.2/rsh/rsh.c --- inetutils-1.4.2-orig/rsh/rsh.c 2002-06-26 04:15:06.000000000 +0100 +++ inetutils-1.4.2/rsh/rsh.c 2005-01-23 00:25:32.517684800 +0000 @@ -97,12 +97,12 @@ #ifdef KERBEROS #ifdef ENCRYPTION -#define OPTIONS "8Kdek:l:nxVh" +#define OPTIONS "+8Kdek:l:nxVh" #else -#define OPTIONS "8Kdek:l:nVh" +#define OPTIONS "+8Kdek:l:nVh" #endif #else -#define OPTIONS "8KLdel:nVh" +#define OPTIONS "+8KLdel:nVh" #endif static const char *short_options = OPTIONS; static struct option long_options[] = diff -ur inetutils-1.4.2-orig/rshd/rshd.c inetutils-1.4.2/rshd/rshd.c --- inetutils-1.4.2-orig/rshd/rshd.c 2002-12-11 12:38:00.000000000 +0000 +++ inetutils-1.4.2/rshd/rshd.c 2005-01-29 00:16:34.031712000 +0000 @@ -461,14 +461,14 @@ #ifdef KERBEROS if (!use_kerberos) #endif - if (check_all || local_domain (hp->h_name)) - { - char *remotehost = (char *) alloca (strlen (hp->h_name) + 1); - if (! remotehost) - errorstr = "Out of memory\n"; - else - { - strcpy (remotehost, hp->h_name); + { + char *remotehost = (char *) alloca (strlen (hp->h_name) + 1); + if (! remotehost) + errorstr = "Out of memory\n"; + else + { + strcpy (remotehost, hp->h_name); + if (check_all || local_domain (remotehost)) { errorhost = remotehost; hp = gethostbyname (remotehost); if (hp == NULL) @@ -500,6 +500,7 @@ } } } + } } else errorhost = hostname = inet_ntoa (fromp->sin_addr); diff -ur inetutils-1.4.2-orig/telnetd/pty.c inetutils-1.4.2/telnetd/pty.c --- inetutils-1.4.2-orig/telnetd/pty.c 2002-04-07 12:55:40.000000000 +0100 +++ inetutils-1.4.2/telnetd/pty.c 2005-01-28 20:26:12.337091200 +0000 @@ -96,8 +96,8 @@ for (cpp2 = cpp = environ; *cpp; cpp++) { - if (strncmp (*cpp, "LD_", 3) - && strncmp (*cpp, "_RLD_", 5) + if (/* strncmp (*cpp, "LD_", 3) && */ + strncmp (*cpp, "_RLD_", 5) && strncmp (*cpp, "LIBPATH=", 8) && strncmp (*cpp, "IFS=", 4)) *cpp2++ = *cpp; diff -ur inetutils-1.4.2-orig/telnetd/telnetd.c inetutils-1.4.2/telnetd/telnetd.c --- inetutils-1.4.2-orig/telnetd/telnetd.c 2002-06-26 04:15:07.000000000 +0100 +++ inetutils-1.4.2/telnetd/telnetd.c 2005-01-28 20:05:46.754790400 +0000 @@ -57,9 +57,9 @@ char *login_invocation = #ifdef SOLARIS -"/bin/login -h %h %?T{TERM=%T}{-} %?u{%?a{-f }-- %u}" +PATH_LOGIN " -h %h %?T{TERM=%T}{-} %?u{%?a{-f }-- %u}" #else -"/bin/login -p -h %h %?u{-f %u}" +PATH_LOGIN " -p -h %h %?u{-f %u}" #endif ; @@ -654,7 +654,7 @@ Options are:\n\ -a, --authmode AUTHMODE specify what mode to use for authentication\n\ -D, --debug[=LEVEL] set debugging level\n\ - -E, --exec-login STRING set program to be executed instead of /bin/login\n\ + -E, --exec-login STRING set program to be executed instead of " PATH_LOGIN "\n\ -h, --no-hostinfo do not print host information before login has\n\ been completed\n\ -l, --linemode[=MODE] set line mode\n\ diff -ur inetutils-1.4.2-orig/telnetd/telnetd.h inetutils-1.4.2/telnetd/telnetd.h --- inetutils-1.4.2-orig/telnetd/telnetd.h 2002-04-12 22:33:42.000000000 +0100 +++ inetutils-1.4.2/telnetd/telnetd.h 2005-01-28 21:29:49.425795200 +0000 @@ -130,7 +130,7 @@ #ifdef HAVE_UNAME /* Prefix and suffix if the IM string can be generated from uname. */ # define UNAME_IM_PREFIX "\r\n" -# define UNAME_IM_SUFFIX " (%h) (%t)\r\n\n" +# define UNAME_IM_SUFFIX " (%l) (%t)\r\n\n" #else /* ! HAVE_UNAME */ # define UNAME_IM_PREFIX "\r\n" # define UNAME_IM_SUFFIX "\r\n" @@ -375,6 +375,8 @@ extern void willoption P((int)); extern void wontoption P((int)); +extern char* localhost P((void)); + #ifdef ENCRYPTION extern void (*encrypt_output) P((unsigned char *, int)); extern int (*decrypt_input) P((int));