From 30191d1a5704ad2b158386b511558972d539ce47 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 18 Oct 2007 17:40:25 -0700 Subject: RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in various places whilst doing this (places that assumed BOOL == int). I also need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f) --- source3/winbindd/idmap_tdb.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'source3/winbindd/idmap_tdb.c') diff --git a/source3/winbindd/idmap_tdb.c b/source3/winbindd/idmap_tdb.c index 97000689fa..881377bda6 100644 --- a/source3/winbindd/idmap_tdb.c +++ b/source3/winbindd/idmap_tdb.c @@ -54,7 +54,7 @@ static int convert_fn(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA data, void *state fstring keystr; fstring dom_name; TDB_DATA key2; - BOOL *failed = (BOOL *)state; + bool *failed = (bool *)state; DEBUG(10,("Converting %s\n", (const char *)key.dptr)); @@ -114,11 +114,11 @@ static int convert_fn(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA data, void *state Convert the idmap database from an older version. *****************************************************************************/ -static BOOL idmap_tdb_upgrade(const char *idmap_name) +static bool idmap_tdb_upgrade(const char *idmap_name) { int32 vers; - BOOL bigendianheader; - BOOL failed = False; + bool bigendianheader; + bool failed = False; TDB_CONTEXT *idmap_tdb; DEBUG(0, ("Upgrading winbindd_idmap.tdb from an old version\n")); @@ -205,7 +205,7 @@ static NTSTATUS idmap_tdb_open_db(TALLOC_CTX *memctx, TDB_CONTEXT **tdbctx) SMB_STRUCT_STAT stbuf; char *tdbfile = NULL; int32 version; - BOOL tdb_is_new = False; + bool tdb_is_new = False; if (idmap_tdb_open_ref_count) { /* the tdb has already been opened */ idmap_tdb_open_ref_count++; @@ -284,7 +284,7 @@ done: /* NEVER use tdb_close() except for the conversion routines that are guaranteed * to run only when the database is opened the first time, always use this function. */ -BOOL idmap_tdb_tdb_close(TDB_CONTEXT *tdbctx) +bool idmap_tdb_tdb_close(TDB_CONTEXT *tdbctx) { if (tdbctx != idmap_tdb_common_ctx) { DEBUG(0, ("ERROR: Invalid tdb context!")); @@ -408,7 +408,7 @@ static NTSTATUS idmap_tdb_alloc_init( const char *params ) static NTSTATUS idmap_tdb_allocate_id(struct unixid *xid) { - BOOL ret; + bool ret; const char *hwmkey; const char *hwmtype; uint32_t high_hwm; -- cgit