[SCM] Samba Shared Repository - branch master updated

[Kamen Mazdrashki]

The branch, master has been updated
       via  29732b0 s4-tests/env_loadparm: Throw KeyError in case SMB_CONF_PATH
       via  6214dbd s4-ldap: Pass on-wire transmitted control down the chain
      from  2845e1c s3: modules: Fix *allocate* calls to follow POSIX error return convention.

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


- Log -----------------------------------------------------------------
commit 29732b0d427472041bf3a586f3eeb281ccd408d5
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Tue Dec 2 05:04:40 2014 +0100

    s4-tests/env_loadparm: Throw KeyError in case SMB_CONF_PATH
    
    A bit more specific for the caller to "know" that env key is missing
    
    Change-Id: I4d4c2121af868d79f46f865f420336222bc67347
    Signed-off-by: Kamen Mazdrashki <kamenim at samba.org>
    Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
    
    Autobuild-User(master): Kamen Mazdrashki <kamenim at samba.org>
    Autobuild-Date(master): Mon Dec  8 05:27:34 CET 2014 on sn-devel-104

commit 6214dbd5741e1e3e0e02b7e8eb42a76168a44192
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Tue Dec 2 01:53:18 2014 +0100

    s4-ldap: Pass on-wire transmitted control down the chain
    
    Change-Id: Ic3a117f74e8a67c45584fdb520d92e4f0cb01c5e
    Signed-off-by: Kamen Mazdrashki <kamenim at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

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

Summary of changes:
 python/samba/tests/__init__.py     | 2 +-
 source4/ldap_server/ldap_backend.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/tests/__init__.py b/python/samba/tests/__init__.py
index 8e662ed..cca82bb 100644
--- a/python/samba/tests/__init__.py
+++ b/python/samba/tests/__init__.py
@@ -91,7 +91,7 @@ def env_loadparm():
     try:
         lp.load(os.environ["SMB_CONF_PATH"])
     except KeyError:
-        raise Exception("SMB_CONF_PATH not set")
+        raise KeyError("SMB_CONF_PATH not set")
     return lp
 
 
diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c
index b0877d2..fd2b579 100644
--- a/source4/ldap_server/ldap_backend.c
+++ b/source4/ldap_server/ldap_backend.c
@@ -459,7 +459,7 @@ static int ldapsrv_rename_with_controls(struct ldapsrv_call *call,
 	ret = ldb_build_rename_req(&req, ldb, ldb,
 					olddn,
 					newdn,
-					NULL,
+					controls,
 					res,
 					ldb_modify_default_callback,
 					NULL);


-- 
Samba Shared Repository