diff options
| author | Ted Lemon <source@isc.org> | 2000-02-01 03:19:56 +0000 |
|---|---|---|
| committer | Ted Lemon <source@isc.org> | 2000-02-01 03:19:56 +0000 |
| commit | cfdfb9f126bb8900fa60c4ac5c3326986e5708e7 (patch) | |
| tree | 81707664b94650775286640e2dab3dbf9baee6c6 /server | |
| parent | fb6297b12be9c65634bd10f8effe1fe76bf07cba (diff) | |
| download | isc-dhcp-cfdfb9f126bb8900fa60c4ac5c3326986e5708e7.tar.gz | |
AIX and Digital Unix compatibility fixes.
Diffstat (limited to 'server')
| -rw-r--r-- | server/confpars.c | 13 | ||||
| -rw-r--r-- | server/db.c | 9 |
2 files changed, 11 insertions, 11 deletions
diff --git a/server/confpars.c b/server/confpars.c index 2d01edd4..0bd2effb 100644 --- a/server/confpars.c +++ b/server/confpars.c @@ -22,7 +22,7 @@ #ifndef lint static char copyright[] = -"$Id: confpars.c,v 1.99 2000/01/31 23:41:56 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; +"$Id: confpars.c,v 1.100 2000/02/01 03:19:56 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -423,7 +423,6 @@ int parse_statement (cfile, group, type, host_decl, declaration) "option space definitions %s", "may not be scoped."); skip_to_semi (cfile); - free_option (option, MDL); break; } parse_option_space_decl (cfile); @@ -2208,14 +2207,16 @@ struct lease *parse_lease_declaration (cfile) (&binding -> value.buffer, binding -> value.len + 1, MDL))) log_fatal ("No memory for binding."); - strcpy (binding -> value.buffer -> data, val); + strcpy ((char *) + binding -> value.buffer -> data, val); binding -> value.data = binding -> value.buffer -> data; binding -> value.terminated = 1; } else { - s = (parse_numeric_aggregate - (cfile, (unsigned char *)0, - &binding -> value.len, ':', 16, 8)); + s = ((char *) + (parse_numeric_aggregate + (cfile, (unsigned char *)0, + &binding -> value.len, ':', 16, 8))); if (!s) return (struct lease *)0; if (binding -> value.len) { diff --git a/server/db.c b/server/db.c index 3481381d..13d398a0 100644 --- a/server/db.c +++ b/server/db.c @@ -22,7 +22,7 @@ #ifndef lint static char copyright[] = -"$Id: db.c,v 1.42 2000/01/26 14:56:18 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; +"$Id: db.c,v 1.43 2000/02/01 03:19:56 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -134,7 +134,7 @@ int write_lease (lease) } if (lease -> uid_len) { int i; - if (db_printable_len ((const char *)lease -> uid, + if (db_printable_len (lease -> uid, lease -> uid_len)) { fprintf (db_file, "\n uid \"%*s\";", lease -> uid_len, lease -> uid); @@ -290,8 +290,7 @@ int write_host (host) if (host -> client_identifier.len) { int i; errno = 0; - if (db_printable_len ((const char *) - host -> client_identifier.data, + if (db_printable_len (host -> client_identifier.data, host -> client_identifier.len)) { fprintf (db_file, "\n uid \"%*s\";", host -> client_identifier.len, @@ -453,7 +452,7 @@ int db_printable (s) } int db_printable_len (s, len) - const char *s; + const unsigned char *s; unsigned len; { int i; |