summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpfg <pfg@FreeBSD.org>2016-06-03 03:40:39 +0000
committerpfg <pfg@FreeBSD.org>2016-06-03 03:40:39 +0000
commitbd6fcb16e5df97506522523b77fb5a3ac03ea4b0 (patch)
tree7de28492eff4a1908d01cb3ae2dee70d4b0c06c8
parent18e657ce098587bd9caddbbb3e408330fcee6893 (diff)
downloadFreeBSD-src-bd6fcb16e5df97506522523b77fb5a3ac03ea4b0.zip
FreeBSD-src-bd6fcb16e5df97506522523b77fb5a3ac03ea4b0.tar.gz
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
-rw-r--r--sbin/dhclient/conflex.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/dhclient/conflex.c b/sbin/dhclient/conflex.c
index 3c8932d..cd57e3b 100644
--- a/sbin/dhclient/conflex.c
+++ b/sbin/dhclient/conflex.c
@@ -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;
OpenPOWER on IntegriCloud