From b435a481acfef92b4253995f63475f25191d5e0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Groenvall?= <bg@sics.se>
Date: Sat, 2 Sep 1995 14:09:27 +0000
Subject: [PATCH] Add new option -L /bin/login and variable char *new_login.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@94 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/telnet/telnetd/sys_term.c | 8 +++++---
 appl/telnet/telnetd/telnetd.c  | 4 ----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/appl/telnet/telnetd/sys_term.c b/appl/telnet/telnetd/sys_term.c
index 6815d2b81..a6c1d63cb 100644
--- a/appl/telnet/telnetd/sys_term.c
+++ b/appl/telnet/telnetd/sys_term.c
@@ -177,6 +177,8 @@ int ttyfd = -1;
 # endif
 #endif	/* USE_TERMIO */
 
+char *new_login = LOGIN_PATH;
+
 /*
  * init_termbuf()
  * copy_termbuf(cp)
@@ -1819,10 +1821,10 @@ start_login(host, autologin, name)
 	}
 #endif
 
-	execv(LOGIN_PATH, argv.argv);
+	execv(new_login, argv.argv);
 
-	syslog(LOG_ERR, "%s: %m\n", _PATH_LOGIN);
-	fatalperror(net, _PATH_LOGIN);
+	syslog(LOG_ERR, "%s: %m\n", new_login);
+	fatalperror(net, new_login);
 	/*NOTREACHED*/
 }
 
diff --git a/appl/telnet/telnetd/telnetd.c b/appl/telnet/telnetd/telnetd.c
index 510786846..b641f180f 100644
--- a/appl/telnet/telnetd/telnetd.c
+++ b/appl/telnet/telnetd/telnetd.c
@@ -161,9 +161,7 @@ char valid_opts[] = {
 #ifdef	SecurID
 	's',
 #endif
-#ifdef NEW_LOGIN
 	'L', ':',
-#endif
 	'\0'
 };
 
@@ -359,11 +357,9 @@ main(argc, argv)
 			break;
 #endif	/* AUTHENTICATION */
 
-#ifdef NEW_LOGIN
 		case 'L':
 			new_login = optarg;
 			break;
-#endif /* EXEC_LOGIN */
 			
 		default:
 			fprintf(stderr, "telnetd: %c: unknown option\n", ch);