diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-03-29 09:35:51 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:00 -0500 |
| commit | bc2b6436d0f5f3e9ffdfaeb7f1b32996a83d5478 (patch) | |
| tree | 45124e070043ee0fd3774d74b4cfdcf1c8919c27 /source3/nmbd | |
| parent | b9461058d59f8e4f4b69c31592bd12a179b2d8ac (diff) | |
| download | samba-bc2b6436d0f5f3e9ffdfaeb7f1b32996a83d5478.tar.gz samba-bc2b6436d0f5f3e9ffdfaeb7f1b32996a83d5478.tar.bz2 samba-bc2b6436d0f5f3e9ffdfaeb7f1b32996a83d5478.zip | |
r22009: change TDB_DATA from char * to unsigned char *
and fix all compiler warnings in the users
metze
(This used to be commit 3a28443079c141a6ce8182c65b56ca210e34f37f)
Diffstat (limited to 'source3/nmbd')
| -rw-r--r-- | source3/nmbd/nmbd_winsserver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/nmbd/nmbd_winsserver.c b/source3/nmbd/nmbd_winsserver.c index 6ea102c391..9c2fe72702 100644 --- a/source3/nmbd/nmbd_winsserver.c +++ b/source3/nmbd/nmbd_winsserver.c @@ -103,7 +103,7 @@ static struct name_record *wins_record_to_name_record(TDB_DATA key, TDB_DATA dat } namerec->subnet = wins_server_subnet; - push_ascii_nstring(namerec->name.name, key.dptr); + push_ascii_nstring(namerec->name.name, (const char *)key.dptr); namerec->name.name_type = key.dptr[sizeof(unstring)]; /* Add the scope. */ push_ascii(namerec->name.scope, global_scope(), 64, STR_TERMINATE); @@ -159,7 +159,7 @@ static TDB_DATA name_record_to_wins_record(const struct name_record *namerec) len = (2 + 1 + (7*4)); /* "wbddddddd" */ len += (namerec->data.num_ips * 4); - data.dptr = (char *)SMB_MALLOC(len); + data.dptr = (uint8 *)SMB_MALLOC(len); if (!data.dptr) { return data; } @@ -197,7 +197,7 @@ static TDB_DATA name_to_key(const struct nmb_name *nmbname) pull_ascii_nstring(keydata, sizeof(unstring), nmbname->name); strupper_m(keydata); keydata[sizeof(unstring)] = nmbname->name_type; - key.dptr = keydata; + key.dptr = (uint8 *)keydata; key.dsize = sizeof(keydata); return key; |