From owner-svn-src-head@FreeBSD.ORG  Mon Apr 18 23:45:50 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E27471065670;
	Mon, 18 Apr 2011 23:45:50 +0000 (UTC)
	(envelope-from sobomax@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D06E58FC15;
	Mon, 18 Apr 2011 23:45:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3INjowF088488;
	Mon, 18 Apr 2011 23:45:50 GMT (envelope-from sobomax@svn.freebsd.org)
Received: (from sobomax@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3INjo7Y088486;
	Mon, 18 Apr 2011 23:45:50 GMT (envelope-from sobomax@svn.freebsd.org)
Message-Id: <201104182345.p3INjo7Y088486@svn.freebsd.org>
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Mon, 18 Apr 2011 23:45:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220808 - head/sbin/natd
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Apr 2011 23:45:51 -0000

Author: sobomax
Date: Mon Apr 18 23:45:50 2011
New Revision: 220808
URL: http://svn.freebsd.org/changeset/base/220808

Log:
  Furthermore condition IP waiting behaviour also on -dynamic flag.
  This should preserve POLA in all other cases (foreground || non-dynamic).
  
  MFC after:	2 weeks

Modified:
  head/sbin/natd/natd.c

Modified: head/sbin/natd/natd.c
==============================================================================
--- head/sbin/natd/natd.c	Mon Apr 18 23:35:16 2011	(r220807)
+++ head/sbin/natd/natd.c	Mon Apr 18 23:45:50 2011	(r220808)
@@ -305,9 +305,11 @@ int main (int argc, char** argv)
 			else {
 				do {
 					rval = SetAliasAddressFromIfName (mip->ifName);
-					if (background != 0 && rval == EAGAIN)
+					if (background == 0 || dynamicMode == 0)
+						break;
+					if (rval == EAGAIN)
 						sleep(1);
-				} while (background != 0 && rval == EAGAIN);
+				} while (rval == EAGAIN);
 				if (rval != 0)
 					exit(1);
 			}
@@ -648,9 +650,11 @@ static void DoAliasing (int fd, int dire
 	if (mip->assignAliasAddr) {
 		do {
 			rval = SetAliasAddressFromIfName (mip->ifName);
-			if (background != 0 && rval == EAGAIN)
+			if (background == 0 || dynamicMode == 0)
+				break;
+			if (rval == EAGAIN)
 				sleep(1);
-		} while (background != 0 && rval == EAGAIN);
+		} while (rval == EAGAIN);
 		if (rval != 0)
 			exit(1);
 		mip->assignAliasAddr = 0;