Update /var/run/utmp even on some corner cases

Signed-off-by: Adam Tkac <atkac@redhat.com>
This commit is contained in:
Adam Tkac 2012-06-14 14:06:56 +02:00
parent 69e50eafa8
commit e11790a919
2 changed files with 31 additions and 1 deletions

25
telnet-rh825946.patch Normal file
View File

@ -0,0 +1,25 @@
diff -up netkit-telnet-0.17/telnetd/sys_term.c.rh825946 netkit-telnet-0.17/telnetd/sys_term.c
--- netkit-telnet-0.17/telnetd/sys_term.c.rh825946 1999-12-17 15:28:47.000000000 +0100
+++ netkit-telnet-0.17/telnetd/sys_term.c 2012-06-14 14:05:30.538342755 +0200
@@ -723,6 +723,9 @@ void cleanup(int sig) {
char *p;
(void)sig;
+ /* to avoid a race for wtmp lock */
+ signal(SIGCHLD, SIG_IGN);
+
p = line + sizeof("/dev/") - 1;
if (logout(p)) logwtmp(p, "", "");
#ifdef PARANOID_TTYS
diff -up netkit-telnet-0.17/telnetd/telnetd.c.rh825946 netkit-telnet-0.17/telnetd/telnetd.c
--- netkit-telnet-0.17/telnetd/telnetd.c.rh825946 2012-06-14 14:04:42.000000000 +0200
+++ netkit-telnet-0.17/telnetd/telnetd.c 2012-06-14 14:06:01.547291404 +0200
@@ -1147,8 +1147,6 @@ void telnet(int f, int p)
if (FD_ISSET(p, &obits) && (pfrontp - pbackp) > 0)
ptyflush();
}
- /* to avoid a race for wtmp lock */
- signal(SIGCHLD, SIG_IGN);
cleanup(0);
} /* end of telnet */

View File

@ -1,7 +1,7 @@
Summary: The client program for the Telnet remote login protocol
Name: telnet
Version: 0.17
Release: 52%{?dist}
Release: 53%{?dist}
Epoch: 1
License: BSD
Group: Applications/Internet
@ -31,6 +31,7 @@ Patch22: netkit-telnet-0.17-reallynodns.patch
Patch23: telnet-rh678324.patch
Patch24: telnet-rh674942.patch
Patch25: telnet-rh704604.patch
Patch26: telnet-rh825946.patch
BuildRequires: ncurses-devel
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -77,6 +78,7 @@ mv telnet telnet-NETKIT
%patch23 -p1 -b .rh678324
%patch24 -p1 -b .rh674942
%patch25 -p1 -b .rh704604
%patch26 -p1 -b .rh825946
%build
%ifarch s390 s390x
@ -136,6 +138,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_mandir}/man8/telnetd.8*
%changelog
* Thu Jun 14 2012 Adam Tkac <atkac redhat com> 1:0.17-53
- update /var/run/utmp even on some corner cases
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.17-52
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild