Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Wed, 24 Sep 2008 18:14:17 +0000 (20:14 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 24 Sep 2008 18:14:17 +0000 (20:14 +0200)
27 files changed:
source4/auth/gensec/cyrus_sasl.c
source4/auth/kerberos/kerberos.c
source4/auth/kerberos/kerberos_util.c
source4/auth/kerberos/krb5_init_context.c
source4/dsdb/samdb/ldb_modules/kludge_acl.c
source4/dsdb/samdb/ldb_modules/proxy.c
source4/dsdb/samdb/ldb_modules/repl_meta_data.c
source4/dsdb/samdb/ldb_modules/schema_fsmo.c
source4/kdc/hdb-ldb.c
source4/lib/ldb-samba/ldif_handlers.c
source4/lib/ldb/common/attrib_handlers.c
source4/lib/ldb/common/ldb_attributes.c
source4/lib/ldb/common/ldb_debug.c
source4/lib/ldb/common/ldb_ldif.c
source4/lib/ldb/common/ldb_modules.c
source4/lib/ldb/ldb_ildap/ldb_ildap.c
source4/lib/ldb/ldb_ldap/ldb_ldap.c
source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
source4/lib/ldb/ldb_tdb/ldb_cache.c
source4/lib/ldb/ldb_tdb/ldb_pack.c
source4/lib/ldb/ldb_tdb/ldb_search.c
source4/lib/ldb/ldb_tdb/ldb_tdb.c
source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
source4/lib/ldb/modules/operational.c
source4/lib/ldb/modules/paged_results.c
source4/lib/ldb/modules/skel.c
source4/lib/ldb_wrap.c

index 06a7b8a38222b9a0f6dd6819db79b6f1c0fa0846..6f82de82fcd0a9ecfa082af4815b839b17fc298f 100644 (file)
@@ -110,7 +110,7 @@ static int gensec_sasl_get_password(sasl_conn_t *conn, void *context, int id,
 static int gensec_sasl_dispose(struct gensec_sasl_state *gensec_sasl_state)
 {
        sasl_dispose(&gensec_sasl_state->conn);
-       return 0;
+       return SASL_OK;
 }
 
 static NTSTATUS gensec_sasl_client_start(struct gensec_security *gensec_security)
index 2579ab20cc4660ce588e19dbcc8a18bd868e2ffa..d54664fe66dfbd5bfd6e7a160a97357e23a5d1aa 100644 (file)
@@ -33,7 +33,7 @@
   This version is built to use a keyblock, rather than needing the
   original password.
 */
int kerberos_kinit_keyblock_cc(krb5_context ctx, krb5_ccache cc, 
krb5_error_code kerberos_kinit_keyblock_cc(krb5_context ctx, krb5_ccache cc, 
                                krb5_principal principal, krb5_keyblock *keyblock,
                                time_t *expire_time, time_t *kdc_time)
 {
@@ -77,7 +77,7 @@
   simulate a kinit, putting the tgt in the given credentials cache. 
   Orignally by remus@snapserver.com
 */
int kerberos_kinit_password_cc(krb5_context ctx, krb5_ccache cc, 
krb5_error_code kerberos_kinit_password_cc(krb5_context ctx, krb5_ccache cc, 
                                krb5_principal principal, const char *password, 
                                time_t *expire_time, time_t *kdc_time)
 {
index 9002715065aa23a809b9f5c706a321fda27dc91e..0567565d33987962bc84a0d119d0c3ab0c28cf35 100644 (file)
@@ -32,7 +32,7 @@ struct principal_container {
        krb5_principal principal;
 };
 
-static int free_principal(struct principal_container *pc)
+static krb5_error_code free_principal(struct principal_container *pc)
 {
        /* current heimdal - 0.6.3, which we need anyway, fixes segfaults here */
        krb5_free_principal(pc->smb_krb5_context->krb5_context, pc->principal);
@@ -241,19 +241,17 @@ static krb5_error_code salt_principal_from_credentials(TALLOC_CTX *parent_ctx,
        return 0;
 }
 
-static int free_keytab(struct keytab_container *ktc)
+static krb5_error_code free_keytab(struct keytab_container *ktc)
 {
-       krb5_kt_close(ktc->smb_krb5_context->krb5_context, ktc->keytab);
-
-       return 0;
+       return krb5_kt_close(ktc->smb_krb5_context->krb5_context, ktc->keytab);
 }
 
-int smb_krb5_open_keytab(TALLOC_CTX *mem_ctx,
+krb5_error_code smb_krb5_open_keytab(TALLOC_CTX *mem_ctx,
                         struct smb_krb5_context *smb_krb5_context, 
                         const char *keytab_name, struct keytab_container **ktc) 
 {
        krb5_keytab keytab;
-       int ret;
+       krb5_error_code ret;
        ret = krb5_kt_resolve(smb_krb5_context->krb5_context, keytab_name, &keytab);
        if (ret) {
                DEBUG(1,("failed to open krb5 keytab: %s\n", 
@@ -339,7 +337,7 @@ static krb5_error_code keytab_add_keys(TALLOC_CTX *parent_ctx,
        return 0;
 }
 
-static int create_keytab(TALLOC_CTX *parent_ctx,
+static krb5_error_code create_keytab(TALLOC_CTX *parent_ctx,
                         struct cli_credentials *machine_account,
                         struct smb_krb5_context *smb_krb5_context,
                         const char **enctype_strings,
@@ -603,7 +601,7 @@ static krb5_error_code remove_old_entries(TALLOC_CTX *parent_ctx,
        return ret;
 }
 
-int smb_krb5_update_keytab(TALLOC_CTX *parent_ctx,
+krb5_error_code smb_krb5_update_keytab(TALLOC_CTX *parent_ctx,
                           struct cli_credentials *machine_account,
                           struct smb_krb5_context *smb_krb5_context,
                           const char **enctype_strings,
@@ -635,7 +633,7 @@ int smb_krb5_update_keytab(TALLOC_CTX *parent_ctx,
        return ret;
 }
 
-int smb_krb5_create_memory_keytab(TALLOC_CTX *parent_ctx,
+krb5_error_code smb_krb5_create_memory_keytab(TALLOC_CTX *parent_ctx,
                                           struct cli_credentials *machine_account,
                                           struct smb_krb5_context *smb_krb5_context,
                                           const char **enctype_strings,
index 82e42a4560853a5d7f7ee3eacb605efcd6240484..90b542c4c46553c8a0d19b7791c6099ae50bc8d8 100644 (file)
@@ -49,13 +49,13 @@ struct smb_krb5_socket {
        krb5_krbhst_info *hi;
 };
 
-static int smb_krb5_context_destroy_1(struct smb_krb5_context *ctx)
+static krb5_error_code smb_krb5_context_destroy_1(struct smb_krb5_context *ctx)
 {
        krb5_free_context(ctx->krb5_context); 
        return 0;
 }
 
-static int smb_krb5_context_destroy_2(struct smb_krb5_context *ctx)
+static krb5_error_code smb_krb5_context_destroy_2(struct smb_krb5_context *ctx)
 {
        /* Otherwise krb5_free_context will try and close what we have already free()ed */
        krb5_set_warn_dest(ctx->krb5_context, NULL);
index 6836f95873ef81b61a0e8f7f41d2b0913157865b..11e2b7ade99b9bdcaf40c02d8d9bfee9f71bb62c 100644 (file)
@@ -142,7 +142,7 @@ static int kludge_acl_allowedAttributes(struct ldb_context *ldb, struct ldb_mess
                ldb_msg_add_string(msg, attrName, attr_list[i]);
        }
        talloc_free(mem_ctx);
-       return 0;
+       return LDB_SUCCESS;
 
 }
 /* read all objectClasses */
@@ -201,7 +201,7 @@ static int kludge_acl_childClasses(struct ldb_context *ldb, struct ldb_message *
                }
        }
 
-       return 0;
+       return LDB_SUCCESS;
 
 }
 
index d0a315e45a444d59359b157cdc16a0e331224f34..7aa78e98a9f7672f2da40e8f4ec0887c73c52058 100644 (file)
@@ -66,7 +66,7 @@ static int load_proxy_info(struct ldb_module *module)
 
        /* see if we have already loaded it */
        if (proxy->upstream != NULL) {
-               return 0;
+               return LDB_SUCCESS;
        }
 
        dn = ldb_dn_new(proxy, module->ldb, "@PROXYINFO");
@@ -145,7 +145,7 @@ static int load_proxy_info(struct ldb_module *module)
 
        talloc_free(res);
 
-       return 0;
+       return LDB_SUCCESS;
 
 failed:
        talloc_free(res);
@@ -153,7 +153,7 @@ failed:
        talloc_free(proxy->newdn);
        talloc_free(proxy->upstream);
        proxy->upstream = NULL;
-       return -1;
+       return LDB_ERR_OPERATIONS_ERROR;
 }
 
 
@@ -259,7 +259,7 @@ static int proxy_search_bytree(struct ldb_module *module, struct ldb_request *re
        }
 
        if (load_proxy_info(module) != 0) {
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        /* see if the dn is within olddn */
@@ -269,7 +269,7 @@ static int proxy_search_bytree(struct ldb_module *module, struct ldb_request *re
 
        newreq = talloc(module, struct ldb_request);
        if (newreq == NULL) {
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        newreq->op.search.tree = proxy_convert_tree(module, req->op.search.tree);
@@ -298,7 +298,7 @@ static int proxy_search_bytree(struct ldb_module *module, struct ldb_request *re
        if (ret != LDB_SUCCESS) {
                ldb_set_errstring(module->ldb, ldb_errstring(proxy->upstream));
                talloc_free(newreq);
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        for (i = 0; i < newreq->op.search.res->count; i++) {
index dd5faf837aba3b01db50879c9b7636d5b5aad177..34e235aec7297c5e6693077edded012f56a1b635 100644 (file)
@@ -124,16 +124,16 @@ static int add_time_element(struct ldb_message *msg, const char *attr, time_t t)
        char *s;
 
        if (ldb_msg_find_element(msg, attr) != NULL) {
-               return 0;
+               return LDB_SUCCESS;
        }
 
        s = ldb_timestring(msg, t);
        if (s == NULL) {
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        if (ldb_msg_add_string(msg, attr, s) != 0) {
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        el = ldb_msg_find_element(msg, attr);
@@ -141,7 +141,7 @@ static int add_time_element(struct ldb_message *msg, const char *attr, time_t t)
           is ignored */
        el->flags = LDB_FLAG_MOD_REPLACE;
 
-       return 0;
+       return LDB_SUCCESS;
 }
 
 /*
@@ -152,11 +152,11 @@ static int add_uint64_element(struct ldb_message *msg, const char *attr, uint64_
        struct ldb_message_element *el;
 
        if (ldb_msg_find_element(msg, attr) != NULL) {
-               return 0;
+               return LDB_SUCCESS;
        }
 
        if (ldb_msg_add_fmt(msg, attr, "%llu", (unsigned long long)v) != 0) {
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        el = ldb_msg_find_element(msg, attr);
@@ -164,7 +164,7 @@ static int add_uint64_element(struct ldb_message *msg, const char *attr, uint64_
           is ignored */
        el->flags = LDB_FLAG_MOD_REPLACE;
 
-       return 0;
+       return LDB_SUCCESS;
 }
 
 static int replmd_replPropertyMetaData1_attid_sort(const struct replPropertyMetaData1 *m1,
index 968b19c038d5254054b5d32cf202836fc6dadc0a..7c6a6dd26f99bf6de09cb94518dd557b8f1f372b 100644 (file)
@@ -307,7 +307,7 @@ static int generate_dITContentRules(struct ldb_context *ldb, struct ldb_message
                        }
                }
        }
-       return 0;
+       return LDB_SUCCESS;
 }
 
 
index c5466f1acd3e2a9aa49cae26b60ca9a41135a3af..4fde75cf707ca6775cc258af8db78611c52761a1 100644 (file)
@@ -186,7 +186,7 @@ static HDBFlags uf2HDBFlags(krb5_context context, int userAccountControl, enum h
        return flags;
 }
 
-static int hdb_ldb_destrutor(struct hdb_ldb_private *private)
+static int hdb_ldb_destructor(struct hdb_ldb_private *private)
 {
     hdb_entry_ex *entry_ex = private->entry_ex;
     free_hdb_entry(&entry_ex->entry);
@@ -542,7 +542,7 @@ static krb5_error_code LDB_message2entry(krb5_context context, HDB *db,
        private->iconv_convenience = lp_iconv_convenience(lp_ctx);
        private->netbios_name = lp_netbios_name(lp_ctx);
 
-       talloc_set_destructor(private, hdb_ldb_destrutor);
+       talloc_set_destructor(private, hdb_ldb_destructor);
 
        entry_ex->ctx = private;
        entry_ex->free_entry = hdb_ldb_free_entry;
@@ -728,7 +728,7 @@ static krb5_error_code LDB_trust_message2entry(krb5_context context, HDB *db,
        private->iconv_convenience = lp_iconv_convenience(lp_ctx);
        private->netbios_name = lp_netbios_name(lp_ctx);
 
-       talloc_set_destructor(private, hdb_ldb_destrutor);
+       talloc_set_destructor(private, hdb_ldb_destructor);
 
        entry_ex->ctx = private;
        entry_ex->free_entry = hdb_ldb_free_entry;
index a16582d29458a1e0b23cfa7e822c0e1e8fecf4a1..46ea09554dc610880012d4510ae42c2b1d791c0b 100644 (file)
@@ -134,7 +134,7 @@ static int ldb_canonicalise_objectSid(struct ldb_context *ldb, void *mem_ctx,
                        /* Perhaps not a string after all */
                        return ldb_handler_copy(ldb, mem_ctx, in, out);
                }
-               return 0;
+               return LDB_SUCCESS;
        }
        return ldb_handler_copy(ldb, mem_ctx, in, out);
 }
index fb57e2dadc084fb74bf06d1dc7a9b1bc5fca42de..6f1b0815d7c7d2e914e42581f8e9b69de8e1f384 100644 (file)
@@ -38,9 +38,9 @@ int ldb_handler_copy(struct ldb_context *ldb, void *mem_ctx,
        *out = ldb_val_dup(mem_ctx, in);
        if (in->length > 0 && out->data == NULL) {
                ldb_oom(ldb);
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
-       return 0;
+       return LDB_SUCCESS;
 }
 
 /*
@@ -57,13 +57,13 @@ int ldb_handler_fold(struct ldb_context *ldb, void *mem_ctx,
        int l;
 
        if (!in || !out || !(in->data)) {
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        out->data = (uint8_t *)ldb_casefold(ldb, mem_ctx, (const char *)(in->data), in->length);
        if (out->data == NULL) {
                ldb_debug(ldb, LDB_DEBUG_ERROR, "ldb_handler_fold: unable to casefold string [%s]", in->data);
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        s = (char *)(out->data);
@@ -96,7 +96,7 @@ int ldb_handler_fold(struct ldb_context *ldb, void *mem_ctx,
        }
 
        out->length = strlen((char *)out->data);
-       return 0;
+       return LDB_SUCCESS;
 }
 
 
@@ -111,14 +111,14 @@ int ldb_canonicalise_Integer(struct ldb_context *ldb, void *mem_ctx,
        char *end;
        long long i = strtoll((char *)in->data, &end, 0);
        if (*end != 0) {
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
        out->data = (uint8_t *)talloc_asprintf(mem_ctx, "%lld", i);
        if (out->data == NULL) {
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
        out->length = strlen((char *)out->data);
-       return 0;
+       return LDB_SUCCESS;
 }
 
 /*
@@ -251,7 +251,7 @@ int ldb_canonicalise_dn(struct ldb_context *ldb, void *mem_ctx,
        }
        out->length = strlen((char *)out->data);
 
-       ret = 0;
+       ret = LDB_SUCCESS;
 
 done:
        talloc_free(dn);
@@ -305,10 +305,10 @@ int ldb_canonicalise_utctime(struct ldb_context *ldb, void *mem_ctx,
        time_t t = ldb_string_to_time((char *)in->data);
        out->data = (uint8_t *)ldb_timestring(mem_ctx, t);
        if (out->data == NULL) {
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
        out->length = strlen((char *)out->data);
-       return 0;
+       return LDB_SUCCESS;
 }
 
 /*
index 747f2417811a9069b1ed4391b70672b6d54f590b..0fbb5e2bfb49cebd45a60ffaf3f667f808fa299c 100644 (file)
@@ -61,7 +61,7 @@ int ldb_schema_attribute_add_with_syntax(struct ldb_context *ldb,
                           struct ldb_schema_attribute, n);
        if (a == NULL) {
                ldb_oom(ldb);
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
        ldb->schema.attributes = a;
 
@@ -70,7 +70,7 @@ int ldb_schema_attribute_add_with_syntax(struct ldb_context *ldb,
                if (cmp == 0) {
                        /* silently ignore attempts to overwrite fixed attributes */
                        if (a[i].flags & LDB_ATTR_FLAG_FIXED) {
-                               return 0;
+                               return LDB_SUCCESS;
                        }
                        if (a[i].flags & LDB_ATTR_FLAG_ALLOCATED) {
                                talloc_free(discard_const_p(char, a[i].name));
@@ -93,11 +93,11 @@ int ldb_schema_attribute_add_with_syntax(struct ldb_context *ldb,
                a[i].name = talloc_strdup(a, a[i].name);
                if (a[i].name == NULL) {
                        ldb_oom(ldb);
-                       return -1;
+                       return LDB_ERR_OPERATIONS_ERROR;
                }
        }
 
-       return 0;
+       return LDB_SUCCESS;
 }
 
 static const struct ldb_schema_syntax ldb_syntax_default = {
index 0f78e37c1c570ae91ed13a3fca6c9c5dcb78419d..8e1c491f1275b6da56c6f9f7179754af0f6fc732 100644 (file)
@@ -43,7 +43,7 @@ int ldb_set_debug(struct ldb_context *ldb,
 {
        ldb->debug_ops.debug = debug;
        ldb->debug_ops.context = context;
-       return 0;
+       return LDB_SUCCESS;
 }
 
 /*
index fb93e17c6c04dc45a69e103d254c0aac07f82f14..6cbd30f377a65a0afdda15ac7b5a944f30a0c51c 100644 (file)
@@ -191,19 +191,19 @@ int ldb_should_b64_encode(const struct ldb_val *val)
        uint8_t *p = val->data;
 
        if (val->length == 0) {
-               return 0;
+               return LDB_SUCCESS;
        }
 
        if (p[0] == ' ' || p[0] == ':') {
-               return 1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        for (i=0; i<val->length; i++) {
                if (!isprint(p[i]) || p[i] == '\n') {
-                       return 1;
+                       return LDB_ERR_OPERATIONS_ERROR;
                }
        }
-       return 0;
+       return LDB_SUCCESS;
 }
 
 /* this macro is used to handle the return checking on fprintf_fn() */
@@ -444,12 +444,12 @@ static int next_attr(void *mem_ctx, char **s, const char **attr, struct ldb_val
                value->length = 0;
                *attr = "-";
                *s += 2;
-               return 0;
+               return LDB_SUCCESS;
        }
 
        p = strchr(*s, ':');
        if (!p) {
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        *p++ = 0;
@@ -487,7 +487,7 @@ static int next_attr(void *mem_ctx, char **s, const char **attr, struct ldb_val
                int len = ldb_base64_decode((char *)value->data);
                if (len == -1) {
                        /* it wasn't valid base64 data */
-                       return -1;
+                       return LDB_ERR_OPERATIONS_ERROR;
                }
                value->length = len;
        }
@@ -496,11 +496,11 @@ static int next_attr(void *mem_ctx, char **s, const char **attr, struct ldb_val
                int len = ldb_read_data_file(mem_ctx, value);
                if (len == -1) {
                        /* an error occured hile trying to retrieve the file */
-                       return -1;
+                       return LDB_ERR_OPERATIONS_ERROR;
                }
        }
 
-       return 0;
+       return LDB_SUCCESS;
 }
 
 
index c0cd616a76e63bb02f1530b2de2d729d09b08264..046d36edf184d6418f46f1ead449a1a667a27c05 100644 (file)
@@ -279,16 +279,16 @@ int ldb_register_module(const struct ldb_module_ops *ops)
        struct ops_list_entry *entry = talloc(talloc_autofree_context(), struct ops_list_entry);
 
        if (ldb_find_module_ops(ops->name) != NULL)
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
 
        if (entry == NULL)
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
 
        entry->ops = ops;
        entry->next = registered_modules;
        registered_modules = entry;
 
-       return 0;
+       return LDB_SUCCESS;
 }
 
 void *ldb_dso_load_symbol(struct ldb_context *ldb, const char *name,
index 5ad671ea2ea16e505c1cfdf821cc79a8e76c4405..3a5da89c41d90eb8f0d5907fffe0aac773af9eae 100644 (file)
@@ -753,7 +753,7 @@ static int ildb_connect(struct ldb_context *ldb, const char *url,
        module = talloc(ldb, struct ldb_module);
        if (!module) {
                ldb_oom(ldb);
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
        talloc_set_name_const(module, "ldb_ildap backend");
        module->ldb             = ldb;
@@ -819,11 +819,11 @@ static int ildb_connect(struct ldb_context *ldb, const char *url,
        }
 
        *_module = module;
-       return 0;
+       return LDB_SUCCESS;
 
 failed:
        talloc_free(module);
-       return -1;
+       return LDB_ERR_OPERATIONS_ERROR;
 }
 
 _PUBLIC_ const struct ldb_backend_ops ldb_ldap_backend_ops = {
index a4534c549ad93a7fd9d70245c521dde7af1ce4bd..5026f9c00642c4611d7fd8ca5020bb04b9963e72 100644 (file)
@@ -180,14 +180,14 @@ static int lldb_add_msg_attr(struct ldb_context *ldb,
        count = ldap_count_values_len(bval);
 
        if (count <= 0) {
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        el = talloc_realloc(msg, msg->elements, struct ldb_message_element, 
                              msg->num_elements + 1);
        if (!el) {
                errno = ENOMEM;
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        msg->elements = el;
@@ -197,7 +197,7 @@ static int lldb_add_msg_attr(struct ldb_context *ldb,
        el->name = talloc_strdup(msg->elements, attr);
        if (!el->name) {
                errno = ENOMEM;
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
        el->flags = 0;
 
@@ -205,7 +205,7 @@ static int lldb_add_msg_attr(struct ldb_context *ldb,
        el->values = talloc_array(msg->elements, struct ldb_val, count);
        if (!el->values) {
                errno = ENOMEM;
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        for (i=0;i<count;i++) {
@@ -214,7 +214,7 @@ static int lldb_add_msg_attr(struct ldb_context *ldb,
                el->values[i].data = talloc_size(el->values, bval[i]->bv_len+1);
                if (!el->values[i].data) {
                        errno = ENOMEM;
-                       return -1;
+                       return LDB_ERR_OPERATIONS_ERROR;
                }
                memcpy(el->values[i].data, bval[i]->bv_val, bval[i]->bv_len);
                el->values[i].data[bval[i]->bv_len] = 0;
@@ -224,7 +224,7 @@ static int lldb_add_msg_attr(struct ldb_context *ldb,
 
        msg->num_elements++;
 
-       return 0;
+       return LDB_SUCCESS;
 }
 
 /*
@@ -785,7 +785,7 @@ static int lldb_connect(struct ldb_context *ldb,
        if (module == NULL) {
                ldb_oom(ldb);
                talloc_free(lldb);
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
        talloc_set_name_const(module, "ldb_ldap backend");
        module->ldb             = ldb;
@@ -819,11 +819,11 @@ static int lldb_connect(struct ldb_context *ldb,
        }
 
        *_module = module;
-       return 0;
+       return LDB_SUCCESS;
 
 failed:
        talloc_free(module);
-       return -1;
+       return LDB_ERR_OPERATIONS_ERROR;
 }
 
 const struct ldb_backend_ops ldb_ldap_backend_ops = {
index a0e63c8da1fe817441a15977683f0bfbbeb19cc0..7e4fe1d08d15e1357d6ff4dcd0741acad0bf41ad 100644 (file)
@@ -670,10 +670,10 @@ static int lsqlite3_safe_rollback(sqlite3 *sqlite)
                        printf("lsqlite3_safe_rollback: Error: %s\n", errmsg);
                        free(errmsg);
                }
-               return -1;
+               return SQLITE_ERROR;
        }
 
-        return 0;
+        return SQLITE_OK;
 }
 
 /* return an eid as result */
@@ -1440,13 +1440,13 @@ static int lsql_start_trans(struct ldb_module * module)
                                printf("lsqlite3_start_trans: error: %s\n", errmsg);
                                free(errmsg);
                        }
-                       return -1;
+                       return SQLITE_ERROR;
                }
        };
 
        lsqlite3->trans_count++;
 
-       return 0;
+       return SQLITE_OK;
 }
 
 static int lsql_end_trans(struct ldb_module *module)
@@ -1457,7 +1457,7 @@ static int lsql_end_trans(struct ldb_module *module)
 
        if (lsqlite3->trans_count > 0) {
                lsqlite3->trans_count--;
-       } else return -1;
+       } else return SQLITE_ERROR;
 
        if (lsqlite3->trans_count == 0) {
                ret = sqlite3_exec(lsqlite3->sqlite, "COMMIT;", NULL, NULL, &errmsg);
@@ -1466,11 +1466,11 @@ static int lsql_end_trans(struct ldb_module *module)
                                printf("lsqlite3_end_trans: error: %s\n", errmsg);
                                free(errmsg);
                        }
-                       return -1;
+                       return SQLITE_ERROR;
                }
        }
 
-        return 0;
+        return SQLITE_OK;
 }
 
 static int lsql_del_trans(struct ldb_module *module)
@@ -1479,13 +1479,13 @@ static int lsql_del_trans(struct ldb_module *module)
 
        if (lsqlite3->trans_count > 0) {
                lsqlite3->trans_count--;
-       } else return -1;
+       } else return SQLITE_ERROR;
 
        if (lsqlite3->trans_count == 0) {
                return lsqlite3_safe_rollback(lsqlite3->sqlite);
        }
 
-       return -1;
+       return SQLITE_ERROR;
 }
 
 static int destructor(struct lsqlite3_private *lsqlite3)
@@ -1493,7 +1493,7 @@ static int destructor(struct lsqlite3_private *lsqlite3)
        if (lsqlite3->sqlite) {
                sqlite3_close(lsqlite3->sqlite);
        }
-       return 0;
+       return SQLITE_OK;
 }
 
 static int lsql_request(struct ldb_module *module, struct ldb_request *req)
@@ -1540,7 +1540,7 @@ static int initialize(struct lsqlite3_private *lsqlite3,
        /* create a local ctx */
        local_ctx = talloc_named(lsqlite3, 0, "lsqlite3_rename local context");
        if (local_ctx == NULL) {
-               return -1;
+               return SQLITE_ERROR;
        }
 
        schema = lsqlite3_tprintf(local_ctx,
@@ -1792,7 +1792,7 @@ static int initialize(struct lsqlite3_private *lsqlite3,
 failed:
        if (rollback) lsqlite3_safe_rollback(lsqlite3->sqlite); 
        sqlite3_close(lsqlite3->sqlite);
-       return -1;
+       return SQLITE_ERROR;
 }
 
 /*
@@ -1860,14 +1860,14 @@ static int lsqlite3_connect(struct ldb_context *ldb,
                }
        }
         
-       return 0;
+       return LDB_SUCCESS;
         
 failed:
         if (lsqlite3->sqlite != NULL) {
                 (void) sqlite3_close(lsqlite3->sqlite);
         }
        talloc_free(lsqlite3);
-       return -1;
+       return LDB_ERR_OPERATIONS_ERROR;
 }
 
 const struct ldb_backend_ops ldb_sqlite3_backend_ops = {
index 2576e2c7bdee41932174322d2f346498db16664f..e502f1e6422a41ea344f88934f05f6b971b272a6 100644 (file)
@@ -92,11 +92,11 @@ static int ltdb_attributes_flags(struct ldb_message_element *el, unsigned *v)
                        }
                }
                if (ltdb_valid_attr_flags[j].name == NULL) {
-                       return -1;
+                       return LDB_ERR_OPERATIONS_ERROR;
                }
        }
        *v = value;
-       return 0;
+       return LDB_SUCCESS;
 }
 
 /*
@@ -118,7 +118,7 @@ static int ltdb_attributes_load(struct ldb_module *module)
                goto failed;
        }
        if (r == LDB_ERR_NO_SUCH_OBJECT) {
-               return 0;
+               return LDB_SUCCESS;
        }
        /* mapping these flags onto ldap 'syntaxes' isn't strictly correct,
           but its close enough for now */
@@ -162,9 +162,9 @@ static int ltdb_attributes_load(struct ldb_module *module)
                }
        }
 
-       return 0;
+       return LDB_SUCCESS;
 failed:
-       return -1;
+       return LDB_ERR_OPERATIONS_ERROR;
 }
 
 
@@ -258,7 +258,7 @@ int ltdb_cache_load(struct ldb_module *module)
        /* a very fast check to avoid extra database reads */
        if (ltdb->cache != NULL && 
            tdb_get_seqnum(ltdb->tdb) == ltdb->tdb_seqnum) {
-               return 0;
+               return LDB_SUCCESS;
        }
 
        if (ltdb->cache == NULL) {
@@ -344,7 +344,7 @@ int ltdb_cache_load(struct ldb_module *module)
                goto failed;
        }
 
-       if (ltdb_attributes_load(module) == -1) {
+       if (ltdb_attributes_load(module) != LDB_SUCCESS) {
                goto failed;
        }
 
@@ -353,14 +353,14 @@ done:
        talloc_free(baseinfo);
        talloc_free(baseinfo_dn);
        talloc_free(indexlist_dn);
-       return 0;
+       return LDB_SUCCESS;
 
 failed:
        talloc_free(options);
        talloc_free(baseinfo);
        talloc_free(baseinfo_dn);
        talloc_free(indexlist_dn);
-       return -1;
+       return LDB_ERR_OPERATIONS_ERROR;
 }
 
 
@@ -449,10 +449,10 @@ int ltdb_check_at_attributes_values(const struct ldb_val *value)
 
        for (i = 0; ltdb_valid_attr_flags[i].name != NULL; i++) {
                if ((strcmp(ltdb_valid_attr_flags[i].name, (char *)value->data) == 0)) {
-                       return 0;
+                       return LDB_SUCCESS;
                }
        }
 
-       return -1;
+       return LDB_ERR_OPERATIONS_ERROR;
 }
 
index afb07dcbcad2cce5cd8d067108265cb75324efb3..d96e7590e7187385a43f9cb4539bdf88b1d4c2dd 100644 (file)
@@ -89,7 +89,7 @@ int ltdb_pack_data(struct ldb_module *module,
        dn = ldb_dn_get_linearized(message->dn);
        if (dn == NULL) {
                errno = ENOMEM;
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        /* work out how big it needs to be */
@@ -114,7 +114,7 @@ int ltdb_pack_data(struct ldb_module *module,
        data->dptr = talloc_array(ldb, uint8_t, size);
        if (!data->dptr) {
                errno = ENOMEM;
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
        data->dsize = size;
 
@@ -147,7 +147,7 @@ int ltdb_pack_data(struct ldb_module *module,
                }
        }
 
-       return 0;
+       return LDB_SUCCESS;
 }
 
 /*
@@ -207,7 +207,7 @@ int ltdb_unpack_data(struct ldb_module *module,
 
        if (message->num_elements == 0) {
                message->elements = NULL;
-               return 0;
+               return LDB_SUCCESS;
        }
        
        if (message->num_elements > remaining / 6) {
@@ -281,9 +281,9 @@ int ltdb_unpack_data(struct ldb_module *module,
                          "Error: %d bytes unread in ltdb_unpack_data\n", remaining);
        }
 
-       return 0;
+       return LDB_SUCCESS;
 
 failed:
        talloc_free(message->elements);
-       return -1;
+       return LDB_ERR_OPERATIONS_ERROR;
 }
index da899c361edac6da084545fbbb3885daccce30f9..ce7a90e3d5f9b189dc4b08428d9c96d73b68270c 100644 (file)
@@ -262,7 +262,7 @@ int ltdb_search_dn1(struct ldb_module *module, struct ldb_dn *dn, struct ldb_mes
 
        ret = ltdb_unpack_data(module, &tdb_data, msg);
        free(tdb_data.dptr);
-       if (ret == -1) {
+       if (ret != LDB_SUCCESS) {
                return LDB_ERR_OPERATIONS_ERROR;                
        }
 
@@ -285,7 +285,7 @@ static int ltdb_lock_read(struct ldb_module *module)
        if (ltdb->in_transaction == 0) {
                return tdb_lockall_read(ltdb->tdb);
        }
-       return 0;
+       return LDB_SUCCESS;
 }
 
 /*
@@ -297,7 +297,7 @@ static int ltdb_unlock_read(struct ldb_module *module)
        if (ltdb->in_transaction == 0) {
                return tdb_unlockall_read(ltdb->tdb);
        }
-       return 0;
+       return LDB_SUCCESS;
 }
 
 /*
@@ -317,14 +317,14 @@ int ltdb_add_attr_results(struct ldb_module *module,
        /* pull the attributes that the user wants */
        msg2 = ltdb_pull_attrs(module, mem_ctx, msg, attrs);
        if (!msg2) {
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        /* add to the results list */
        res2 = talloc_realloc(mem_ctx, *res, struct ldb_message *, (*count)+2);
        if (!res2) {
                talloc_free(msg2);
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        (*res) = res2;
@@ -333,7 +333,7 @@ int ltdb_add_attr_results(struct ldb_module *module,
        (*res)[(*count)+1] = NULL;
        (*count)++;
 
-       return 0;
+       return LDB_SUCCESS;
 }
 
 
@@ -356,7 +356,7 @@ int ltdb_filter_attrs(struct ldb_message *msg, const char * const *attrs)
 
                        if (ldb_attr_cmp(attrs[i], "distinguishedName") == 0) {
                                if (msg_add_distinguished_name(msg) != 0) {
-                                       return -1;
+                                       return LDB_ERR_OPERATIONS_ERROR;
                                }
                        }
                }
@@ -366,9 +366,9 @@ int ltdb_filter_attrs(struct ldb_message *msg, const char * const *attrs)
        
        if (keep_all) {
                if (msg_add_distinguished_name(msg) != 0) {
-                       return -1;
+                       return LDB_ERR_OPERATIONS_ERROR;
                }
-               return 0;
+               return LDB_SUCCESS;
        }
 
        for (i = 0; i < msg->num_elements; i++) {
@@ -387,7 +387,7 @@ int ltdb_filter_attrs(struct ldb_message *msg, const char * const *attrs)
                }
        }
 
-       return 0;
+       return LDB_SUCCESS;
 }
 
 /*
@@ -402,14 +402,14 @@ static int search_func(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, voi
 
        if (key.dsize < 4 || 
            strncmp((char *)key.dptr, "DN=", 3) != 0) {
-               return 0;
+               return LDB_SUCCESS;
        }
 
        ares = talloc_zero(ac, struct ldb_reply);
        if (!ares) {
                handle->status = LDB_ERR_OPERATIONS_ERROR;
                handle->state = LDB_ASYNC_DONE;
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        ares->message = ldb_msg_new(ares);
@@ -417,14 +417,14 @@ static int search_func(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, voi
                handle->status = LDB_ERR_OPERATIONS_ERROR;
                handle->state = LDB_ASYNC_DONE;
                talloc_free(ares);
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        /* unpack the record */
        ret = ltdb_unpack_data(ac->module, &data, ares->message);
-       if (ret == -1) {
+       if (ret) {
                talloc_free(ares);
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        if (!ares->message->dn) {
@@ -433,7 +433,7 @@ static int search_func(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, voi
                        handle->status = LDB_ERR_OPERATIONS_ERROR;
                        handle->state = LDB_ASYNC_DONE;
                        talloc_free(ares);
-                       return -1;
+                       return LDB_ERR_OPERATIONS_ERROR;
                }
        }
 
@@ -441,17 +441,17 @@ static int search_func(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, voi
        if (!ldb_match_msg(ac->module->ldb, ares->message, ac->tree, 
                               ac->base, ac->scope)) {
                talloc_free(ares);
-               return 0;
+               return LDB_SUCCESS;
        }
 
        /* filter the attributes that the user wants */
        ret = ltdb_filter_attrs(ares->message, ac->attrs);
 
-       if (ret == -1) {
+       if (ret != LDB_SUCCESS) {
                handle->status = LDB_ERR_OPERATIONS_ERROR;
                handle->state = LDB_ASYNC_DONE;
                talloc_free(ares);
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        ares->type = LDB_REPLY_ENTRY;
@@ -460,10 +460,10 @@ static int search_func(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, voi
 
        if (handle->status != LDB_SUCCESS) {
                /* don't try to free ares here, the callback is in charge of that */
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }       
 
-       return 0;
+       return LDB_SUCCESS;
 }
 
 
index 01d570c89ad7f954ab218055adb6dd753acbb0cd..b711efd1fac134267ba4ac7b772bf1815d8a5c27 100644 (file)
@@ -174,7 +174,7 @@ int ltdb_check_special_dn(struct ldb_module *module,
 
        if (! ldb_dn_is_special(msg->dn) ||
            ! ldb_dn_check_special(msg->dn, LTDB_ATTRIBUTES)) {
-               return 0;
+               return LDB_SUCCESS;
        }
 
        /* we have @ATTRIBUTES, let's check attributes are fine */
@@ -188,7 +188,7 @@ int ltdb_check_special_dn(struct ldb_module *module,
                }
        }
 
-       return 0;
+       return LDB_SUCCESS;
 }
 
 
@@ -231,7 +231,7 @@ int ltdb_store(struct ldb_module *module, const struct ldb_message *msg, int flg
        }
 
        ret = ltdb_pack_data(module, msg, &tdb_data);
-       if (ret == -1) {
+       if (ret != LDB_SUCCESS) {
                talloc_free(tdb_key.dptr);
                return LDB_ERR_OTHER;
        }
@@ -626,7 +626,7 @@ int ltdb_modify_internal(struct ldb_module *module,
        }
 
        ret = ltdb_unpack_data(module, &tdb_data, msg2);
-       if (ret == -1) {
+       if (ret != LDB_SUCCESS) {
                ret = LDB_ERR_OTHER;
                goto failed;
        }
@@ -1069,7 +1069,7 @@ static int ltdb_connect(struct ldb_context *ldb, const char *url,
                if (strncmp(url, "tdb://", 6) != 0) {
                        ldb_debug(ldb, LDB_DEBUG_ERROR,
                                  "Invalid tdb URL '%s'", url);
-                       return -1;
+                       return LDB_ERR_OPERATIONS_ERROR;
                }
                path = url+6;
        } else {
@@ -1097,7 +1097,7 @@ static int ltdb_connect(struct ldb_context *ldb, const char *url,
        ltdb = talloc_zero(ldb, struct ltdb_private);
        if (!ltdb) {
                ldb_oom(ldb);
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        /* note that we use quite a large default hash size */
@@ -1108,7 +1108,7 @@ static int ltdb_connect(struct ldb_context *ldb, const char *url,
                ldb_debug(ldb, LDB_DEBUG_ERROR,
                          "Unable to open tdb '%s'\n", path);
                talloc_free(ltdb);
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        ltdb->sequence_number = 0;
@@ -1117,7 +1117,7 @@ static int ltdb_connect(struct ldb_context *ldb, const char *url,
        if (!module) {
                ldb_oom(ldb);
                talloc_free(ltdb);
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
        talloc_set_name_const(*module, "ldb_tdb backend");
        (*module)->ldb = ldb;
@@ -1128,10 +1128,10 @@ static int ltdb_connect(struct ldb_context *ldb, const char *url,
        if (ltdb_cache_load(*module) != 0) {
                talloc_free(*module);
                talloc_free(ltdb);
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
-       return 0;
+       return LDB_SUCCESS;
 }
 
 const struct ldb_backend_ops ldb_tdb_backend_ops = {
index 4fea43c8c805b183f234313d98e79ae5fb030d86..9d856355be420857bae1e04630323f8a2597e43d 100644 (file)
@@ -53,7 +53,7 @@ static int ltdb_wrap_destructor(struct ltdb_wrap *w)
        if (w == tdb_list) {
                tdb_list = w->next;
        }
-       return 0;
+       return LDB_SUCCESS;
 }                               
 
 static void ltdb_log_fn(struct tdb_context *tdb, enum tdb_debug_level level, const char *fmt, ...) PRINTF_ATTRIBUTE(3, 4);
index a59e81becdd4e50eb764484eba6b2ae1a27254ce..716f34d660eb69d1c1809101ab416542267d53ce 100644 (file)
@@ -158,13 +158,13 @@ static int operational_search_post_process(struct ldb_module *module,
                }
        }
 
-       return 0;
+       return LDB_SUCCESS;
 
 failed:
        ldb_debug_set(module->ldb, LDB_DEBUG_WARNING, 
                      "operational_search_post_process failed for attribute '%s'\n", 
                      attrs[a]);
-       return -1;
+       return LDB_ERR_OPERATIONS_ERROR;
 }
 
 
index b62b1f92cbd7d0271fffbbef452664bfb89662fe..c7296a1edfeeca2bfa50fff2ea7808f785ecf66c 100644 (file)
@@ -86,7 +86,7 @@ int store_destructor(struct results_store *store)
                store->priv->store = NULL;
        }
 
-       return 0;
+       return LDB_SUCCESS;
 }
 
 static struct results_store *new_store(struct private_data *priv)
index 0cd29ac4b7e0fc8839944481daf60fb908a3b805..15df46354b558e04f498f4dcb2de2ea87edb5dd7 100644 (file)
@@ -90,7 +90,7 @@ static int skel_destructor(struct ldb_module *ctx)
        struct private_data *data = talloc_get_type(ctx->private_data, struct private_data);
        /* put your clean-up functions here */
        if (data->some_private_data) talloc_free(data->some_private_data);
-       return 0;
+       return LDB_SUCCESS;
 }
 
 static int skel_request(struct ldb_module *module, struct ldb_request *req)
index 6c683a1e33068eb49f8d210f7c403966a3df75b7..8082f4fac52ab09e8c7cb2d1130770fa64b41658 100644 (file)
@@ -84,7 +84,7 @@ static int ldb_wrap_destructor(struct ldb_context *ldb)
                smb_panic("probable memory leak in ldb");
 #endif
        }
-       return 0;
+       return LDB_SUCCESS;
 }                               
 
 /*