d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Let telnetd build without utmp and logwtmp(3).

Browse Source 
Just like rlogind, there is no need to change the ownership of the
terminal during shutdown anymore. Also don't call logwtmp, because the
login(1)/PAM is responsible for doing this. Also use SHUT_RDWR instead
of 2.
This commit is contained in:
Ed Schouten 2010-01-13 18:37:42 +00:00
parent 2957240805
commit c2fd39cb4d
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
contrib/telnet/telnetd/sys_term.c
View File

@ -1303,24 +1303,7 @@ scrub_env(void)
void
cleanup(int sig __unused)
{
char *p;
sigset_t mask;
p = line + sizeof(_PATH_DEV) - 1;
/*
* Block all signals before clearing the utmp entry. We don't want to
* be called again after calling logout() and then not add the wtmp
* entry because of not finding the corresponding entry in utmp.
*/
sigfillset(&mask);
sigprocmask(SIG_SETMASK, &mask, NULL);
if (logout(p))
logwtmp(p, "", "");
(void)chmod(line, 0666);
(void)chown(line, 0, 0);
*p = 'p';
(void)chmod(line, 0666);
(void)chown(line, 0, 0);
(void) shutdown(net, 2);
(void) shutdown(net, SHUT_RDWR);
_exit(1);
}

1
contrib/telnet/telnetd/telnetd.c
View File

@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
#include <libutil.h>
#include <paths.h>
#include <termcap.h>
#include <utmp.h>
#include <arpa/inet.h>