The branch, master has been updated
via 64be07b s4:dsdb_dn_val_rmd_flags - memmem - scan the whole string
for occourences
via bb81760 s4:ldap.py - delete the right object after test completition
via f9244a1 s4:ldap.py - fix "system only" test
via 14c660d s4:acl_read LDB module - fix counter type
via 55e3720 s4:getncchanges.c - fix some counter types
via a014679 s4:schema_samba4.ldif - update allocated controls list
via 01c3cb2 s4:libcli/resolve/dns_ex.c - fix "const" warning
from 48dccbf s3: Move #define VALGRIND to config.h
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 64be07bc70e4d755916304eb5446485801374c12
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sat Oct 2 13:45:22 2010 +0200
s4:dsdb_dn_val_rmd_flags - memmem - scan the whole string for occourences
Do this as in "dsdb_dn_is_upgraded_link_val". There is really no reason to
truncate before search.
Autobuild-User: Matthias Dieter Wallnöfer <[email protected]>
Autobuild-Date: Sun Oct 3 10:45:39 UTC 2010 on sn-devel-104
commit bb81760e82bee68e0c4d711338170eae3b19a41a
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Wed Sep 29 19:50:20 2010 +0200
s4:ldap.py - delete the right object after test completition
commit f9244a15c78d73bbccf2c623799584c1d65d8310
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Wed Sep 29 19:39:17 2010 +0200
s4:ldap.py - fix "system only" test
A part was missing
commit 14c660da323c8596ae4babc7f94d51bd793c1b71
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Mon Sep 27 07:46:11 2010 +0200
s4:acl_read LDB module - fix counter type
commit 55e3720470146d5f55a0776be9888781c06f5b5d
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Thu Sep 30 08:47:24 2010 +0200
s4:getncchanges.c - fix some counter types
commit a01467913a22bc23c44cdc8b2b0fcfee296e29ea
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Mon Sep 27 07:42:29 2010 +0200
s4:schema_samba4.ldif - update allocated controls list
This needs always to be done after a control allocation otherwise we end up
in
double-allocations and unexpected behaviour.
commit 01c3cb260c49ab6741dc694e2f193edc50cbb31c
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Tue Sep 28 12:33:40 2010 +0200
s4:libcli/resolve/dns_ex.c - fix "const" warning
-----------------------------------------------------------------------
Summary of changes:
source4/dsdb/common/util.c | 2 +-
source4/dsdb/samdb/ldb_modules/acl_read.c | 3 ++-
source4/dsdb/tests/python/ldap.py | 10 +++++++++-
source4/libcli/resolve/dns_ex.c | 3 ++-
source4/rpc_server/drsuapi/getncchanges.c | 6 +++---
source4/setup/schema_samba4.ldif | 1 +
6 files changed, 18 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index 7e60901..4e6fe03 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -3222,7 +3222,7 @@ uint32_t dsdb_dn_val_rmd_flags(const struct ldb_val *val)
if (val->length < 13) {
return 0;
}
- p = memmem(val->data, val->length-2, "<RMD_FLAGS=", 11);
+ p = memmem(val->data, val->length, "<RMD_FLAGS=", 11);
if (!p) {
return 0;
}
diff --git a/source4/dsdb/samdb/ldb_modules/acl_read.c
b/source4/dsdb/samdb/ldb_modules/acl_read.c
index 49d9095..3b8e60c 100644
--- a/source4/dsdb/samdb/ldb_modules/acl_read.c
+++ b/source4/dsdb/samdb/ldb_modules/acl_read.c
@@ -62,7 +62,8 @@ static int aclread_callback(struct ldb_request *req, struct
ldb_reply *ares)
"parentGUID",
NULL
};
- int i, ret;
+ int ret;
+ unsigned int i;
struct security_descriptor *sd;
struct dom_sid *sid = NULL;
TALLOC_CTX *tmp_ctx;
diff --git a/source4/dsdb/tests/python/ldap.py
b/source4/dsdb/tests/python/ldap.py
index e4c1633..bda612a 100755
--- a/source4/dsdb/tests/python/ldap.py
+++ b/source4/dsdb/tests/python/ldap.py
@@ -341,7 +341,7 @@ class BasicTests(unittest.TestCase):
"objectClass")
ldb.modify(m)
- self.delete_force(self.ldb, "cn=ldaptestuser2,cn=users," +
self.base_dn)
+ self.delete_force(self.ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
def test_system_only(self):
"""Test systemOnly objects"""
@@ -355,6 +355,14 @@ class BasicTests(unittest.TestCase):
except LdbError, (num, _):
self.assertEquals(num, ERR_UNWILLING_TO_PERFORM)
+ try:
+ self.ldb.add({
+ "dn": "cn=testsecret,cn=system," + self.base_dn,
+ "objectclass": "secret"})
+ self.fail()
+ except LdbError, (num, _):
+ self.assertEquals(num, ERR_UNWILLING_TO_PERFORM)
+
self.delete_force(self.ldb, "cn=ldaptestobject," + self.base_dn)
self.delete_force(self.ldb, "cn=testsecret,cn=system," + self.base_dn)
diff --git a/source4/libcli/resolve/dns_ex.c b/source4/libcli/resolve/dns_ex.c
index 711eb0a..35e2ad7 100644
--- a/source4/libcli/resolve/dns_ex.c
+++ b/source4/libcli/resolve/dns_ex.c
@@ -97,7 +97,8 @@ static void run_child_dns_lookup(struct dns_ex_state *state,
int fd)
name doesn't end in a '.'. We need to prevent the
DNS library trying the search domains configured in
resolv.conf */
- state->name.name = talloc_strdup_append(state->name.name, ".");
+ state->name.name = talloc_strdup_append(discard_const_p(char,
state->name.name),
+ ".");
}
/* this is the blocking call we are going to lots of trouble
diff --git a/source4/rpc_server/drsuapi/getncchanges.c
b/source4/rpc_server/drsuapi/getncchanges.c
index 54b0430..4532472 100644
--- a/source4/rpc_server/drsuapi/getncchanges.c
+++ b/source4/rpc_server/drsuapi/getncchanges.c
@@ -121,7 +121,7 @@ static WERROR get_nc_changes_build_object(struct
drsuapi_DsReplicaObjectListItem
enum drsuapi_DsExtendedOperation
extended_op)
{
const struct ldb_val *md_value;
- unsigned int i, n;
+ uint32_t i, n;
struct replPropertyMetaDataBlob md;
uint32_t rid = 0;
enum ndr_err_code ndr_err;
@@ -1062,7 +1062,7 @@ static WERROR
dcesrv_drsuapi_is_reveal_secrets_request(struct drsuapi_bind_state
bool *is_secret_request)
{
enum drsuapi_DsExtendedOperation exop;
- int i;
+ uint32_t i;
struct dsdb_schema *schema;
*is_secret_request = true;
@@ -1170,7 +1170,7 @@ WERROR dcesrv_drsuapi_DsGetNCChanges(struct
dcesrv_call_state *dce_call, TALLOC_
{
struct drsuapi_DsReplicaObjectIdentifier *ncRoot;
int ret;
- unsigned int i;
+ uint32_t i;
struct dsdb_schema *schema;
struct drsuapi_DsReplicaOIDMapping_Ctr *ctr;
struct drsuapi_DsReplicaObjectListItemEx **currentObject;
diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif
index 98801e6..7fb37de 100644
--- a/source4/setup/schema_samba4.ldif
+++ b/source4/setup/schema_samba4.ldif
@@ -187,6 +187,7 @@
#Allocated: DSDB_CONTROL_BYPASS_PASSWORD_HASH_OID 1.3.6.1.4.1.7165.4.3.12
#Allocated: LDB_CONTROL_BYPASSOPERATIONAL_OID 1.3.6.1.4.1.7165.4.3.13
#Allocated: DSDB_CONTROL_CHANGEREPLMETADATA_OID 1.3.6.1.4.1.7165.4.3.14
+#Allocated: DSDB_CONTROL_SEARCH_APPLY_ACCESS 1.3.6.1.4.1.7165.4.3.15
# Extended 1.3.6.1.4.1.7165.4.4.x
#Allocated: DSDB_EXTENDED_REPLICATED_OBJECTS_OID 1.3.6.1.4.1.7165.4.4.1
--
Samba Shared Repository
