[280] in NetBSD-Development
Rebuilt telnet
daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Tue Dec 20 12:38:54 1994
From: ghudson@MIT.EDU
Date: Tue, 20 Dec 94 12:38:24 -0500
To: netbsd-dev@MIT.EDU, brlewis@MIT.EDU
Okay, I rebuilt telnet and telnetd for NetBSD; apparently not all of
the new changes had worked their way in. I installed the new versions
on lola-granola and enabled /etc/athena/telnet in /etc/inetd.conf.
I also fixed a bug in the Athena modifications to telnetd, whereby it
assumed that /bin/login was the right filename to execute for
non-authenticated logins. I've included context diffs for pathnames.h
and sys_term.c below, so that Bruce can apply them to the telnet
locker source tree.
(Basically, the old Athena strategy was to redefine _PATH_LOGIN if
ATHENA_LOGIN was set, and use the string "/bin/login" for
non-authenticated logins. My strategy is to define a new symbol
_PATH_AUTH_LOGIN, which I set to _PATH_LOGIN if ATHENA_LOGIN is not
set. Then I use _PATH_AUTH_LOGIN for authenticated logins and
_PATH_LOGIN for non-authenticated logins.)
===================================================================
RCS file: RCS/pathnames.h,v
retrieving revision 1.3
diff -c -r1.3 pathnames.h
*** 1.3 1994/08/20 22:37:05
--- pathnames.h 1994/12/20 17:28:33
***************
*** 33,43 ****
* @(#)pathnames.h 8.1 (Berkeley) 6/4/93
*/
- #if defined(ATHENA_LOGIN) && !defined(hpux)
- # undef _PATH_LOGIN
- # define _PATH_LOGIN "/usr/athena/etc/login.krb"
- #endif /* ATHENA_LOGIN */
-
#if BSD > 43
# include <paths.h>
--- 33,38 ----
***************
*** 58,60 ****
--- 53,63 ----
#ifdef BFTPDAEMON
#define BFTPPATH "/usr/ucb/bftp"
#endif /* BFTPDAEMON */
+
+ #undef _PATH_AUTH_LOGIN
+ #if defined(ATHENA_LOGIN) && !defined(hpux)
+ # define _PATH_AUTH_LOGIN "/usr/athena/etc/login.krb"
+ #else /* ATHENA_LOGIN */
+ # define _PATH_AUTH_LOGIN _PATH_LOGIN
+ #endif /* ATHENA_LOGIN */
+
===================================================================
RCS file: RCS/sys_term.c,v
retrieving revision 1.5
diff -c -r1.5 sys_term.c
*** 1.5 1994/08/20 22:36:19
--- sys_term.c 1994/12/20 17:28:59
***************
*** 1705,1712 ****
#endif
closelog();
if (auth_level >= 0 && autologin == AUTH_VALID)
path_login = _PATH_LOGIN;
- else path_login = "/bin/login";
if (auth_debug_mode) {
char **debug_argv;
--- 1705,1713 ----
#endif
closelog();
if (auth_level >= 0 && autologin == AUTH_VALID)
+ path_login = _PATH_AUTH_LOGIN;
+ else
path_login = _PATH_LOGIN;
if (auth_debug_mode) {
char **debug_argv;
