[SCM] Samba Shared Repository - branch master updated

[Amitay Isaacs]

The branch, master has been updated
       via  3a0f7b8 ldb: Add handy macros for reporting error inside ldb module
       via  3bb5af5 s4-dsdb: Remove unsed variable
      from  8a4c8e3 s3-smbldap: move ldap_open_with_timeout out of smb_ldap.h to ads where it lives.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3a0f7b89d551a739d886396d320309f8e7d04372
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Tue Nov 15 12:34:40 2011 +1100

    ldb: Add handy macros for reporting error inside ldb module
    
    Pair-Programmed-With: Andrew Tridgell <tridge at samba.org>
    
    Autobuild-User: Amitay Isaacs <amitay at samba.org>
    Autobuild-Date: Thu Nov 17 05:24:46 CET 2011 on sn-devel-104

commit 3bb5af52448fe50f18d76c180d96658b36c78515
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Mon Nov 14 17:34:17 2011 +1100

    s4-dsdb: Remove unsed variable

-----------------------------------------------------------------------

Summary of changes:
 lib/ldb/include/ldb_module.h               |    2 ++
 source4/dsdb/samdb/ldb_modules/partition.c |    2 --
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/ldb/include/ldb_module.h b/lib/ldb/include/ldb_module.h
index 2acd8f3..4ecddc4 100644
--- a/lib/ldb/include/ldb_module.h
+++ b/lib/ldb/include/ldb_module.h
@@ -85,10 +85,12 @@ void ldb_debug_add(struct ldb_context *ldb, const char *fmt, ...) PRINTF_ATTRIBU
 void ldb_debug_end(struct ldb_context *ldb, enum ldb_debug_level level);
 
 #define ldb_error(ldb, ecode, reason) ldb_error_at(ldb, ecode, reason, __FILE__, __LINE__)
+#define ldb_module_error(module, ecode, reason) ldb_error_at(ldb_module_get_ctx(module), ecode, reason, __FILE__, __LINE__)
 
 #define ldb_oom(ldb) ldb_error(ldb, LDB_ERR_OPERATIONS_ERROR, "ldb out of memory")
 #define ldb_module_oom(module) ldb_oom(ldb_module_get_ctx(module))
 #define ldb_operr(ldb) ldb_error(ldb, LDB_ERR_OPERATIONS_ERROR, "operations error")
+#define ldb_module_operr(module) ldb_error(ldb_module_get_ctx(module), LDB_ERR_OPERATIONS_ERROR, "operations error")
 
 /* The following definitions come from lib/ldb/common/ldb.c  */
 
diff --git a/source4/dsdb/samdb/ldb_modules/partition.c b/source4/dsdb/samdb/ldb_modules/partition.c
index 7bf109c..66e2a76 100644
--- a/source4/dsdb/samdb/ldb_modules/partition.c
+++ b/source4/dsdb/samdb/ldb_modules/partition.c
@@ -134,11 +134,9 @@ static int partition_req_callback(struct ldb_request *req,
 	struct ldb_module *module;
 	struct ldb_request *nreq;
 	int ret;
-	struct partition_private_data *data;
 	struct ldb_control *partition_ctrl;
 
 	ac = talloc_get_type(req->context, struct partition_context);
-	data = talloc_get_type(ldb_module_get_private(ac->module), struct partition_private_data);
 
 	if (!ares) {
 		return ldb_module_done(ac->req, NULL, NULL,


-- 
Samba Shared Repository