From 6fa5c415aa0acdbeb8a8b9beba390518489304ab Mon Sep 17 00:00:00 2001
From: guenther <>
Date: Mon, 15 Sep 2014 06:15:48 +0000
Subject: When fopen()ing internal to libc (the API doesn't support the use of
 the resulting FILE *), then pass fopen() the 'e' mode letter to mark it
 close-on-exec.

ok miod@
---
 src/lib/libc/net/getservent.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib/libc/net/getservent.c')

diff --git a/src/lib/libc/net/getservent.c b/src/lib/libc/net/getservent.c
index c81a4cf3e2..7e3293389d 100644
--- a/src/lib/libc/net/getservent.c
+++ b/src/lib/libc/net/getservent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getservent.c,v 1.12 2007/09/02 15:19:17 deraadt Exp $ */
+/*	$OpenBSD: getservent.c,v 1.13 2014/09/15 06:15:48 guenther Exp $ */
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -42,7 +42,7 @@ void
 setservent_r(int f, struct servent_data *sd)
 {
 	if (sd->fp == NULL)
-		sd->fp = fopen(_PATH_SERVICES, "r" );
+		sd->fp = fopen(_PATH_SERVICES, "re" );
 	else
 		rewind(sd->fp);
 	sd->stayopen |= f;
@@ -71,7 +71,7 @@ getservent_r(struct servent *se, struct servent_data *sd)
 	long l;
 	int serrno;
 
-	if (sd->fp == NULL && (sd->fp = fopen(_PATH_SERVICES, "r" )) == NULL)
+	if (sd->fp == NULL && (sd->fp = fopen(_PATH_SERVICES, "re" )) == NULL)
 		return (-1);
 again:
 	if ((p = fgetln(sd->fp, &len)) == NULL)
-- 
cgit v1.2.3-55-g6feb