Module Name: src Committed By: christos Date: Tue Sep 16 01:29:48 UTC 2014
Modified Files: src/lib/libc/resolv: res_init.c Log Message: Mark the dup of the resolv fd for close on exec. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/lib/libc/resolv/res_init.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/lib/libc/resolv/res_init.c diff -u src/lib/libc/resolv/res_init.c:1.28 src/lib/libc/resolv/res_init.c:1.29 --- src/lib/libc/resolv/res_init.c:1.28 Wed Jan 8 17:58:50 2014 +++ src/lib/libc/resolv/res_init.c Mon Sep 15 21:29:48 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: res_init.c,v 1.28 2014/01/08 22:58:50 christos Exp $ */ +/* $NetBSD: res_init.c,v 1.29 2014/09/16 01:29:48 christos Exp $ */ /* * Copyright (c) 1985, 1989, 1993 @@ -76,7 +76,7 @@ static const char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93"; static const char rcsid[] = "Id: res_init.c,v 1.26 2008/12/11 09:59:00 marka Exp"; #else -__RCSID("$NetBSD: res_init.c,v 1.28 2014/01/08 22:58:50 christos Exp $"); +__RCSID("$NetBSD: res_init.c,v 1.29 2014/09/16 01:29:48 christos Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -499,7 +499,7 @@ __res_vinit(res_state statp, int preinit #ifdef RESOLVSORT statp->nsort = nsort; #endif - statp->_u._ext.ext->resfd = dup(fileno(fp)); + statp->_u._ext.ext->resfd = fcntl(fileno(fp), F_DUPFD_CLOEXEC); (void) fclose(fp); if (fstat(statp->_u._ext.ext->resfd, &st) != -1) __res_conf_time = statp->_u._ext.ext->res_conf_time =