From d16bdac695cf13096806aa12d748c8984df8dc1e Mon Sep 17 00:00:00 2001 From: Mats Erik Andersson Date: Wed, 15 Sep 2010 21:18:09 +0200 Subject: [PATCH 2/3] telnetd/telnetd.c: Use the autodetected PATH_LOGIN. --- ChangeLog | 5 +++++ telnetd/telnetd.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d7f9ae..7d198af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2010-09-15 Mats Erik Andersson + * telnetd/telnetd.c (login_invocation, argp_options): + Access login(1) by detected PATH_LOGIN. + +2010-09-15 Mats Erik Andersson + * man/Makefile.am: Use expansion "$(MAKE)". 2010-09-09 Mats Erik Andersson diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c index 48d4536..b72cd73 100644 --- a/telnetd/telnetd.c +++ b/telnetd/telnetd.c @@ -39,9 +39,9 @@ static void print_hostinfo (void); 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 ; @@ -96,7 +96,7 @@ static struct argp_option argp_options[] = { { "debug", 'D', "LEVEL", OPTION_ARG_OPTIONAL, "set debugging level" }, { "exec-login", 'E', "STRING", 0, - "set program to be executed instead of /bin/login" }, + "set program to be executed instead of " PATH_LOGIN }, { "no-hostinfo", 'h', NULL, 0, "do not print host information before login has been completed" }, { "linemode", 'l', "MODE", OPTION_ARG_OPTIONAL, -- 1.6.3.3