Changeset 745 for trunk/server/source4/cldap_server/rootdse.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)
• source4/cldap_server/rootdse.c (modified) (6 diffs)

trunk/server/source4/cldap_server/rootdse.c

@@ -22 +22 @@
 #include "includes.h"
 #include <tevent.h>
-#include "libcli/ldap/ldap.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "smbd/service_task.h"
 #include "cldap_server/cldap_server.h"
@@ -38 +37 @@
 {
         struct ldap_SearchResEntry *ent = NULL;
-        struct ldb_dn *basedn;
         struct ldb_result *res = NULL;
         struct ldb_request *lreq;
-        enum ldb_scope scope = LDB_SCOPE_DEFAULT;
         const char **attrs = NULL;
         const char *errstr = NULL;
-        int ret = 0;
-        int ldb_ret = -1;
-
-        basedn = ldb_dn_new(mem_ctx, cldapd->samctx, NULL);
-        if (basedn == NULL) goto nomem;
-        scope = LDB_SCOPE_BASE;
+        int ret = LDAP_SUCCESS, ldb_ret;
 
         if (search->num_attributes >= 1) {
@@ -67 +59 @@
 
         ldb_ret = ldb_build_search_req_ex(&lreq, cldapd->samctx, mem_ctx,
-                                          basedn, scope,
+                                          NULL, LDB_SCOPE_BASE,
                                           search->tree, attrs,
                                           NULL,
@@ -108 +100 @@
                 }
                 ent->num_attributes = res->msgs[0]->num_elements;
-                ent->attributes = talloc_array(ent, struct ldb_message_element, ent->num_attributes);
+                ent->attributes = talloc_array(ent, struct ldb_message_element,
+                                               ent->num_attributes);
                 if (ent->attributes == NULL) goto nomem;
                 for (j=0; j < ent->num_attributes; j++) {
-                        ent->attributes[j].name = talloc_steal(ent->attributes, res->msgs[0]->elements[j].name);
+                        ent->attributes[j].name = talloc_steal(ent->attributes,
+                                                               res->msgs[0]->elements[j].name);
                         ent->attributes[j].num_values = 0;
                         ent->attributes[j].values = NULL;
@@ -124 +118 @@
 
 reply:
-        if (ret) {
+        if (ret != LDAP_SUCCESS) {
                 /* nothing ... */
         } else if (ldb_ret == LDB_SUCCESS) {
@@ -165 +159 @@
         reply.result            = &result;
 
-        cldapd_rootdse_fill(cldapd, tmp_ctx, search, &reply.response, reply.result);
+        cldapd_rootdse_fill(cldapd, tmp_ctx, search, &reply.response,
+                            reply.result);
 
         status = cldap_reply_send(cldap, &reply);