From 5a7874e119acbc80410b2f2c1847371236c22a56 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 20 Jun 2011 18:40:31 +0930 Subject: tdb_traverse/tdb_traverse_read: check returns for negative, not -1. TDB2 returns a negative error number on failure. This is compatible if we always check for < 0 instead of == -1. Also, there's no tdb_traverse_read in TDB2: we don't try to make traverse reliable any more, so there are no write locks anyway. Signed-off-by: Rusty Russell --- source3/smbd/connection.c | 2 +- source3/smbd/session.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/smbd') diff --git a/source3/smbd/connection.c b/source3/smbd/connection.c index f1ec301ee2..7ed9518756 100644 --- a/source3/smbd/connection.c +++ b/source3/smbd/connection.c @@ -120,7 +120,7 @@ int count_current_connections( const char *sharename, bool clear ) ret = connections_forall(count_fn, &cs); unbecome_root(); - if (ret == -1) { + if (ret < 0) { DEBUG(0,("count_current_connections: traverse of " "connections.tdb failed\n")); return 0; diff --git a/source3/smbd/session.c b/source3/smbd/session.c index 12d4818e90..48afb5389f 100644 --- a/source3/smbd/session.c +++ b/source3/smbd/session.c @@ -264,7 +264,7 @@ int list_sessions(TALLOC_CTX *mem_ctx, struct sessionid **session_list) sesslist.sessions = NULL; ret = sessionid_traverse_read(gather_sessioninfo, (void *) &sesslist); - if (ret == -1) { + if (ret < 0) { DEBUG(3, ("Session traverse failed\n")); SAFE_FREE(sesslist.sessions); *session_list = NULL; -- cgit