The branch, master has been updated
via 3712006 dsdb: improve debug message
from ce45ae1 s3-waf: make sure we always compile (not install) our
libsmbclient testcode.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3712006faacbc468d7df3d577c796508e533617c
Author: Andrew Tridgell <[email protected]>
Date: Thu Oct 20 08:02:40 2011 +1100
dsdb: improve debug message
show the reply type in "Invalid reply type" messages
Autobuild-User: Andrew Tridgell <[email protected]>
Autobuild-Date: Thu Oct 20 00:57:05 CEST 2011 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
lib/ldb/common/ldb.c | 6 +++---
lib/ldb/ldb_map/ldb_map_inbound.c | 6 +++---
source4/dsdb/samdb/ldb_modules/new_partition.c | 2 +-
source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 2 +-
source4/dsdb/samdb/ldb_modules/samldb.c | 3 +--
source4/dsdb/samdb/ldb_modules/subtree_rename.c | 2 +-
6 files changed, 10 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ldb/common/ldb.c b/lib/ldb/common/ldb.c
index cd6172a..a223b87 100644
--- a/lib/ldb/common/ldb.c
+++ b/lib/ldb/common/ldb.c
@@ -1069,7 +1069,7 @@ int ldb_modify_default_callback(struct ldb_request *req,
struct ldb_reply *ares)
return ldb_request_done(req, LDB_SUCCESS);
default:
talloc_free(ares);
- ldb_set_errstring(req->handle->ldb, "Invalid reply type!");
+ ldb_asprintf_errstring(req->handle->ldb, "Invalid LDB reply
type %d", ares->type);
return ldb_request_done(req, LDB_ERR_OPERATIONS_ERROR);
}
@@ -1093,7 +1093,7 @@ int ldb_op_default_callback(struct ldb_request *req,
struct ldb_reply *ares)
if (ares->type != LDB_REPLY_DONE) {
talloc_free(ares);
- ldb_set_errstring(req->handle->ldb, "Invalid reply type!");
+ ldb_asprintf_errstring(req->handle->ldb, "Invalid LDB reply
type %d", ares->type);
return ldb_request_done(req, LDB_ERR_OPERATIONS_ERROR);
}
@@ -1399,7 +1399,7 @@ int ldb_extended_default_callback(struct ldb_request *req,
}
talloc_free(ares);
- ldb_set_errstring(req->handle->ldb, "Invalid reply type!");
+ ldb_asprintf_errstring(req->handle->ldb, "Invalid LDB reply type %d",
ares->type);
return ldb_request_done(req, LDB_ERR_OPERATIONS_ERROR);
}
diff --git a/lib/ldb/ldb_map/ldb_map_inbound.c
b/lib/ldb/ldb_map/ldb_map_inbound.c
index b610372..38dd5ac 100644
--- a/lib/ldb/ldb_map/ldb_map_inbound.c
+++ b/lib/ldb/ldb_map/ldb_map_inbound.c
@@ -309,7 +309,7 @@ static int map_op_local_callback(struct ldb_request *req,
}
if (ares->type != LDB_REPLY_DONE) {
- ldb_set_errstring(ldb, "Invalid reply type!");
+ ldb_asprintf_errstring(ldb, "Invalid LDB reply type %d",
ares->type);
return ldb_module_done(ac->req, NULL, NULL,
LDB_ERR_OPERATIONS_ERROR);
}
@@ -343,7 +343,7 @@ static int map_op_remote_callback(struct ldb_request *req,
}
if (ares->type != LDB_REPLY_DONE) {
- ldb_set_errstring(ldb, "Invalid reply type!");
+ ldb_asprintf_errstring(ldb, "Invalid LDB reply type %d",
ares->type);
return ldb_module_done(ac->req, NULL, NULL,
LDB_ERR_OPERATIONS_ERROR);
}
@@ -802,7 +802,7 @@ static int map_rename_local_callback(struct ldb_request
*req,
}
if (ares->type != LDB_REPLY_DONE) {
- ldb_set_errstring(ldb, "Invalid reply type!");
+ ldb_asprintf_errstring(ldb, "Invalid LDB reply type %d",
ares->type);
return ldb_module_done(ac->req, NULL, NULL,
LDB_ERR_OPERATIONS_ERROR);
}
diff --git a/source4/dsdb/samdb/ldb_modules/new_partition.c
b/source4/dsdb/samdb/ldb_modules/new_partition.c
index 3f730f9..eaf7d43 100644
--- a/source4/dsdb/samdb/ldb_modules/new_partition.c
+++ b/source4/dsdb/samdb/ldb_modules/new_partition.c
@@ -65,7 +65,7 @@ static int np_part_mod_callback(struct ldb_request *req,
struct ldb_reply *ares)
}
if (ares->type != LDB_REPLY_DONE) {
- ldb_set_errstring(ldb, "Invalid reply type!");
+ ldb_asprintf_errstring(ldb, "Invalid LDB reply type %d",
ares->type);
return ldb_module_done(ac->req, NULL, NULL,
LDB_ERR_OPERATIONS_ERROR);
}
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 2be0760..b3126c3 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -3983,7 +3983,7 @@ static int
replmd_replicated_uptodate_modify_callback(struct ldb_request *req,
}
if (ares->type != LDB_REPLY_DONE) {
- ldb_set_errstring(ldb, "Invalid reply type\n!");
+ ldb_asprintf_errstring(ldb, "Invalid LDB reply type %d",
ares->type);
return ldb_module_done(ar->req, NULL, NULL,
LDB_ERR_OPERATIONS_ERROR);
}
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c
b/source4/dsdb/samdb/ldb_modules/samldb.c
index e0400fa..6c14520 100644
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -517,8 +517,7 @@ static int samldb_add_entry_callback(struct ldb_request
*req,
ares->response, ares->error);
}
if (ares->type != LDB_REPLY_DONE) {
- ldb_set_errstring(ldb,
- "Invalid reply type!\n");
+ ldb_asprintf_errstring(ldb, "Invalid LDB reply type %d",
ares->type);
return ldb_module_done(ac->req, NULL, NULL,
LDB_ERR_OPERATIONS_ERROR);
}
diff --git a/source4/dsdb/samdb/ldb_modules/subtree_rename.c
b/source4/dsdb/samdb/ldb_modules/subtree_rename.c
index a4714ac..2b13e55 100644
--- a/source4/dsdb/samdb/ldb_modules/subtree_rename.c
+++ b/source4/dsdb/samdb/ldb_modules/subtree_rename.c
@@ -95,7 +95,7 @@ static int subtree_rename_callback(struct ldb_request *req,
}
if (ares->type != LDB_REPLY_DONE) {
- ldb_set_errstring(ldb, "Invalid reply type!\n");
+ ldb_asprintf_errstring(ldb, "Invalid LDB reply type %d",
ares->type);
return ldb_module_done(ac->req, NULL, NULL,
LDB_ERR_OPERATIONS_ERROR);
}
--
Samba Shared Repository
