diff options
author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2011-03-05 17:15:55 +0100 |
---|---|---|
committer | Matthias Dieter Wallnöfer <mdw@samba.org> | 2011-03-10 11:12:05 +0100 |
commit | 42da193c37e1f3076b1299e761bc973f290bb800 (patch) | |
tree | 87025df6efe4265a0e033544cb4ee9299b0a80b7 | |
parent | 83517d2e597878b86dc51edc6bb0bf25c7d62068 (diff) | |
download | samba-42da193c37e1f3076b1299e761bc973f290bb800.tar.gz samba-42da193c37e1f3076b1299e761bc973f290bb800.tar.bz2 samba-42da193c37e1f3076b1299e761bc973f290bb800.zip |
s4:new_partition LDB module - splitting up an "if" operation
- let the first "if" in place
- uninstantiated partitions are handled by the second "if" (previously
they have been handled twice)
Has been corrected by request of tridge.
-rw-r--r-- | source4/dsdb/samdb/ldb_modules/new_partition.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/new_partition.c b/source4/dsdb/samdb/ldb_modules/new_partition.c index 59743cd765..3d94bbed81 100644 --- a/source4/dsdb/samdb/ldb_modules/new_partition.c +++ b/source4/dsdb/samdb/ldb_modules/new_partition.c @@ -150,9 +150,9 @@ static int new_partition_add(struct ldb_module *module, struct ldb_request *req) if (ldb_msg_find_element(req->op.add.message, "instanceType")) { /* This needs to be 'static' to ensure it does not move, and is not on the stack */ static const char *no_attrs[] = { NULL }; - unsigned int instanceType = ldb_msg_find_attr_as_uint(req->op.add.message, "instanceType", 0); - if (!(instanceType & INSTANCE_TYPE_IS_NC_HEAD) || - (instanceType & INSTANCE_TYPE_UNINSTANT)) { + uint32_t instanceType = ldb_msg_find_attr_as_uint(req->op.add.message, "instanceType", 0); + + if (!(instanceType & INSTANCE_TYPE_IS_NC_HEAD)) { return ldb_next_request(module, req); } |