Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 Jun 2016 03:40:39 +0000 (UTC)
From:      "Pedro F. Giffuni" <pfg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r301235 - head/sbin/dhclient
Message-ID:  <201606030340.u533edHA006630@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pfg
Date: Fri Jun  3 03:40:39 2016
New Revision: 301235
URL: https://svnweb.freebsd.org/changeset/base/301235

Log:
  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)
  MFC after:	3 days

Modified:
  head/sbin/dhclient/conflex.c

Modified: head/sbin/dhclient/conflex.c
==============================================================================
--- head/sbin/dhclient/conflex.c	Fri Jun  3 03:22:00 2016	(r301234)
+++ head/sbin/dhclient/conflex.c	Fri Jun  3 03:40:39 2016	(r301235)
@@ -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;



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