From bc2b6436d0f5f3e9ffdfaeb7f1b32996a83d5478 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 29 Mar 2007 09:35:51 +0000 Subject: r22009: change TDB_DATA from char * to unsigned char * and fix all compiler warnings in the users metze (This used to be commit 3a28443079c141a6ce8182c65b56ca210e34f37f) --- source3/nsswitch/idmap_cache.c | 8 +++--- source3/nsswitch/idmap_tdb.c | 51 ++++++++++++++++++++------------------- source3/nsswitch/winbindd_cache.c | 24 +++++++++--------- 3 files changed, 42 insertions(+), 41 deletions(-) (limited to 'source3/nsswitch') diff --git a/source3/nsswitch/idmap_cache.c b/source3/nsswitch/idmap_cache.c index cc42ef098e..6d23e75b2c 100644 --- a/source3/nsswitch/idmap_cache.c +++ b/source3/nsswitch/idmap_cache.c @@ -370,10 +370,10 @@ NTSTATUS idmap_cache_map_sid(struct idmap_cache_ctx *cache, struct id_map *id) return NT_STATUS_NONE_MAPPED; } - t = strtol(databuf.dptr, &endptr, 10); + t = strtol((const char *)databuf.dptr, &endptr, 10); if ((endptr == NULL) || (*endptr != '/')) { - DEBUG(2, ("Invalid gencache data format: %s\n", databuf.dptr)); + DEBUG(2, ("Invalid gencache data format: %s\n", (const char *)databuf.dptr)); /* remove the entry */ tdb_delete_bystring(cache->tdb, sidkey); ret = NT_STATUS_NONE_MAPPED; @@ -477,10 +477,10 @@ NTSTATUS idmap_cache_map_id(struct idmap_cache_ctx *cache, struct id_map *id) return NT_STATUS_NONE_MAPPED; } - t = strtol(databuf.dptr, &endptr, 10); + t = strtol((const char *)databuf.dptr, &endptr, 10); if ((endptr == NULL) || (*endptr != '/')) { - DEBUG(2, ("Invalid gencache data format: %s\n", databuf.dptr)); + DEBUG(2, ("Invalid gencache data format: %s\n", (const char *)databuf.dptr)); /* remove the entry */ tdb_delete_bystring(cache->tdb, idkey); ret = NT_STATUS_NONE_MAPPED; diff --git a/source3/nsswitch/idmap_tdb.c b/source3/nsswitch/idmap_tdb.c index 764cfc365d..6aff754946 100644 --- a/source3/nsswitch/idmap_tdb.c +++ b/source3/nsswitch/idmap_tdb.c @@ -57,24 +57,24 @@ static int convert_fn(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA data, void *state TDB_DATA key2; BOOL *failed = (BOOL *)state; - DEBUG(10,("Converting %s\n", key.dptr)); + DEBUG(10,("Converting %s\n", (const char *)key.dptr)); - p = strchr(key.dptr, '/'); + p = strchr((const char *)key.dptr, '/'); if (!p) return 0; *p = 0; - fstrcpy(dom_name, key.dptr); + fstrcpy(dom_name, (const char *)key.dptr); *p++ = '/'; domain = find_domain_from_name(dom_name); if (domain == NULL) { /* We must delete the old record. */ DEBUG(0,("Unable to find domain %s\n", dom_name )); - DEBUG(0,("deleting record %s\n", key.dptr )); + DEBUG(0,("deleting record %s\n", (const char *)key.dptr )); if (tdb_delete(tdb, key) != 0) { - DEBUG(0, ("Unable to delete record %s\n", key.dptr)); + DEBUG(0, ("Unable to delete record %s\n", (const char *)key.dptr)); *failed = True; return -1; } @@ -91,19 +91,19 @@ static int convert_fn(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA data, void *state key2 = string_term_tdb_data(keystr); if (tdb_store(tdb, key2, data, TDB_INSERT) != 0) { - DEBUG(0,("Unable to add record %s\n", key2.dptr )); + DEBUG(0,("Unable to add record %s\n", (const char *)key2.dptr )); *failed = True; return -1; } if (tdb_store(tdb, data, key2, TDB_REPLACE) != 0) { - DEBUG(0,("Unable to update record %s\n", data.dptr )); + DEBUG(0,("Unable to update record %s\n", (const char *)data.dptr )); *failed = True; return -1; } if (tdb_delete(tdb, key) != 0) { - DEBUG(0,("Unable to delete record %s\n", key.dptr )); + DEBUG(0,("Unable to delete record %s\n", (const char *)key.dptr )); *failed = True; return -1; } @@ -710,14 +710,14 @@ static NTSTATUS idmap_tdb_id_to_sid(struct idmap_tdb_context *ctx, struct id_map goto done; } - if (!string_to_sid(map->sid, data.dptr)) { + if (!string_to_sid(map->sid, (const char *)data.dptr)) { DEBUG(10,("INVALID SID (%s) in record %s\n", - data.dptr, keystr)); + (const char *)data.dptr, keystr)); ret = NT_STATUS_INTERNAL_DB_ERROR; goto done; } - DEBUG(10,("Found record %s -> %s\n", keystr, data.dptr)); + DEBUG(10,("Found record %s -> %s\n", keystr, (const char *)data.dptr)); ret = NT_STATUS_OK; done: @@ -754,20 +754,20 @@ static NTSTATUS idmap_tdb_sid_to_id(struct idmap_tdb_context *ctx, struct id_map } /* What type of record is this ? */ - if (sscanf(data.dptr, "UID %lu", &rec_id) == 1) { /* Try a UID record. */ + if (sscanf((const char *)data.dptr, "UID %lu", &rec_id) == 1) { /* Try a UID record. */ map->xid.id = rec_id; map->xid.type = ID_TYPE_UID; - DEBUG(10,("Found uid record %s -> %s \n", keystr, data.dptr )); + DEBUG(10,("Found uid record %s -> %s \n", keystr, (const char *)data.dptr )); ret = NT_STATUS_OK; - } else if (sscanf(data.dptr, "GID %lu", &rec_id) == 1) { /* Try a GID record. */ + } else if (sscanf((const char *)data.dptr, "GID %lu", &rec_id) == 1) { /* Try a GID record. */ map->xid.id = rec_id; map->xid.type = ID_TYPE_GID; - DEBUG(10,("Found gid record %s -> %s \n", keystr, data.dptr )); + DEBUG(10,("Found gid record %s -> %s \n", keystr, (const char *)data.dptr )); ret = NT_STATUS_OK; } else { /* Unknown record type ! */ - DEBUG(2, ("Found INVALID record %s -> %s\n", keystr, data.dptr)); + DEBUG(2, ("Found INVALID record %s -> %s\n", keystr, (const char *)data.dptr)); ret = NT_STATUS_INTERNAL_DB_ERROR; } @@ -927,7 +927,7 @@ static NTSTATUS idmap_tdb_set_mapping(struct idmap_domain *dom, const struct id_ data = tdb_fetch(ctx->tdb, ksid); if (data.dptr) { - DEBUG(10, ("Deleting existing mapping %s <-> %s\n", data.dptr, ksidstr )); + DEBUG(10, ("Deleting existing mapping %s <-> %s\n", (const char *)data.dptr, ksidstr )); tdb_delete(ctx->tdb, data); tdb_delete(ctx->tdb, ksid); SAFE_FREE(data.dptr); @@ -935,7 +935,7 @@ static NTSTATUS idmap_tdb_set_mapping(struct idmap_domain *dom, const struct id_ data = tdb_fetch(ctx->tdb, kid); if (data.dptr) { - DEBUG(10,("Deleting existing mapping %s <-> %s\n", data.dptr, kidstr )); + DEBUG(10,("Deleting existing mapping %s <-> %s\n", (const char *)data.dptr, kidstr )); tdb_delete(ctx->tdb, data); tdb_delete(ctx->tdb, kid); SAFE_FREE(data.dptr); @@ -1040,7 +1040,7 @@ static NTSTATUS idmap_tdb_remove_mapping(struct idmap_domain *dom, const struct if ((data.dsize != kid.dsize) || (memcmp(data.dptr, kid.dptr, data.dsize) != 0)) { DEBUG(10,("Specified SID does not map to specified ID\n")); - DEBUGADD(10,("Actual mapping is %s -> %s\n", ksidstr, data.dptr)); + DEBUGADD(10,("Actual mapping is %s -> %s\n", ksidstr, (const char *)data.dptr)); tdb_chainunlock(ctx->tdb, ksid); ret = NT_STATUS_NONE_MAPPED; goto done; @@ -1100,7 +1100,7 @@ static int idmap_tdb_dump_one_entry(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA val int num_maps = *data->num_maps; /* ignore any record but the ones with a SID as key */ - if (strncmp(key.dptr, "S-", 2) == 0) { + if (strncmp((const char *)key.dptr, "S-", 2) == 0) { maps = talloc_realloc(NULL, *data->maps, struct id_map, num_maps+1); if ( ! maps) { @@ -1116,21 +1116,21 @@ static int idmap_tdb_dump_one_entry(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA val return -1; } - if (!string_to_sid(maps[num_maps].sid, key.dptr)) { - DEBUG(10,("INVALID record %s\n", key.dptr)); + if (!string_to_sid(maps[num_maps].sid, (const char *)key.dptr)) { + DEBUG(10,("INVALID record %s\n", (const char *)key.dptr)); /* continue even with errors */ return 0; } /* Try a UID record. */ - if (sscanf(value.dptr, "UID %u", &(maps[num_maps].xid.id)) == 1) { + if (sscanf((const char *)value.dptr, "UID %u", &(maps[num_maps].xid.id)) == 1) { maps[num_maps].xid.type = ID_TYPE_UID; maps[num_maps].status = ID_MAPPED; *data->num_maps = num_maps + 1; /* Try a GID record. */ } else - if (sscanf(value.dptr, "GID %u", &(maps[num_maps].xid.id)) == 1) { + if (sscanf((const char *)value.dptr, "GID %u", &(maps[num_maps].xid.id)) == 1) { maps[num_maps].xid.type = ID_TYPE_GID; maps[num_maps].status = ID_MAPPED; *data->num_maps = num_maps + 1; @@ -1138,7 +1138,8 @@ static int idmap_tdb_dump_one_entry(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA val /* Unknown record type ! */ } else { maps[num_maps].status = ID_UNKNOWN; - DEBUG(2, ("Found INVALID record %s -> %s\n", key.dptr, value.dptr)); + DEBUG(2, ("Found INVALID record %s -> %s\n", + (const char *)key.dptr, (const char *)value.dptr)); /* do not increment num_maps */ } } diff --git a/source3/nsswitch/winbindd_cache.c b/source3/nsswitch/winbindd_cache.c index c09db4d20c..8a1241d8d0 100644 --- a/source3/nsswitch/winbindd_cache.c +++ b/source3/nsswitch/winbindd_cache.c @@ -378,7 +378,7 @@ static NTSTATUS store_cache_seqnum( struct winbindd_domain *domain ) { TDB_DATA data; fstring key_str; - char buf[8]; + uint8 buf[8]; if (!wcache->tdb) { DEBUG(10,("store_cache_seqnum: tdb == NULL\n")); @@ -756,7 +756,7 @@ static void centry_end(struct cache_entry *centry, const char *format, ...) va_end(ap); key = string_tdb_data(kstr); - data.dptr = (char *)centry->data; + data.dptr = centry->data; data.dsize = centry->ofs; tdb_store(wcache->tdb, key, data, TDB_REPLACE); @@ -2081,8 +2081,8 @@ do_query: static int traverse_fn(TDB_CONTEXT *the_tdb, TDB_DATA kbuf, TDB_DATA dbuf, void *state) { - if (strncmp(kbuf.dptr, "UL/", 3) == 0 || - strncmp(kbuf.dptr, "GL/", 3) == 0) + if (strncmp((const char *)kbuf.dptr, "UL/", 3) == 0 || + strncmp((const char *)kbuf.dptr, "GL/", 3) == 0) tdb_delete(the_tdb, kbuf); return 0; @@ -2152,7 +2152,7 @@ void cache_store_response(pid_t pid, struct winbindd_response *response) fstr_sprintf(key_str, "DR/%d", pid); if (tdb_store(wcache->tdb, string_tdb_data(key_str), - make_tdb_data((const char *)response, sizeof(*response)), + make_tdb_data((uint8 *)response, sizeof(*response)), TDB_REPLACE) == -1) return; @@ -2166,7 +2166,7 @@ void cache_store_response(pid_t pid, struct winbindd_response *response) fstr_sprintf(key_str, "DE/%d", pid); if (tdb_store(wcache->tdb, string_tdb_data(key_str), - make_tdb_data((const char *)response->extra_data.data, + make_tdb_data(response->extra_data.data, response->length - sizeof(*response)), TDB_REPLACE) == 0) return; @@ -2342,13 +2342,13 @@ static int traverse_fn_cleanup(TDB_CONTEXT *the_tdb, TDB_DATA kbuf, { struct cache_entry *centry; - centry = wcache_fetch_raw(kbuf.dptr); + centry = wcache_fetch_raw((char *)kbuf.dptr); if (!centry) { return 0; } if (!NT_STATUS_IS_OK(centry->status)) { - DEBUG(10,("deleting centry %s\n", kbuf.dptr)); + DEBUG(10,("deleting centry %s\n", (const char *)kbuf.dptr)); tdb_delete(the_tdb, kbuf); } @@ -2391,7 +2391,7 @@ static int traverse_fn_cached_creds(TDB_CONTEXT *the_tdb, TDB_DATA kbuf, TDB_DAT { int *cred_count = (int*)state; - if (strncmp(kbuf.dptr, "CRED/", 5) == 0) { + if (strncmp((const char *)kbuf.dptr, "CRED/", 5) == 0) { (*cred_count)++; } return 0; @@ -2425,7 +2425,7 @@ static int traverse_fn_get_credlist(TDB_CONTEXT *the_tdb, TDB_DATA kbuf, TDB_DAT { struct cred_list *cred; - if (strncmp(kbuf.dptr, "CRED/", 5) == 0) { + if (strncmp((const char *)kbuf.dptr, "CRED/", 5) == 0) { cred = SMB_MALLOC_P(struct cred_list); if (cred == NULL) { @@ -2437,7 +2437,7 @@ static int traverse_fn_get_credlist(TDB_CONTEXT *the_tdb, TDB_DATA kbuf, TDB_DAT /* save a copy of the key */ - fstrcpy(cred->name, kbuf.dptr); + fstrcpy(cred->name, (const char *)kbuf.dptr); DLIST_ADD(wcache_cred_list, cred); } @@ -2717,7 +2717,7 @@ static int cache_traverse_validate_fn(TDB_CONTEXT *the_tdb, TDB_DATA kbuf, TDB_D for (i = 0; key_val[i].keyname; i++) { size_t namelen = strlen(key_val[i].keyname); if (kbuf.dsize >= namelen && ( - strncmp(key_val[i].keyname, kbuf.dptr, namelen)) == 0) { + strncmp(key_val[i].keyname, (const char *)kbuf.dptr, namelen)) == 0) { return key_val[i].validate_data_fn(kbuf, dbuf); } } -- cgit