summaryrefslogtreecommitdiff
path: root/sysutils/screen/files/patch-utmp.c
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2019-10-09 01:03:04 +0000
committerCy Schubert <cy@FreeBSD.org>2019-10-09 01:03:04 +0000
commit8dadaadc903e02d7f8608f1fac88b8907f225fe5 (patch)
tree0012a35059dbcc86ac97c3fb87b4ea98389fb9f5 /sysutils/screen/files/patch-utmp.c
parent* Update to 2.7.2 (diff)
Resolve a segfault in utmp.c:519 at some installations.
Notes
Notes: svn path=/head/; revision=514110
Diffstat (limited to 'sysutils/screen/files/patch-utmp.c')
-rw-r--r--sysutils/screen/files/patch-utmp.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/sysutils/screen/files/patch-utmp.c b/sysutils/screen/files/patch-utmp.c
index 0892ad3be256..64550c88add5 100644
--- a/sysutils/screen/files/patch-utmp.c
+++ b/sysutils/screen/files/patch-utmp.c
@@ -1,6 +1,6 @@
--- utmp.c.orig 2019-10-01 15:08:00.000000000 -0700
-+++ utmp.c 2019-10-08 12:08:46.535155000 -0700
-@@ -26,6 +26,7 @@
++++ utmp.c 2019-10-08 17:56:32.853627000 -0700
+@@ -26,9 +26,13 @@
****************************************************************
*/
@@ -8,16 +8,12 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-@@ -88,6 +89,9 @@
- static void makedead __P((struct utmp *));
- static int pututslot __P((slot_t, struct utmp *, char *, struct win *));
- static struct utmp *getutslot __P((slot_t));
+#ifdef __FreeBSD_version
+#define GETUTENT
+#endif
- #ifndef GETUTENT
- static struct utmp *getutent __P((void));
- static void endutent __P((void));
+
+ #include "config.h"
+ #include "screen.h"
@@ -102,7 +106,7 @@
static int utmpok;