From owner-svn-src-all@freebsd.org  Mon Jun  6 13:31:30 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1CFA2B6B1DF;
 Mon,  6 Jun 2016 13:31:30 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DA45319FB;
 Mon,  6 Jun 2016 13:31:29 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u56DVTIb045196;
 Mon, 6 Jun 2016 13:31:29 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u56DVTj2045195;
 Mon, 6 Jun 2016 13:31:29 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201606061331.u56DVTj2045195@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 6 Jun 2016 13:31:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r301506 - stable/10/sbin/dhclient
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Jun 2016 13:31:30 -0000

Author: pfg
Date: Mon Jun  6 13:31:28 2016
New Revision: 301506
URL: https://svnweb.freebsd.org/changeset/base/301506

Log:
  MFC r301235:
  dhclient(1): correct obvious mismatch in get_char().
  
  Correct switch between current and previous line buffers when
  encountering a carriage return in the input.
  
  CID:		1305719
  Obtained from:	OpenBSD (CVS rev. 1.30)

Modified:
  stable/10/sbin/dhclient/conflex.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/dhclient/conflex.c
==============================================================================
--- stable/10/sbin/dhclient/conflex.c	Mon Jun  6 13:17:25 2016	(r301505)
+++ stable/10/sbin/dhclient/conflex.c	Mon Jun  6 13:31:28 2016	(r301506)
@@ -97,8 +97,8 @@ get_char(FILE *cfile)
 				cur_line = line2;
 				prev_line = line1;
 			} else {
-				cur_line = line2;
-				prev_line = line1;
+				cur_line = line1;
+				prev_line = line2;
 			}
 			line++;
 			lpos = 1;