Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Nov 2010 21:42:36 +0000 (UTC)
From:      Brian Somers <brian@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r215842 - stable/7/sbin/natd
Message-ID:  <201011252142.oAPLgaTS018358@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brian
Date: Thu Nov 25 21:42:36 2010
New Revision: 215842
URL: http://svn.freebsd.org/changeset/base/215842

Log:
  MF8: Don't abend if we get ENOMEM from sysctl(3).  The data returned
       is sufficient

Modified:
  stable/7/sbin/natd/natd.c
Directory Properties:
  stable/7/sbin/natd/   (props changed)

Modified: stable/7/sbin/natd/natd.c
==============================================================================
--- stable/7/sbin/natd/natd.c	Thu Nov 25 20:35:49 2010	(r215841)
+++ stable/7/sbin/natd/natd.c	Thu Nov 25 21:42:36 2010	(r215842)
@@ -885,7 +885,7 @@ SetAliasAddressFromIfName(const char *if
 		err(1, "iflist-sysctl-estimate");
 	if ((buf = malloc(needed)) == NULL)
 		errx(1, "malloc failed");
-	if (sysctl(mib, 6, buf, &needed, NULL, 0) == -1)
+	if (sysctl(mib, 6, buf, &needed, NULL, 0) == -1 && errno != ENOMEM)
 		err(1, "iflist-sysctl-get");
 	lim = buf + needed;
 /*



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011252142.oAPLgaTS018358>