dsdb: Improve syntax clarity
authorAndrew Bartlett <abartlet@samba.org>
Tue, 15 Mar 2016 02:09:14 +0000 (15:09 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 2 Jun 2016 14:36:15 +0000 (16:36 +0200)
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
source4/dsdb/repl/replicated_objects.c

index a112e18e076fb9ba8311a1de2352bf45ecf111e4..0ac2b540fefa34430fa8ce9a1c529513286e68aa 100644 (file)
@@ -561,7 +561,8 @@ WERROR dsdb_convert_object_ex(struct ldb_context *ldb,
 
        instanceType = ldb_msg_find_attr_as_int(msg, "instanceType", 0);
 
-       if (instanceType & INSTANCE_TYPE_IS_NC_HEAD && partition_dn) {
+       if ((instanceType & INSTANCE_TYPE_IS_NC_HEAD)
+           && partition_dn != NULL) {
                int partition_dn_cmp = ldb_dn_compare(partition_dn, msg->dn);
                if (partition_dn_cmp != 0) {
                        DEBUG(4, ("Remote server advised us of a new partition %s while processing %s, ignoring\n",