dsdb: Fix error checking conditions in partition_metadata module

Thanks to Matthieu Patou <mat@matws.net> for pointing it out.

Autobuild-User: Amitay Isaacs <amitay@samba.org>
Autobuild-Date: Wed May 30 17:00:01 CEST 2012 on sn-devel-104

diff --git a/source4/dsdb/samdb/ldb_modules/partition_metadata.c b/source4/dsdb/samdb/ldb_modules/partition_metadata.c
index e3f0fb5c0168e0c685252d173322fb9738a52849..76b78dd13fa0edb543854a5f3de5c6422eb6352a 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/partition_metadata.c
+++ b/source4/dsdb/samdb/ldb_modules/partition_metadata.c
@@ -39,7 +39,7 @@ static int partition_metadata_get_uint64(struct ldb_module *module,
        data = talloc_get_type_abort(ldb_module_get_private(module),
                                     struct partition_private_data);
 
-       if (!data && !data->metadata && !data->metadata->db) {
+       if (!data || !data->metadata || !data->metadata->db) {
                return ldb_module_error(module, LDB_ERR_OPERATIONS_ERROR,
                                        "partition_metadata: metadata tdb not initialized");
        }
@@ -98,7 +98,7 @@ static int partition_metadata_set_uint64(struct ldb_module *module,
        data = talloc_get_type_abort(ldb_module_get_private(module),
                                     struct partition_private_data);
 
-       if (!data && !data->metadata && !data->metadata->db) {
+       if (!data || !data->metadata || !data->metadata->db) {
                return ldb_module_error(module, LDB_ERR_OPERATIONS_ERROR,
                                        "partition_metadata: metadata tdb not initialized");
        }
@@ -359,7 +359,7 @@ int partition_metadata_sequence_number_increment(struct ldb_module *module, uint
 
        data = talloc_get_type_abort(ldb_module_get_private(module),
                                    struct partition_private_data);
-       if (!data && !data->metadata) {
+       if (!data || !data->metadata) {
                return ldb_module_error(module, LDB_ERR_OPERATIONS_ERROR,
                                        "partition_metadata: metadata not initialized");
        }
@@ -390,7 +390,7 @@ int partition_metadata_start_trans(struct ldb_module *module)
 
        data = talloc_get_type_abort(ldb_module_get_private(module),
                                     struct partition_private_data);
-       if (!data && !data->metadata && !data->metadata->db) {
+       if (!data || !data->metadata || !data->metadata->db) {
                return ldb_module_error(module, LDB_ERR_OPERATIONS_ERROR,
                                        "partition_metadata: metadata not initialized");
        }
@@ -417,7 +417,7 @@ int partition_metadata_prepare_commit(struct ldb_module *module)
 
        data = talloc_get_type_abort(ldb_module_get_private(module),
                                     struct partition_private_data);
-       if (!data && !data->metadata && !data->metadata->db) {
+       if (!data || !data->metadata || !data->metadata->db) {
                return ldb_module_error(module, LDB_ERR_OPERATIONS_ERROR,
                                        "partition_metadata: metadata not initialized");
        }
@@ -447,7 +447,7 @@ int partition_metadata_end_trans(struct ldb_module *module)
 
        data = talloc_get_type_abort(ldb_module_get_private(module),
                                     struct partition_private_data);
-       if (!data && !data->metadata && !data->metadata->db) {
+       if (!data || !data->metadata || !data->metadata->db) {
                return ldb_module_error(module, LDB_ERR_OPERATIONS_ERROR,
                                        "partition_metadata: metadata not initialized");
        }
@@ -479,7 +479,7 @@ int partition_metadata_del_trans(struct ldb_module *module)
 
        data = talloc_get_type_abort(ldb_module_get_private(module),
                                     struct partition_private_data);
-       if (!data && !data->metadata && !data->metadata->db) {
+       if (!data || !data->metadata || !data->metadata->db) {
                return ldb_module_error(module, LDB_ERR_OPERATIONS_ERROR,
                                        "partition_metadata: metadata not initialized");
        }