summaryrefslogtreecommitdiff
path: root/source4/dsdb
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-09-09 10:05:58 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:04 -0500
commit30ee8beb9316a99e8a49993306252591106cb349 (patch)
treea00d384bb7e1e9c09a800f4e3de00b2c9450e17b /source4/dsdb
parent85e24e54d29ca8a08ad833831052e41a0bb257b6 (diff)
downloadsamba-30ee8beb9316a99e8a49993306252591106cb349.tar.gz
samba-30ee8beb9316a99e8a49993306252591106cb349.tar.bz2
samba-30ee8beb9316a99e8a49993306252591106cb349.zip
r18301: I discovered how to load the warnings from a build farm build into
emacs compile mode (hint, paste to a file, and compile as "cat filename"). This allowed me to fix nearly all the warnings for a IA_64 SuSE build very quickly. (This used to be commit eba6c84efff735bb0ca941ac4b755ce2b0591667)
Diffstat (limited to 'source4/dsdb')
-rw-r--r--source4/dsdb/samdb/ldb_modules/rootdse.c4
-rw-r--r--source4/dsdb/samdb/ldb_modules/schema.c9
2 files changed, 2 insertions, 11 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c
index ab9c43577c..ba0dc5645c 100644
--- a/source4/dsdb/samdb/ldb_modules/rootdse.c
+++ b/source4/dsdb/samdb/ldb_modules/rootdse.c
@@ -121,7 +121,7 @@ static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_message *ms
int ret = ldb_sequence_number(module->ldb, &seq_num);
if (ret == LDB_SUCCESS) {
if (ldb_msg_add_fmt(msg, "highestCommittedUSN",
- "%llu", seq_num) != 0) {
+ "%llu", (unsigned long long)seq_num) != 0) {
goto failed;
}
}
@@ -260,7 +260,7 @@ static int rootdse_register_partition(struct ldb_module *module, struct ldb_requ
return LDB_ERR_OPERATIONS_ERROR;
}
- list[priv->num_partitions] = talloc_reference(list, req->op.reg_partition.dn);
+ list[priv->num_partitions] = ldb_dn_copy(list, req->op.reg_partition.dn);
if (!list[priv->num_partitions]) {
return LDB_ERR_OPERATIONS_ERROR;
}
diff --git a/source4/dsdb/samdb/ldb_modules/schema.c b/source4/dsdb/samdb/ldb_modules/schema.c
index 36b7916e95..95330e7e8c 100644
--- a/source4/dsdb/samdb/ldb_modules/schema.c
+++ b/source4/dsdb/samdb/ldb_modules/schema.c
@@ -1126,9 +1126,6 @@ static int schema_add(struct ldb_module *module, struct ldb_request *req)
static int schema_modify(struct ldb_module *module, struct ldb_request *req)
{
- struct ldb_handle *h;
- struct schema_context *sctx;
-
if (ldb_dn_is_special(req->op.mod.message->dn)) { /* do not manipulate our control entries */
return ldb_next_request(module, req);
}
@@ -1138,9 +1135,6 @@ static int schema_modify(struct ldb_module *module, struct ldb_request *req)
static int schema_delete(struct ldb_module *module, struct ldb_request *req)
{
- struct ldb_handle *h;
- struct schema_context *sctx;
-
if (ldb_dn_is_special(req->op.del.dn)) { /* do not manipulate our control entries */
return ldb_next_request(module, req);
}
@@ -1152,9 +1146,6 @@ static int schema_delete(struct ldb_module *module, struct ldb_request *req)
static int schema_rename(struct ldb_module *module, struct ldb_request *req)
{
- struct ldb_handle *h;
- struct schema_context *sctx;
-
if (ldb_dn_is_special(req->op.rename.olddn) &&
ldb_dn_is_special(req->op.rename.newdn)) { /* do not manipulate our control entries */
return ldb_next_request(module, req);