sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

Fixed nasty cast of tdb_delete in traversals.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison -
parent 72bda5e821
commit a0cdec3acc
7 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/groupdb/mapping.c
View File

@ -161,7 +161,7 @@ BOOL init_group_mapping(void)
/* handle a Samba upgrade */
tdb_lock_bystring(tdb, vstring);
if (tdb_fetch_int(tdb, vstring) != DATABASE_VERSION) {
tdb_traverse(tdb, (tdb_traverse_func)tdb_delete, NULL);
tdb_traverse(tdb, tdb_traverse_delete_fn, NULL);
tdb_store_int(tdb, vstring, DATABASE_VERSION);
}
tdb_unlock_bystring(tdb, vstring);

2
source/intl/lang_tdb.c
View File

@ -44,7 +44,7 @@ static BOOL load_msg(const char *msg_file)
if (tdb_lockall(tdb) != 0) return False;
/* wipe the db */
tdb_traverse(tdb, (tdb_traverse_func) tdb_delete, NULL);
tdb_traverse(tdb, tdb_traverse_delete_fn, NULL);
msgid = NULL;

2
source/lib/account_pol.c
View File

@ -44,7 +44,7 @@ BOOL init_account_policy(void)
/* handle a Samba upgrade */
tdb_lock_bystring(tdb, vstring);
if (tdb_fetch_int(tdb, vstring) != DATABASE_VERSION) {
tdb_traverse(tdb, (tdb_traverse_func)tdb_delete, NULL);
tdb_traverse(tdb, tdb_traverse_delete_fn, NULL);
tdb_store_int(tdb, vstring, DATABASE_VERSION);
account_policy_set(AP_MIN_PASSWORD_LEN, MINPASSWDLENGTH); /* 5 chars minimum */

2
source/printing/nt_printing.c
View File

@ -269,7 +269,7 @@ BOOL nt_printing_init(void)
if (!upgrade_to_version_2())
return False;
} else
tdb_traverse(tdb_drivers, (tdb_traverse_func)tdb_delete, NULL);
tdb_traverse(tdb_drivers, tdb_traverse_delete_fn, NULL);
tdb_store_int(tdb_drivers, vstring, NTDRIVERS_DATABASE_VERSION);
}

2
source/printing/printing.c
View File

@ -64,7 +64,7 @@ BOOL print_backend_init(void)
/* handle a Samba upgrade */
tdb_lock_bystring(tdb, sversion);
if (tdb_fetch_int(tdb, sversion) != PRINT_DATABASE_VERSION) {
tdb_traverse(tdb, (tdb_traverse_func)tdb_delete, NULL);
tdb_traverse(tdb, tdb_traverse_delete_fn, NULL);
tdb_store_int(tdb, sversion, PRINT_DATABASE_VERSION);
}
tdb_unlock_bystring(tdb, sversion);

2
source/rpc_server/srv_srvsvc_nt.c
View File

@ -136,7 +136,7 @@ BOOL share_info_db_init(void)
/* handle a Samba upgrade */
tdb_lock_bystring(share_tdb, vstring);
if (tdb_fetch_int(share_tdb, vstring) != SHARE_DATABASE_VERSION) {
tdb_traverse(share_tdb, (tdb_traverse_func)tdb_delete, NULL);
tdb_traverse(share_tdb, tdb_traverse_delete_fn, NULL);
tdb_store_int(share_tdb, vstring, SHARE_DATABASE_VERSION);
}
tdb_unlock_bystring(share_tdb, vstring);

11
source/tdb/tdbutil.c
View File

@ -399,3 +399,14 @@ TDB_CONTEXT *tdb_open_log(char *name, int hash_size, int tdb_flags,
return tdb;
}
/****************************************************************************
Allow tdb_delete to be used as a tdb_traversal_fn.
****************************************************************************/
int tdb_traverse_delete_fn(TDB_CONTEXT *the_tdb, TDB_DATA key, TDB_DATA dbuf,
void *state)
{
return tdb_delete(the_tdb, key);
}