diff options
| author | Ted Lemon <source@isc.org> | 2001-03-17 00:47:39 +0000 |
|---|---|---|
| committer | Ted Lemon <source@isc.org> | 2001-03-17 00:47:39 +0000 |
| commit | b3519f23f1ed8a6700120425a63f7c5ed256812e (patch) | |
| tree | 6247a5883f528b5b3e9851fcb42942f06c4bdbcb /common/resolv.c | |
| parent | 5a3adf94a7f96d6102a101d269bf8cbb35d5af8c (diff) | |
| download | isc-dhcp-b3519f23f1ed8a6700120425a63f7c5ed256812e.tar.gz | |
Support NUL characters in STRING tokens.
Diffstat (limited to 'common/resolv.c')
| -rw-r--r-- | common/resolv.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/common/resolv.c b/common/resolv.c index 051a672b..ed967ab9 100644 --- a/common/resolv.c +++ b/common/resolv.c @@ -43,7 +43,7 @@ #ifndef lint static char copyright[] = -"$Id: resolv.c,v 1.14 2001/03/01 18:17:02 mellon Exp $ Copyright (c) 1996-2001 The Internet Software Consortium. All rights reserved.\n"; +"$Id: resolv.c,v 1.15 2001/03/17 00:47:34 mellon Exp $ Copyright (c) 1996-2001 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -74,7 +74,7 @@ void read_resolv_conf (parse_time) cfile -> eol_token = 1; do { - token = next_token (&val, cfile); + token = next_token (&val, (unsigned *)0, cfile); if (token == END_OF_FILE) break; else if (token == EOL) @@ -106,14 +106,15 @@ void read_resolv_conf (parse_time) dn = (char *)0; } nd -> rcdate = parse_time; - token = peek_token (&val, cfile); + token = peek_token (&val, + (unsigned *)0, cfile); } while (token != EOL); if (token != EOL) { parse_warn (cfile, "junk after domain declaration"); skip_to_semi (cfile); } - token = next_token (&val, cfile); + token = next_token (&val, (unsigned *)0, cfile); } else if (token == NAMESERVER) { struct name_server *ns, **sp; struct iaddr iaddr; @@ -149,7 +150,7 @@ void read_resolv_conf (parse_time) } else skip_to_semi (cfile); /* Ignore what we don't grok. */ } while (1); - token = next_token (&val, cfile); /* Clear the peek buffer */ + token = next_token (&val, (unsigned *)0, cfile); /* Lose servers that are no longer in /etc/resolv.conf. */ sl = (struct name_server *)0; |