The branch, master has been updated
via 0b93902 s4-descriptor: Fixed a typo in a comment and clarified it a
bit.
via be36596 s4-descriptor: Fixed some missing curly braces.
from 85f4f73 s4:torture/rpc/netlogon.c - fix two build warnings by casts
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0b9390234998098a2111dc891f0077bb9cf9d914
Author: Nadezhda Ivanova <[email protected]>
Date: Tue Feb 22 06:30:53 2011 +0200
s4-descriptor: Fixed a typo in a comment and clarified it a bit.
Autobuild-User: Nadezhda Ivanova <[email protected]>
Autobuild-Date: Tue Feb 22 12:39:23 CET 2011 on sn-devel-104
commit be36596f4e98847c91548d8fb80f708a10ebaea1
Author: Nadezhda Ivanova <[email protected]>
Date: Tue Feb 22 06:28:19 2011 +0200
s4-descriptor: Fixed some missing curly braces.
-----------------------------------------------------------------------
Summary of changes:
source4/dsdb/samdb/ldb_modules/descriptor.c | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/descriptor.c
b/source4/dsdb/samdb/ldb_modules/descriptor.c
index 19cea0a..7e92c2b 100644
--- a/source4/dsdb/samdb/ldb_modules/descriptor.c
+++ b/source4/dsdb/samdb/ldb_modules/descriptor.c
@@ -81,28 +81,31 @@ struct dom_sid *get_default_ag(TALLOC_CTX *mem_ctx,
}
if (ldb_dn_compare(nc_root, ldb_get_schema_basedn(ldb)) == 0) {
- if (security_token_has_sid(token, sa_sid))
+ if (security_token_has_sid(token, sa_sid)) {
dag_sid = dom_sid_dup(mem_ctx, sa_sid);
- else if (security_token_has_sid(token, ea_sid))
+ } else if (security_token_has_sid(token, ea_sid)) {
dag_sid = dom_sid_dup(mem_ctx, ea_sid);
- else if (security_token_has_sid(token, da_sid))
+ } else if (security_token_has_sid(token, da_sid)) {
dag_sid = dom_sid_dup(mem_ctx, da_sid);
- else
+ } else {
dag_sid = NULL;
+ }
} else if (ldb_dn_compare(nc_root, ldb_get_config_basedn(ldb)) == 0) {
- if (security_token_has_sid(token, ea_sid))
+ if (security_token_has_sid(token, ea_sid)) {
dag_sid = dom_sid_dup(mem_ctx, ea_sid);
- else if (security_token_has_sid(token, da_sid))
+ } else if (security_token_has_sid(token, da_sid)) {
dag_sid = dom_sid_dup(mem_ctx, da_sid);
- else
+ } else {
dag_sid = NULL;
+ }
} else if (ldb_dn_compare(nc_root, ldb_get_default_basedn(ldb)) == 0) {
- if (security_token_has_sid(token, da_sid))
+ if (security_token_has_sid(token, da_sid)) {
dag_sid = dom_sid_dup(mem_ctx, da_sid);
- else if (security_token_has_sid(token, ea_sid))
+ } else if (security_token_has_sid(token, ea_sid)) {
dag_sid = dom_sid_dup(mem_ctx, ea_sid);
- else
+ } else {
dag_sid = NULL;
+ }
} else {
dag_sid = NULL;
}
@@ -482,8 +485,8 @@ static int descriptor_add(struct ldb_module *module, struct
ldb_request *req)
}
/* if the object has a parent, retrieve its SD to
- * use for calculation. unfortunately we do not yet have
- * instanceType*/
+ * use for calculation. Unfortunately we do not yet have
+ * instanceType, so we use dsdb_find_nc_root. */
parent_dn = ldb_dn_get_parent(req, dn);
if (parent_dn == NULL) {
return ldb_oom(ldb);
--
Samba Shared Repository
