Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-7]: src/usr.sbin/nfsd Pull up following revision(s) (requested by...



details:   https://anonhg.NetBSD.org/src/rev/1898386e7dd4
branches:  netbsd-7
changeset: 799200:1898386e7dd4
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Apr 14 05:14:17 2015 +0000

description:
Pull up following revision(s) (requested by christos in ticket #687):
        usr.sbin/nfsd/nfsd.c: revision 1.63
Memset the whole cfg array, not piecemeal because otherwise you'll end
up with random data depending on the options set.

diffstat:

 usr.sbin/nfsd/nfsd.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r bab2fd941d1e -r 1898386e7dd4 usr.sbin/nfsd/nfsd.c
--- a/usr.sbin/nfsd/nfsd.c      Tue Apr 14 05:12:17 2015 +0000
+++ b/usr.sbin/nfsd/nfsd.c      Tue Apr 14 05:14:17 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfsd.c,v 1.62 2014/03/29 13:50:53 gson Exp $   */
+/*     $NetBSD: nfsd.c,v 1.62.4.1 2015/04/14 05:14:17 snj Exp $        */
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)nfsd.c     8.9 (Berkeley) 3/29/95";
 #else
-__RCSID("$NetBSD: nfsd.c,v 1.62 2014/03/29 13:50:53 gson Exp $");
+__RCSID("$NetBSD: nfsd.c,v 1.62.4.1 2015/04/14 05:14:17 snj Exp $");
 #endif
 #endif /* not lint */
 
@@ -140,7 +140,6 @@
        struct addrinfo hints;
        int ecode;
 
-       memset(cfg, 0, sizeof(*cfg));
        memset(&hints, 0, sizeof hints);
        hints.ai_flags = AI_PASSIVE;
        hints.ai_family = cfg_family[t];
@@ -473,6 +472,7 @@
 
        openlog("nfsd", LOG_PID, LOG_DAEMON);
 
+       memset(cfg, 0, sizeof(cfg));
        for (i = 0; i < __arraycount(cfg); i++) {
                if (ip4flag == 0 && cfg_family[i] == PF_INET)
                        continue;



Home | Main Index | Thread Index | Old Index