summaryrefslogtreecommitdiff
path: root/usr.sbin/dhcpd/conflex.c
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2015-05-02 12:37:36 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2015-05-02 12:37:36 +0000
commit7779b5e91b95097419ac00c882d2b00d525e6117 (patch)
treef0c5a9af13e93f7d69c4f283bb10de76a07c79e6 /usr.sbin/dhcpd/conflex.c
parent0ee0ff18f3f27004c5817ed9964c3b13410c1896 (diff)
Correct switch between current and previous line buffers when
encountering a carriage return in the input. Found by jsg@ a long time ago in a respository far, far away.
Diffstat (limited to 'usr.sbin/dhcpd/conflex.c')
-rw-r--r--usr.sbin/dhcpd/conflex.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/dhcpd/conflex.c b/usr.sbin/dhcpd/conflex.c
index b3cf193cf23..ef41ae8c67e 100644
--- a/usr.sbin/dhcpd/conflex.c
+++ b/usr.sbin/dhcpd/conflex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conflex.c,v 1.12 2013/12/05 22:31:35 krw Exp $ */
+/* $OpenBSD: conflex.c,v 1.13 2015/05/02 12:37:35 krw Exp $ */
/* Lexical scanner for dhcpd config file... */
@@ -94,8 +94,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;