diff options
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/messages.c | 13 | ||||
| -rw-r--r-- | source3/lib/talloc.c | 5 |
2 files changed, 7 insertions, 11 deletions
diff --git a/source3/lib/messages.c b/source3/lib/messages.c index e5aafcb646..d46ad74553 100644 --- a/source3/lib/messages.c +++ b/source3/lib/messages.c @@ -384,22 +384,13 @@ this is a useful function for sending messages to all smbd processes. It isn't very efficient, but should be OK for the sorts of applications that use it. When we need efficient broadcast we can add it. ****************************************************************************/ -BOOL message_send_all(int msg_type, void *buf, size_t len, BOOL duplicates_allowed) +BOOL message_send_all(TDB_CONTEXT *conn_tdb, int msg_type, void *buf, size_t len, BOOL duplicates_allowed) { - TDB_CONTEXT *the_tdb; - - the_tdb = tdb_open(lock_path("connections.tdb"), 0, 0, O_RDONLY, 0); - if (!the_tdb) { - DEBUG(2,("Failed to open connections database in message_send_all\n")); - return False; - } - msg_all.msg_type = msg_type; msg_all.buf = buf; msg_all.len = len; msg_all.duplicates = duplicates_allowed; - tdb_traverse(the_tdb, traverse_fn, NULL); - tdb_close(the_tdb); + tdb_traverse(conn_tdb, traverse_fn, NULL); return True; } diff --git a/source3/lib/talloc.c b/source3/lib/talloc.c index acc6204bed..a04bd2561b 100644 --- a/source3/lib/talloc.c +++ b/source3/lib/talloc.c @@ -96,6 +96,9 @@ void talloc_destroy_pool(TALLOC_CTX *t) { struct talloc_chunk *c; + if (!t) + return; + while (t->list) { c = t->list->next; free(t->list->ptr); @@ -109,6 +112,8 @@ void talloc_destroy_pool(TALLOC_CTX *t) /* destroy a whole pool including the context */ void talloc_destroy(TALLOC_CTX *t) { + if (!t) + return; talloc_destroy_pool(t); free(t); } |