diff options
| author | Ted Lemon <source@isc.org> | 2001-05-02 07:11:38 +0000 |
|---|---|---|
| committer | Ted Lemon <source@isc.org> | 2001-05-02 07:11:38 +0000 |
| commit | dc66a99558ed31851f6d0e40813e9d43604a0315 (patch) | |
| tree | 71c985ec071468f82c249cd2d8eb05b13e56d414 /server | |
| parent | 4d1a48ebef16903e475c979a8580cb5cd253ea24 (diff) | |
| download | isc-dhcp-dc66a99558ed31851f6d0e40813e9d43604a0315.tar.gz | |
Add line-oriented argument to new_parse().
Diffstat (limited to 'server')
| -rw-r--r-- | server/confpars.c | 8 | ||||
| -rw-r--r-- | server/dhcpd.c | 6 | ||||
| -rw-r--r-- | server/omapi.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/server/confpars.c b/server/confpars.c index 28d7955e..41c916c7 100644 --- a/server/confpars.c +++ b/server/confpars.c @@ -43,7 +43,7 @@ #ifndef lint static char copyright[] = -"$Id: confpars.c,v 1.142 2001/04/30 22:38:32 mellon Exp $ Copyright (c) 1995-2001 The Internet Software Consortium. All rights reserved.\n"; +"$Id: confpars.c,v 1.143 2001/05/02 07:05:52 mellon Exp $ Copyright (c) 1995-2001 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -167,9 +167,9 @@ isc_result_t read_conf_file (const char *filename, struct group *group, /* If we're recording, write out the filename and file contents. */ if (trace_record ()) trace_write_packet (ttype, ulen + tflen + 1, dbuf, MDL); - new_parse (&cfile, -1, fbuf, ulen, filename); /* XXX */ + new_parse (&cfile, -1, fbuf, ulen, filename, 0); /* XXX */ #else - new_parse (&cfile, file, (char *)0, 0, filename); + new_parse (&cfile, file, (char *)0, 0, filename, 0); #endif if (leasep) status = lease_file_subparse (cfile); @@ -202,7 +202,7 @@ void trace_conf_input (trace_type_t *ttype, unsigned len, char *data) /* If we're recording, write out the filename and file contents. */ if (trace_record ()) trace_write_packet (ttype, len, data, MDL); - new_parse (&cfile, -1, fbuf, flen, data); + new_parse (&cfile, -1, fbuf, flen, data, 0); if (ttype == trace_readleases_type) lease_file_subparse (cfile); else diff --git a/server/dhcpd.c b/server/dhcpd.c index fadad829..4d916517 100644 --- a/server/dhcpd.c +++ b/server/dhcpd.c @@ -43,7 +43,7 @@ #ifndef lint static char ocopyright[] = -"$Id: dhcpd.c,v 1.114 2001/04/05 22:52:48 mellon Exp $ Copyright 1995-2001 Internet Software Consortium."; +"$Id: dhcpd.c,v 1.115 2001/05/02 07:08:15 mellon Exp $ Copyright 1995-2001 Internet Software Consortium."; #endif static char copyright[] = @@ -435,7 +435,7 @@ int main (argc, argv, envp) parse = (struct parse *)0; status = new_parse (&parse, -1, std_nsupdate, (sizeof std_nsupdate) - 1, - "standard name service update routine"); + "standard name service update routine", 0); if (status != ISC_R_SUCCESS) log_fatal ("can't begin parsing name service updater!"); @@ -837,7 +837,7 @@ void postconf_initialization (int quiet) parse = (struct parse *)0; result = new_parse (&parse, -1, old_nsupdate, (sizeof old_nsupdate) - 1, - "old name service update routine"); + "old name service update routine", 0); if (result != ISC_R_SUCCESS) log_fatal ("can't begin parsing old ddns updater!"); diff --git a/server/omapi.c b/server/omapi.c index 8c7c6702..23b2840b 100644 --- a/server/omapi.c +++ b/server/omapi.c @@ -50,7 +50,7 @@ #ifndef lint static char copyright[] = -"$Id: omapi.c,v 1.45 2001/04/30 22:39:10 mellon Exp $ Copyright (c) 1999-2000 The Internet Software Consortium. All rights reserved.\n"; +"$Id: omapi.c,v 1.46 2001/05/02 07:11:38 mellon Exp $ Copyright (c) 1999-2000 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -918,7 +918,7 @@ isc_result_t dhcp_host_set_value (omapi_object_t *h, status = new_parse (&parse, -1, (char *)value -> u.buffer.value, value -> u.buffer.len, - "network client"); + "network client", 0); if (status != ISC_R_SUCCESS) return status; if (!(parse_executable_statements |