Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 Jun 2016 13:31:29 +0000 (UTC)
From:      "Pedro F. Giffuni" <pfg@FreeBSD.org>
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
Message-ID:  <201606061331.u56DVTj2045195@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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;



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