[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  d783697 wintest: Try harder to make wintest force the telnet server to start
       via  7db0def ldapsrv: Pass struct ldb_result * rather than void *
      from  1b7f387 docs: Add gpfs:recalls parameter to vfs_gpfs manpage

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


- Log -----------------------------------------------------------------
commit d78369789afa178b4fc64dec3e32f72cb2eb0483
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Oct 30 10:21:00 2013 +1300

    wintest: Try harder to make wintest force the telnet server to start
    
    We try and force the server to start, and we try to force the
    TelnetClients group to exist
    
    Change-Id: I192f0aaaf283b77065ecc671ca2b59a69781d744
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-on: https://gerrit.samba.org/36
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Fri Mar 14 14:51:20 CET 2014 on sn-devel-104

commit 7db0defdd2f7ed39bda6c1ebc2110b83b82f1adc
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Dec 2 15:47:42 2013 +1300

    ldapsrv: Pass struct ldb_result * rather than void *
    
    Change-Id: Ic521cbfcf922cfe9e14c89116c097b777a86af40
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-on: https://gerrit.samba.org/35
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

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

Summary of changes:
 source4/ldap_server/ldap_backend.c |   16 ++++++++--------
 wintest/wintest.py                 |   11 +++++++++++
 2 files changed, 19 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c
index 3432594..b0877d2 100644
--- a/source4/ldap_server/ldap_backend.c
+++ b/source4/ldap_server/ldap_backend.c
@@ -285,7 +285,7 @@ static NTSTATUS ldapsrv_unwilling(struct ldapsrv_call *call, int error)
 static int ldapsrv_add_with_controls(struct ldapsrv_call *call,
 				     const struct ldb_message *message,
 				     struct ldb_control **controls,
-				     void *context)
+				     struct ldb_result *res)
 {
 	struct ldb_context *ldb = call->conn->ldb;
 	struct ldb_request *req;
@@ -299,7 +299,7 @@ static int ldapsrv_add_with_controls(struct ldapsrv_call *call,
 	ret = ldb_build_add_req(&req, ldb, ldb,
 					message,
 					controls,
-					context,
+					res,
 					ldb_modify_default_callback,
 					NULL);
 
@@ -341,7 +341,7 @@ static int ldapsrv_add_with_controls(struct ldapsrv_call *call,
 static int ldapsrv_mod_with_controls(struct ldapsrv_call *call,
 				     const struct ldb_message *message,
 				     struct ldb_control **controls,
-				     void *context)
+				     struct ldb_result *res)
 {
 	struct ldb_context *ldb = call->conn->ldb;
 	struct ldb_request *req;
@@ -355,7 +355,7 @@ static int ldapsrv_mod_with_controls(struct ldapsrv_call *call,
 	ret = ldb_build_mod_req(&req, ldb, ldb,
 					message,
 					controls,
-					context,
+					res,
 					ldb_modify_default_callback,
 					NULL);
 
@@ -399,7 +399,7 @@ static int ldapsrv_mod_with_controls(struct ldapsrv_call *call,
 static int ldapsrv_del_with_controls(struct ldapsrv_call *call,
 				     struct ldb_dn *dn,
 				     struct ldb_control **controls,
-				     void *context)
+				     struct ldb_result *res)
 {
 	struct ldb_context *ldb = call->conn->ldb;
 	struct ldb_request *req;
@@ -408,7 +408,7 @@ static int ldapsrv_del_with_controls(struct ldapsrv_call *call,
 	ret = ldb_build_del_req(&req, ldb, ldb,
 					dn,
 					controls,
-					context,
+					res,
 					ldb_modify_default_callback,
 					NULL);
 
@@ -450,7 +450,7 @@ static int ldapsrv_rename_with_controls(struct ldapsrv_call *call,
 					struct ldb_dn *olddn,
 					struct ldb_dn *newdn,
 					struct ldb_control **controls,
-					void *context)
+					struct ldb_result *res)
 {
 	struct ldb_context *ldb = call->conn->ldb;
 	struct ldb_request *req;
@@ -460,7 +460,7 @@ static int ldapsrv_rename_with_controls(struct ldapsrv_call *call,
 					olddn,
 					newdn,
 					NULL,
-					context,
+					res,
 					ldb_modify_default_callback,
 					NULL);
 
diff --git a/wintest/wintest.py b/wintest/wintest.py
index 61664ae..3493df4 100644
--- a/wintest/wintest.py
+++ b/wintest/wintest.py
@@ -679,6 +679,7 @@ options {
         set_route = False
         set_dns = False
         set_telnetclients = True
+        start_telnet = True
         if self.getvar('WIN_IP'):
             ip = self.getvar('WIN_IP')
         else:
@@ -711,6 +712,7 @@ options {
                               pexpect.EOF])
             if i == 1:
                 if set_telnetclients:
+                    self.run_cmd('bin/net rpc group add TelnetClients -S $WIN_IP -U$WIN_USER%$WIN_PASS')
                     self.run_cmd('bin/net rpc group addmem TelnetClients "authenticated users" -S $WIN_IP -U$WIN_USER%$WIN_PASS')
                     child.close()
                     retries -= 1
@@ -720,6 +722,15 @@ options {
                 else:
                     raise RuntimeError("Failed to connect with telnet due to missing TelnetClients membership")
 
+            if i == 6:
+                # This only works if it is installed and enabled, but not started.  Not entirely likely, but possible
+                self.run_cmd('bin/net rpc service start TlntSvr -S $WIN_IP -U$WIN_USER%$WIN_PASS')
+                child.close()
+                start_telnet = False
+                retries -= 1
+                self.info("retrying (retries=%u delay=%u)" % (retries, delay))
+                continue
+
             if i != 0:
                 child.close()
                 time.sleep(delay)


-- 
Samba Shared Repository