Changeset 745 for trunk/server/lib/util/util_ldb.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)
• lib/util/util_ldb.c (modified) (8 diffs)

trunk/server/lib/util/util_ldb.c

@@ -22 +22 @@
 
 #include "includes.h"
-#include "lib/ldb/include/ldb.h"
+#include <ldb.h>
 #include "../lib/util/util_ldb.h"
+
 /*
-  search the sam for the specified attributes - va_list variant
-*/
+ * search the LDB for the specified attributes - va_list variant
+ */
 int gendb_search_v(struct ldb_context *ldb,
                    TALLOC_CTX *mem_ctx,
@@ -33 +34 @@
                    const char * const *attrs,
                    const char *format,
-                   va_list ap) 
+                   va_list ap)
 {
         enum ldb_scope scope = LDB_SCOPE_SUBTREE;
@@ -55 +56 @@
 
         if (ret == LDB_SUCCESS) {
-                talloc_steal(mem_ctx, res->msgs);
-
                 DEBUG(6,("gendb_search_v: %s %s -> %d\n",
                          basedn?ldb_dn_get_linearized(basedn):"NULL",
@@ -62 +61 @@
 
                 ret = res->count;
-                *msgs = res->msgs;
+                if (msgs != NULL) {
+                        *msgs = talloc_steal(mem_ctx, res->msgs);
+                }
                 talloc_free(res);
         } else if (scope == LDB_SCOPE_BASE && ret == LDB_ERR_NO_SUCH_OBJECT) {
                 ret = 0;
-                *msgs = NULL;
+                if (msgs != NULL) *msgs = NULL;
         } else {
                 DEBUG(4,("gendb_search_v: search failed: %s\n",
                                         ldb_errstring(ldb)));
                 ret = -1;
+                if (msgs != NULL) *msgs = NULL;
         }
 
@@ -79 +81 @@
 
 /*
-  search the LDB for the specified attributes - varargs variant
-*/
+ * search the LDB for the specified attributes - varargs variant
+ */
 int gendb_search(struct ldb_context *ldb,
                  TALLOC_CTX *mem_ctx,
@@ -86 +88 @@
                  struct ldb_message ***res,
                  const char * const *attrs,
-                 const char *format, ...) 
+                 const char *format, ...)
 {
         va_list ap;
@@ -99 +101 @@
 
 /*
-  search the LDB for a specified record (by DN)
-*/
-
+ * search the LDB for a specified record (by DN)
+ */
 int gendb_search_dn(struct ldb_context *ldb,
                  TALLOC_CTX *mem_ctx,
@@ -111 +112 @@
 }
 
-/*
-  setup some initial ldif in a ldb
-*/
-int gendb_add_ldif(struct ldb_context *ldb, const char *ldif_string)
-{
-        struct ldb_ldif *ldif;
-        int ret;
-        ldif = ldb_ldif_read_string(ldb, &ldif_string);
-        if (ldif == NULL) return -1;
-        ret = ldb_add(ldb, ldif->msg);
-        talloc_free(ldif);
-        return ret;
-}
-
-char *wrap_casefold(void *context, void *mem_ctx, const char *s, size_t n)
-{
-        return strupper_talloc_n(mem_ctx, s, n);
-}
-
-
-
-/*
-  search the LDB for a single record, with the extended_dn control
-  return LDB_SUCCESS on success, or an ldb error code on error
-
-  if the search returns 0 entries, return LDB_ERR_NO_SUCH_OBJECT
-  if the search returns more than 1 entry, return LDB_ERR_CONSTRAINT_VIOLATION
-*/
-int gendb_search_single_extended_dn(struct ldb_context *ldb,
-                                    TALLOC_CTX *mem_ctx,
-                                    struct ldb_dn *basedn,
-                                    enum ldb_scope scope,
-                                    struct ldb_message **msg,
-                                    const char * const *attrs,
-                                    const char *format, ...) 
-{
-        va_list ap;
-        int ret;
-        struct ldb_request *req;
-        char *filter;
-        TALLOC_CTX *tmp_ctx;
-        struct ldb_result *res;
-        struct ldb_extended_dn_control *ctrl;
-
-        tmp_ctx = talloc_new(mem_ctx);
-
-        res = talloc_zero(tmp_ctx, struct ldb_result);
-        if (!res) {
-                return LDB_ERR_OPERATIONS_ERROR;
-        }
-
-        va_start(ap, format);
-        filter = talloc_vasprintf(tmp_ctx, format, ap);
-        va_end(ap);
-
-        if (filter == NULL) {
-                talloc_free(tmp_ctx);
-                return LDB_ERR_OPERATIONS_ERROR;
-        }
-
-        ret = ldb_build_search_req(&req, ldb, tmp_ctx,
-                                   basedn,
-                                   scope,
-                                   filter,
-                                   attrs,
-                                   NULL,
-                                   res,
-                                   ldb_search_default_callback,
-                                   NULL);
-        if (ret != LDB_SUCCESS) {
-                talloc_free(tmp_ctx);
-                return ret;
-        }
-
-        ctrl = talloc(tmp_ctx, struct ldb_extended_dn_control);
-        if (ctrl == NULL) {
-                talloc_free(tmp_ctx);
-                return LDB_ERR_OPERATIONS_ERROR;                
-        }
-
-        ctrl->type = 1;
-
-        ret = ldb_request_add_control(req, LDB_CONTROL_EXTENDED_DN_OID, true, ctrl);
-        if (ret != LDB_SUCCESS) {
-                return ret;
-        }
-
-        ret = ldb_request(ldb, req);
-        if (ret == LDB_SUCCESS) {
-                ret = ldb_wait(req->handle, LDB_WAIT_ALL);
-        }
-
-        if (ret != LDB_SUCCESS) {
-                talloc_free(tmp_ctx);
-                return ret;
-        }
-
-        if (res->count == 0) {
-                talloc_free(tmp_ctx);
-                return LDB_ERR_NO_SUCH_OBJECT;
-        }
-
-        if (res->count > 1) {
-                /* the function is only supposed to return a single entry */
-                DEBUG(0,(__location__ ": More than one return for baseDN %s  filter %s\n",
-                         ldb_dn_get_linearized(basedn), filter));
-                talloc_free(tmp_ctx);
-                return LDB_ERR_CONSTRAINT_VIOLATION;
-        }
-
-        *msg = talloc_steal(mem_ctx, res->msgs[0]);
-
-        talloc_free(tmp_ctx);
-
-        return LDB_SUCCESS;
-}