Nuke special case for '\n' in skip_to_semi() and

associated weird comment about parsing resolv.conf.

dhclient.conf and dhclient.leases.<if> are semi-colon
oriented and not line oriented. '\n' is never returned
by get_token().

1 files changed, 1 insertions, 10 deletions

diff --git a/sbin/dhclient/parse.c b/sbin/dhclient/parse.c
index 0804c7bcaeb..5962822cb20 100644
--- a/sbin/dhclient/parse.c
+++ b/sbin/dhclient/parse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.c,v 1.73 2017/10/14 15:31:46 krw Exp $	*/
+/*	$OpenBSD: parse.c,v 1.74 2017/10/19 13:44:31 krw Exp $	*/
 
 /* Common parser code for dhcpd and dhclient. */
 
@@ -100,15 +100,6 @@ skip_to_semi(FILE *cfile)
 		} else if (token == ';' && brace_count == 0) {
 			token = next_token(NULL, cfile);
 			return;
-		} else if (token == '\n') {
-			/*
-			 * EOL only happens when parsing
-			 * /etc/resolv.conf, and we treat it like a
-			 * semicolon because the resolv.conf file is
-			 * line-oriented.
-			 */
-			token = next_token(NULL, cfile);
-			return;
 		}
 		token = next_token(NULL, cfile);
 	} while (token != EOF);