Author: pfg
Date: Mon Jun  6 13:32:15 2016
New Revision: 301507
URL: https://svnweb.freebsd.org/changeset/base/301507

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/9/sbin/dhclient/conflex.c
Directory Properties:
  stable/9/sbin/dhclient/   (props changed)

Modified: stable/9/sbin/dhclient/conflex.c
==============================================================================
--- stable/9/sbin/dhclient/conflex.c    Mon Jun  6 13:31:28 2016        
(r301506)
+++ stable/9/sbin/dhclient/conflex.c    Mon Jun  6 13:32:15 2016        
(r301507)
@@ -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;
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"

Reply via email to