mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-02 23:35:23 +00:00
Code Issues Releases Wiki Activity

Fix up char * -> unsigned char * mismatches.

Browse Source
This commit is contained in:
Ted Lemon
1999-10-07 02:14:10 +00:00
parent 89619cf93e
commit 77a5f87162
5 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/tree.c
View File

@@ -22,7 +22,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: tree.c,v 1.57 1999/10/06 01:35:44 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium. All rights reserved.\n"; "$Id: tree.c,v 1.58 1999/10/07 02:14:06 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@@ -1338,10 +1338,10 @@ int evaluate_data_expression (result, packet, lease,
return 0; return 0;
} }
if (data.len == 1 && if (data.len == 1 &&
!strncasecmp (data.data, "a", 1)) { !strncasecmp ((char *)data.data, "a", 1)) {
s = lease -> ddns_fwd_name; s = lease -> ddns_fwd_name;
} else if (data.len == 3 && } else if (data.len == 3 &&
!strncasecmp (data.data, "ptr", 3)) { !strncasecmp ((char *)data.data, "ptr", 3)) {
s = lease -> ddns_rev_name; s = lease -> ddns_rev_name;
} else { } else {
#if defined (DEBUG_EXPRESSIONS) #if defined (DEBUG_EXPRESSIONS)

8
server/confpars.c
View File

@@ -22,7 +22,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: confpars.c,v 1.85 1999/10/01 03:37:29 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; "$Id: confpars.c,v 1.86 1999/10/07 02:14:09 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@@ -1015,7 +1015,8 @@ void parse_host_declaration (cfile, group)
} }
go = ((struct group_object *) go = ((struct group_object *)
hash_lookup (group_name_hash, hash_lookup (group_name_hash,
val, strlen (val))); (unsigned char *)val,
strlen (val)));
if (!go) { if (!go) {
parse_warn (cfile, "unknown group %s in host %s", parse_warn (cfile, "unknown group %s in host %s",
val, host -> name); val, host -> name);
@@ -1636,7 +1637,8 @@ void parse_group_declaration (cfile, group)
if (group_name_hash) { if (group_name_hash) {
t = ((struct group_object *) t = ((struct group_object *)
hash_lookup (group_name_hash, hash_lookup (group_name_hash,
name, strlen (name))); (unsigned char *)name,
strlen (name)));
if (t) { if (t) {
delete_group (t, 0); delete_group (t, 0);
} }

8
server/db.c
View File

@@ -22,7 +22,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: db.c,v 1.32 1999/10/05 02:44:37 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; "$Id: db.c,v 1.33 1999/10/07 02:14:10 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@@ -102,7 +102,8 @@ int write_lease (lease)
} }
if (lease -> uid_len) { if (lease -> uid_len) {
int i; int i;
if (db_printable_len (lease -> uid, lease -> uid_len)) { if (db_printable_len ((char *)lease -> uid,
lease -> uid_len)) {
fprintf (db_file, "\n\tuid \"%*.*s\";", fprintf (db_file, "\n\tuid \"%*.*s\";",
lease -> uid_len, lease -> uid_len, lease -> uid_len, lease -> uid_len,
lease -> uid); lease -> uid);
@@ -244,7 +245,8 @@ int write_host (host)
if (host -> client_identifier.len) { if (host -> client_identifier.len) {
int i; int i;
errno = 0; errno = 0;
if (db_printable_len (host -> client_identifier.data, if (db_printable_len ((char *)
host -> client_identifier.data,
host -> client_identifier.len)) { host -> client_identifier.len)) {
fprintf (db_file, "\n\tuid \"%*.*s\";", fprintf (db_file, "\n\tuid \"%*.*s\";",
host -> client_identifier.len, host -> client_identifier.len,

18
server/mdb.c
View File

@@ -22,7 +22,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: mdb.c,v 1.6 1999/10/05 18:44:27 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; "$Id: mdb.c,v 1.7 1999/10/07 02:14:10 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@@ -409,7 +409,8 @@ isc_result_t delete_group (struct group_object *group, int writep)
if (group_name_hash) if (group_name_hash)
d = ((struct group_object *) d = ((struct group_object *)
hash_lookup (group_name_hash, hash_lookup (group_name_hash,
group -> name, strlen (group -> name))); (unsigned char *)group -> name,
strlen (group -> name)));
else else
return ISC_R_INVALIDARG; return ISC_R_INVALIDARG;
if (!d) if (!d)
@@ -424,7 +425,8 @@ isc_result_t delete_group (struct group_object *group, int writep)
hash table entry. */ hash table entry. */
if ((group -> flags & GROUP_OBJECT_DYNAMIC) && if ((group -> flags & GROUP_OBJECT_DYNAMIC) &&
!(group -> flags & GROUP_OBJECT_STATIC)) { !(group -> flags & GROUP_OBJECT_STATIC)) {
delete_hash_entry (group_name_hash, group -> name, delete_hash_entry (group_name_hash,
(unsigned char *)group -> name,
strlen (group -> name)); strlen (group -> name));
--group -> refcnt; --group -> refcnt;
} else { } else {
@@ -455,7 +457,7 @@ isc_result_t supersede_group (struct group_object *group, int writep)
if (group_name_hash) { if (group_name_hash) {
t = ((struct group_object *) t = ((struct group_object *)
hash_lookup (group_name_hash, hash_lookup (group_name_hash,
group -> name, (unsigned char *)group -> name,
strlen (group -> name))); strlen (group -> name)));
if (t && t != group) { if (t && t != group) {
/* If this isn't a dynamic entry, then we need to flag /* If this isn't a dynamic entry, then we need to flag
@@ -474,8 +476,9 @@ isc_result_t supersede_group (struct group_object *group, int writep)
if (!(t -> flags & GROUP_OBJECT_DELETED)) if (!(t -> flags & GROUP_OBJECT_DELETED))
delete_group (t, 0); delete_group (t, 0);
else { else {
delete_hash_entry (group_name_hash, delete_hash_entry
group -> name, (group_name_hash,
(unsigned char *)group -> name,
strlen (group -> name)); strlen (group -> name));
omapi_object_dereference omapi_object_dereference
((omapi_object_t **)&t, ((omapi_object_t **)&t,
@@ -492,7 +495,8 @@ isc_result_t supersede_group (struct group_object *group, int writep)
dynamic groups if appropriate. */ dynamic groups if appropriate. */
if (!t) { if (!t) {
add_hash (group_name_hash, add_hash (group_name_hash,
group -> name, strlen (group -> name), (unsigned char *)group -> name,
strlen (group -> name),
(unsigned char *)group); (unsigned char *)group);
} }

5
server/omapi.c
View File

@@ -29,7 +29,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: omapi.c,v 1.13 1999/10/06 19:17:44 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; "$Id: omapi.c,v 1.14 1999/10/07 02:14:10 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@@ -724,10 +724,11 @@ isc_result_t dhcp_group_destroy (omapi_object_t *h, char *name)
if (group_name_hash) { if (group_name_hash) {
t = ((struct group_object *) t = ((struct group_object *)
hash_lookup (group_name_hash, hash_lookup (group_name_hash,
group -> name, (unsigned char *)group -> name,
strlen (group -> name))); strlen (group -> name)));
if (t) { if (t) {
delete_hash_entry (group_name_hash, delete_hash_entry (group_name_hash,
(unsigned char *)
group -> name, group -> name,
strlen (group -> name)); strlen (group -> name));
--group -> refcnt; --group -> refcnt;