summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2017-02-15 22:50:28 +0200
committerDan McDonald <danmcd@omniti.com>2017-04-10 10:04:28 -0400
commita04cabea38af23dd1a0e76c56ca44260af2285e4 (patch)
tree11f7869ddd8f97104032631feb602ede1a7379ae
parent471a88e499c660844f4590487ce7c4d5a7090294 (diff)
downloadillumos-joyent-a04cabea38af23dd1a0e76c56ca44260af2285e4.tar.gz
8031 libwrap: variables might be clobbered by longjmp
Reviewed by: Marcel Telka <marcel@telka.sk> Reviewed by: Yuri Pankov <yuri.pankov@gmail.com> Approved by: Dan McDonald <danmcd@omniti.com>
-rw-r--r--usr/src/lib/libwrap/rfc931.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/usr/src/lib/libwrap/rfc931.c b/usr/src/lib/libwrap/rfc931.c
index c8eb66cf9f..495cb55dfa 100644
--- a/usr/src/lib/libwrap/rfc931.c
+++ b/usr/src/lib/libwrap/rfc931.c
@@ -3,8 +3,6 @@
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* rfc931() speaks a common subset of the RFC 931, AUTH, TAP, IDENT and RFC
* 1413 protocols. It queries an RFC 931 etc. compatible daemon on a remote
@@ -16,10 +14,6 @@
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*/
-#ifndef lint
-static char sccsid[] = "@(#) rfc931.c 1.10 95/01/02 16:11:34";
-#endif
-
/* System libraries. */
#include <stdio.h>
@@ -88,9 +82,9 @@ char *dest;
char user[256]; /* XXX */
char buffer[512]; /* XXX */
char *cp;
- char *result = unknown;
+ char *volatile result = unknown;
FILE *fp;
- unsigned saved_timeout = 0;
+ volatile unsigned saved_timeout = 0;
struct sigaction nact, oact;
/*
@@ -104,7 +98,7 @@ char *dest;
*/
if ((fp = fsocket(SGFAM(rmt_sin), SOCK_STREAM, 0)) != 0) {
- setbuf(fp, (char *) 0);
+ setbuf(fp, NULL);
/*
* Set up a timer so we won't get stuck while waiting for the server.