The branch, master has been updated
via c9838f0... s4:torture Silence const warning by use of
data_blob_const()
via 60ec0f1... s4:dsdb/samdb/cracknames - Remove unused header and add
more "const"
via d120e7e... s4:ldb_sort - Add some more "const"
via 0defcfb... s4:libcli/security/access_check - Add "const" in front
of "type"
via 24bca52... s4:smbtorture - Add "const" before "value"
via 925a94b... s4:dsdb Use the 'correct' case for the namingContext
values in rootDSE
from f424097... s4:dsdb Add default modules list to samba3sam
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c9838f0e135dc8d1aa46eb86e6fbc8a82c4ada3a
Author: Andrew Bartlett <[email protected]>
Date: Thu Oct 22 10:17:35 2009 +1100
s4:torture Silence const warning by use of data_blob_const()
This was inspired by one of mdw's const patches
Andrew Bartlett
commit 60ec0f1ae7e3efc65cce3abc1c56138e09473fcf
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sat Oct 17 22:20:43 2009 +0200
s4:dsdb/samdb/cracknames - Remove unused header and add more "const"
Signed-off-by: Andrew Bartlett <[email protected]>
commit d120e7ebde71c0ab694e1e7c0002dd1f80c05f0a
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sat Oct 17 22:30:22 2009 +0200
s4:ldb_sort - Add some more "const"
Signed-off-by: Andrew Bartlett <[email protected]>
commit 0defcfb4f7d6ff82144f9673203777d17d84e53d
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sat Oct 17 22:30:43 2009 +0200
s4:libcli/security/access_check - Add "const" in front of "type"
Signed-off-by: Andrew Bartlett <[email protected]>
commit 24bca52c0baafa10ceaf657d7165acea250281bc
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sat Oct 17 22:39:15 2009 +0200
s4:smbtorture - Add "const" before "value"
Signed-off-by: Andrew Bartlett <[email protected]>
commit 925a94b67c83fb9a0d762f6b11740d1091623f7c
Author: Andrew Bartlett <[email protected]>
Date: Thu Oct 22 09:45:14 2009 +1100
s4:dsdb Use the 'correct' case for the namingContext values in rootDSE
This makes the namingContext attributes in the rootDSE a little more
pretty, by
using the exact same values as used in the database DNs.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
source4/dsdb/samdb/cracknames.c | 7 +++----
source4/dsdb/samdb/ldb_modules/partition_init.c | 22 ++++++++++++++++++++++
source4/lib/ldb/modules/sort.c | 4 ++--
source4/libcli/security/access_check.c | 2 +-
source4/torture/ldb/ldb.c | 3 +--
source4/torture/smbtorture.c | 2 +-
6 files changed, 30 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c
index 8f7f481..23811d3 100644
--- a/source4/dsdb/samdb/cracknames.c
+++ b/source4/dsdb/samdb/cracknames.c
@@ -23,15 +23,14 @@
#include "includes.h"
#include "librpc/gen_ndr/drsuapi.h"
-#include "rpc_server/common/common.h"
#include "lib/events/events.h"
+#include "rpc_server/common/common.h"
#include "lib/ldb/include/ldb.h"
#include "lib/ldb/include/ldb_errors.h"
#include "system/kerberos.h"
#include "auth/kerberos/kerberos.h"
#include "libcli/ldap/ldap_ndr.h"
#include "libcli/security/security.h"
-#include "librpc/gen_ndr/ndr_misc.h"
#include "auth/auth.h"
#include "../lib/util/util_ldb.h"
#include "dsdb/samdb/samdb.h"
@@ -55,7 +54,7 @@ static WERROR dns_domain_from_principal(TALLOC_CTX *mem_ctx,
struct smb_krb5_con
krb5_error_code ret;
krb5_principal principal;
/* perhaps it's a principal with a realm, so return the right 'domain
only' response */
- char *realm;
+ const char *realm;
ret = krb5_parse_name_flags(smb_krb5_context->krb5_context, name,
KRB5_PRINCIPAL_PARSE_REQUIRE_REALM,
&principal);
if (ret) {
@@ -271,7 +270,7 @@ static WERROR DsCrackNameUPN(struct ldb_context *sam_ctx,
TALLOC_CTX *mem_ctx,
const char *result_filter = NULL;
krb5_error_code ret;
krb5_principal principal;
- char *realm;
+ const char *realm;
char *unparsed_name_short;
const char *domain_attrs[] = { NULL };
struct ldb_result *domain_res = NULL;
diff --git a/source4/dsdb/samdb/ldb_modules/partition_init.c
b/source4/dsdb/samdb/ldb_modules/partition_init.c
index c88d418..f4163da 100644
--- a/source4/dsdb/samdb/ldb_modules/partition_init.c
+++ b/source4/dsdb/samdb/ldb_modules/partition_init.c
@@ -394,6 +394,9 @@ int partition_reload_if_required(struct ldb_module *module,
DATA_BLOB dn_blob;
struct ldb_dn *dn;
struct dsdb_partition *partition;
+ struct ldb_result *dn_res;
+ const char *no_attrs[] = { NULL };
+
for (j=0; data->partitions && data->partitions[j]; j++) {
DATA_BLOB casefold =
data_blob_string_const(ldb_dn_get_casefold(data->partitions[j]->ctrl->dn));
if (data_blob_cmp(&casefold,
&partition_attributes->values[i]) == 0) {
@@ -451,6 +454,25 @@ int partition_reload_if_required(struct ldb_module *module,
return ret;
}
+ /* Get the 'correct' case of the partition DNs from the
database */
+ ret = dsdb_module_search_dn(partition->module, data, &dn_res,
+ dn, no_attrs);
+ if (ret == LDB_SUCCESS) {
+ talloc_free(partition->ctrl->dn);
+ partition->ctrl->dn = talloc_steal(partition->ctrl,
dn_res->msgs[0]->dn);
+ talloc_free(dn_res);
+ } else if (ret != LDB_ERR_NO_SUCH_OBJECT) {
+ ldb_asprintf_errstring(ldb,
+ "Failed to search for %s from "
DSDB_PARTITION_DN
+ " replicateEntries for new
partition at %s on %s: %s",
+
ldb_dn_get_linearized(data->replicate[i]),
+ partition->backend_url,
+
ldb_dn_get_linearized(partition->ctrl->dn),
+ ldb_errstring(ldb));
+ talloc_free(mem_ctx);
+ return ret;
+ }
+
ret = add_partition_to_data(ldb, data, partition);
if (ret != LDB_SUCCESS) {
talloc_free(mem_ctx);
diff --git a/source4/lib/ldb/modules/sort.c b/source4/lib/ldb/modules/sort.c
index f0aea77..5d1431d 100644
--- a/source4/lib/ldb/modules/sort.c
+++ b/source4/lib/ldb/modules/sort.c
@@ -44,8 +44,8 @@ struct opaque {
struct sort_context {
struct ldb_module *module;
- char *attributeName;
- char *orderingRule;
+ const char *attributeName;
+ const char *orderingRule;
int reverse;
struct ldb_request *req;
diff --git a/source4/libcli/security/access_check.c
b/source4/libcli/security/access_check.c
index 954c54c..c974a39 100644
--- a/source4/libcli/security/access_check.c
+++ b/source4/libcli/security/access_check.c
@@ -186,7 +186,7 @@ NTSTATUS sec_access_check_ds(const struct
security_descriptor *sd,
int i;
uint32_t bits_remaining;
struct object_tree *node;
- struct GUID *type;
+ const struct GUID *type;
*access_granted = access_desired;
bits_remaining = access_desired;
diff --git a/source4/torture/ldb/ldb.c b/source4/torture/ldb/ldb.c
index 23c9bb2..f986372 100644
--- a/source4/torture/ldb/ldb.c
+++ b/source4/torture/ldb/ldb.c
@@ -665,8 +665,7 @@ static bool torture_ldb_dn(struct torture_context *torture)
ldb_dn_validate(dn) == false,
"should have failed to validate a DN with 0xA in it");
- val.data = "CN=Zer\0,DC=SAMBA,DC=org";
- val.length = 23;
+ val = data_blob_const("CN=Zer\0,DC=SAMBA,DC=org", 23);
torture_assert(torture,
NULL == ldb_dn_from_ldb_val(mem_ctx, ldb, &val),
"should fail to create a DN with 0x0 in it");
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c
index 2899c87..efb92d2 100644
--- a/source4/torture/smbtorture.c
+++ b/source4/torture/smbtorture.c
@@ -510,7 +510,7 @@ int main(int argc,char *argv[])
{
char *option = talloc_asprintf(NULL,
"torture:extra_user%u",
++num_extra_users);
- char *value = poptGetOptArg(pc);
+ const char *value = poptGetOptArg(pc);
lp_set_cmdline(cmdline_lp_ctx, option, value);
talloc_free(option);
}
--
Samba Shared Repository
