Changeset 745 for trunk/server/source3/lib/util_tdb.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/lib/util_tdb.c (modified) (5 diffs)

trunk/server/source3/lib/util_tdb.c

@@ -21 +21 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "util_tdb.h"
+
 #undef malloc
 #undef realloc
@@ -35 +38 @@
 ****************************************************************/
 
-static void gotalarm_sig(void)
+static void gotalarm_sig(int signum)
 {
         gotalarm = 1;
@@ -51 +54 @@
 
         if (timeout) {
-                CatchSignal(SIGALRM, SIGNAL_CAST gotalarm_sig);
+                CatchSignal(SIGALRM, gotalarm_sig);
                 tdb_setalarm_sigptr(tdb, &gotalarm);
                 alarm(timeout);
@@ -64 +67 @@
                 alarm(0);
                 tdb_setalarm_sigptr(tdb, NULL);
-                CatchSignal(SIGALRM, SIGNAL_CAST SIG_IGN);
+                CatchSignal(SIGALRM, SIG_IGN);
                 if (gotalarm && (ret == -1)) {
                         DEBUG(0,("tdb_chainlock_with_timeout_internal: alarm (%u) timed out for key %s in tdb %s\n",
@@ -482 +485 @@
 }
 
-/*
- Log tdb messages via DEBUG().
-*/
-static void tdb_wrap_log(TDB_CONTEXT *tdb, enum tdb_debug_level level, 
-                         const char *format, ...) PRINTF_ATTRIBUTE(3,4);
-
-static void tdb_wrap_log(TDB_CONTEXT *tdb, enum tdb_debug_level level, 
-                         const char *format, ...)
-{
-        va_list ap;
-        char *ptr = NULL;
-        int debuglevel = 0;
-        int ret;
-
-        switch (level) {
-        case TDB_DEBUG_FATAL:
-                debuglevel = 0;
-                break;
-        case TDB_DEBUG_ERROR:
-                debuglevel = 1;
-                break;
-        case TDB_DEBUG_WARNING:
-                debuglevel = 2;
-                break;
-        case TDB_DEBUG_TRACE:
-                debuglevel = 5;
-                break;
-        default:
-                debuglevel = 0;
-        }               
-
-        va_start(ap, format);
-        ret = vasprintf(&ptr, format, ap);
-        va_end(ap);
-
-        if (ret != -1) {
-                const char *name = tdb_name(tdb);
-                DEBUG(debuglevel, ("tdb(%s): %s", name ? name : "unnamed", ptr));
-                free(ptr);
-        }
-}
-
-static struct tdb_wrap *tdb_list;
-
-/* destroy the last connection to a tdb */
-static int tdb_wrap_destructor(struct tdb_wrap *w)
-{
-        tdb_close(w->tdb);
-        DLIST_REMOVE(tdb_list, w);
-        return 0;
-}                                
-
-/*
-  wrapped connection to a tdb database
-  to close just talloc_free() the tdb_wrap pointer
- */
-struct tdb_wrap *tdb_wrap_open(TALLOC_CTX *mem_ctx,
-                               const char *name, int hash_size, int tdb_flags,
-                               int open_flags, mode_t mode)
-{
-        struct tdb_wrap *w;
-        struct tdb_logging_context log_ctx;
-        log_ctx.log_fn = tdb_wrap_log;
-
-        if (!lp_use_mmap())
-                tdb_flags |= TDB_NOMMAP;
-
-        for (w=tdb_list;w;w=w->next) {
-                if (strcmp(name, w->name) == 0) {
-                        /*
-                         * Yes, talloc_reference is exactly what we want
-                         * here. Otherwise we would have to implement our own
-                         * reference counting.
-                         */
-                        return talloc_reference(mem_ctx, w);
-                }
-        }
-
-        w = talloc(mem_ctx, struct tdb_wrap);
-        if (w == NULL) {
-                return NULL;
-        }
-
-        if (!(w->name = talloc_strdup(w, name))) {
-                talloc_free(w);
-                return NULL;
-        }
-
-        if ((hash_size == 0) && (name != NULL)) {
-                const char *base = strrchr_m(name, '/');
-                if (base != NULL) {
-                        base += 1;
-                }
-                else {
-                        base = name;
-                }
-                hash_size = lp_parm_int(-1, "tdb_hashsize", base, 0);
-        }
-
-        w->tdb = tdb_open_ex(name, hash_size, tdb_flags, 
-                             open_flags, mode, &log_ctx, NULL);
-        if (w->tdb == NULL) {
-                talloc_free(w);
-                return NULL;
-        }
-
-        talloc_set_destructor(w, tdb_wrap_destructor);
-
-        DLIST_ADD(tdb_list, w);
-
-        return w;
-}
-
 NTSTATUS map_nt_error_from_tdb(enum TDB_ERROR err)
 {
-        struct { enum TDB_ERROR err; NTSTATUS status; } map[] =
-                { { TDB_SUCCESS,        NT_STATUS_OK },
-                  { TDB_ERR_CORRUPT,    NT_STATUS_INTERNAL_DB_CORRUPTION },
-                  { TDB_ERR_IO,         NT_STATUS_UNEXPECTED_IO_ERROR },
-                  { TDB_ERR_OOM,        NT_STATUS_NO_MEMORY },
-                  { TDB_ERR_EXISTS,     NT_STATUS_OBJECT_NAME_COLLISION },
-
-                  /*
-                   * TDB_ERR_LOCK is very broad, we could for example
-                   * distinguish between fcntl locks and invalid lock
-                   * sequences. So NT_STATUS_FILE_LOCK_CONFLICT is a
-                   * compromise.
-                   */
-                  { TDB_ERR_LOCK,       NT_STATUS_FILE_LOCK_CONFLICT },
-                  /*
-                   * The next two ones in the enum are not actually used
-                   */
-                  { TDB_ERR_NOLOCK,     NT_STATUS_FILE_LOCK_CONFLICT },
-                  { TDB_ERR_LOCK_TIMEOUT, NT_STATUS_FILE_LOCK_CONFLICT },
-                  { TDB_ERR_NOEXIST,    NT_STATUS_NOT_FOUND },
-                  { TDB_ERR_EINVAL,     NT_STATUS_INVALID_PARAMETER },
-                  { TDB_ERR_RDONLY,     NT_STATUS_ACCESS_DENIED }
-                };
-
-        int i;
-
-        for (i=0; i < sizeof(map) / sizeof(map[0]); i++) {
-                if (err == map[i].err) {
-                        return map[i].status;
-                }
-        }
-
-        return NT_STATUS_INTERNAL_ERROR;
+        NTSTATUS result = NT_STATUS_INTERNAL_ERROR;
+
+        switch (err) {
+        case TDB_SUCCESS:
+                result = NT_STATUS_OK;
+                break;
+        case TDB_ERR_CORRUPT:
+                result = NT_STATUS_INTERNAL_DB_CORRUPTION;
+                break;
+        case TDB_ERR_IO:
+                result = NT_STATUS_UNEXPECTED_IO_ERROR;
+                break;
+        case TDB_ERR_OOM:
+                result = NT_STATUS_NO_MEMORY;
+                break;
+        case TDB_ERR_EXISTS:
+                result = NT_STATUS_OBJECT_NAME_COLLISION;
+                break;
+
+        case TDB_ERR_LOCK:
+                /*
+                 * TDB_ERR_LOCK is very broad, we could for example
+                 * distinguish between fcntl locks and invalid lock
+                 * sequences. So NT_STATUS_FILE_LOCK_CONFLICT is a
+                 * compromise.
+                 */
+                result = NT_STATUS_FILE_LOCK_CONFLICT;
+                break;
+
+        case TDB_ERR_NOLOCK:
+        case TDB_ERR_LOCK_TIMEOUT:
+                /*
+                 * These two ones in the enum are not actually used
+                 */
+                result = NT_STATUS_FILE_LOCK_CONFLICT;
+                break;
+        case TDB_ERR_NOEXIST:
+                result = NT_STATUS_NOT_FOUND;
+                break;
+        case TDB_ERR_EINVAL:
+                result = NT_STATUS_INVALID_PARAMETER;
+                break;
+        case TDB_ERR_RDONLY:
+                result = NT_STATUS_ACCESS_DENIED;
+                break;
+        case TDB_ERR_NESTING:
+                result = NT_STATUS_INTERNAL_ERROR;
+                break;
+        };
+        return result;
 }