The branch, master has been updated
via 7312dac s4:acl LDB module - interpret "userAccountControl" as
"uint32_t"
via 6bfaa4c libcli/security - fix two output format specifiers
from 738b2ab s4: Don't grant level II oplock to a file with byte-range
locks.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7312dacb6346ced62557ed2cc6a733907c7b3401
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Fri Feb 11 15:10:04 2011 +0100
s4:acl LDB module - interpret "userAccountControl" as "uint32_t"
This is the same way as it is done in the samldb LDB module.
Autobuild-User: Matthias Dieter Wallnöfer <[email protected]>
Autobuild-Date: Tue Feb 15 12:08:26 CET 2011 on sn-devel-104
commit 6bfaa4c10903dc5ccbad5729cba48cdf4cc41b79
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Thu Feb 10 10:17:33 2011 +0100
libcli/security - fix two output format specifiers
-----------------------------------------------------------------------
Summary of changes:
libcli/security/create_descriptor.c | 2 +-
libcli/security/display_sec.c | 2 +-
source4/dsdb/samdb/ldb_modules/acl.c | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/security/create_descriptor.c
b/libcli/security/create_descriptor.c
index 9e348a7..62919a1 100644
--- a/libcli/security/create_descriptor.c
+++ b/libcli/security/create_descriptor.c
@@ -226,7 +226,7 @@ static struct security_acl *process_user_acl(TALLOC_CTX
*mem_ctx,
return NULL;
tmp_acl->revision = acl->revision;
- DEBUG(6,(__location__ ": acl revision %u\n", acl->revision));
+ DEBUG(6,(__location__ ": acl revision %d\n", acl->revision));
co = dom_sid_parse_talloc(tmp_ctx, SID_CREATOR_OWNER);
cg = dom_sid_parse_talloc(tmp_ctx, SID_CREATOR_GROUP);
diff --git a/libcli/security/display_sec.c b/libcli/security/display_sec.c
index f45b770..3d60e42 100644
--- a/libcli/security/display_sec.c
+++ b/libcli/security/display_sec.c
@@ -235,7 +235,7 @@ void display_sec_acl(struct security_acl *sec_acl)
{
int i;
- printf("\tACL\tNum ACEs:\t%d\trevision:\t%x\n",
+ printf("\tACL\tNum ACEs:\t%u\trevision:\t%x\n",
sec_acl->num_aces, sec_acl->revision);
printf("\t---\n");
diff --git a/source4/dsdb/samdb/ldb_modules/acl.c
b/source4/dsdb/samdb/ldb_modules/acl.c
index a96ea37..20f09a5 100644
--- a/source4/dsdb/samdb/ldb_modules/acl.c
+++ b/source4/dsdb/samdb/ldb_modules/acl.c
@@ -436,7 +436,7 @@ static int acl_sDRightsEffective(struct ldb_module *module,
static int acl_validate_spn_value(TALLOC_CTX *mem_ctx,
struct ldb_context *ldb,
const char *spn_value,
- int userAccountControl,
+ uint32_t userAccountControl,
const char *samAccountName,
const char *dnsHostName,
const char *netbios_name,
@@ -544,7 +544,7 @@ static int acl_check_spn(TALLOC_CTX *mem_ctx,
struct ldb_result *netbios_res;
struct ldb_message_element *el;
struct ldb_dn *partitions_dn = samdb_partitions_dn(ldb, tmp_ctx);
- int userAccountControl;
+ uint32_t userAccountControl;
const char *samAccountName;
const char *dnsHostName;
const char *netbios_name;
@@ -597,7 +597,7 @@ static int acl_check_spn(TALLOC_CTX *mem_ctx,
return ret;
}
- userAccountControl = ldb_msg_find_attr_as_int(acl_res->msgs[0],
"userAccountControl", 0);
+ userAccountControl = ldb_msg_find_attr_as_uint(acl_res->msgs[0],
"userAccountControl", 0);
dnsHostName = ldb_msg_find_attr_as_string(acl_res->msgs[0],
"dnsHostName", NULL);
samAccountName = ldb_msg_find_attr_as_string(acl_res->msgs[0],
"samAccountName", NULL);
--
Samba Shared Repository
