[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  8421b9a s3: Protect tldap_errstr against a NULL ld (cherry picked from commit e99d1de3c4fe3c1ff678270f51ef7e6d3812e878)
       via  0c4bcb8 s3: Improve a debug message, we have more than pdb_tdb.
       via  82422b9 smbtorture Remove random file name before we start RW2 (cherry picked from commit b73cfabdf5cc28a91a72df8b64cf57021e08f0b0)
       via  9817213 s3: Fix a typo (cherry picked from commit c85607d8ecd97c242662ca391e24269df1686fb8)
      from  8353150 Torture test added to run_opentest() to ensure we don't regress on the previous change. (cherry picked from commit ed9861cad6576861953a10706af818f38e7955bd)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 8421b9a25f4d3d573e3242215d36c5db906c211c
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Feb 20 15:08:41 2011 +0100

    s3: Protect tldap_errstr against a NULL ld
    (cherry picked from commit e99d1de3c4fe3c1ff678270f51ef7e6d3812e878)

commit 0c4bcb8fdd25c7f7a3b6c9efd6b11476b1c7bec4
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Feb 20 15:20:26 2011 +0100

    s3: Improve a debug message, we have more than pdb_tdb.
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Sun Feb 20 16:50:05 CET 2011 on sn-devel-104
    (cherry picked from commit b85a323d02c69beffc9e20fc2164930cc5e91234)

commit 82422b9e978e20ad480a27cd7139b539f4899608
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Feb 22 11:21:53 2011 +1100

    smbtorture Remove random file name before we start RW2
    (cherry picked from commit b73cfabdf5cc28a91a72df8b64cf57021e08f0b0)

commit 98172133e395a75482ce4843632e79ab692cb0b6
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Feb 21 12:45:14 2011 +0100

    s3: Fix a typo
    (cherry picked from commit c85607d8ecd97c242662ca391e24269df1686fb8)

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

Summary of changes:
 source3/groupdb/mapping.c   |    2 +-
 source3/lib/tldap_util.c    |    4 +++-
 source3/printing/printing.c |    2 +-
 source3/torture/torture.c   |    4 ++++
 4 files changed, 9 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c
index 837f84a..d76e344 100644
--- a/source3/groupdb/mapping.c
+++ b/source3/groupdb/mapping.c
@@ -138,7 +138,7 @@ bool get_domain_group_from_sid(struct dom_sid sid, GROUP_MAP *map)
 		return False;
 	}
 
-	DEBUG(10, ("get_domain_group_from_sid: SID found in the TDB\n"));
+	DEBUG(10, ("get_domain_group_from_sid: SID found in passdb\n"));
 
 	/* if it's not a domain group, continue */
 	if (map->sid_name_use!=SID_NAME_DOM_GRP) {
diff --git a/source3/lib/tldap_util.c b/source3/lib/tldap_util.c
index 7f1e916..d8aa53a 100644
--- a/source3/lib/tldap_util.c
+++ b/source3/lib/tldap_util.c
@@ -332,7 +332,9 @@ const char *tldap_errstr(TALLOC_CTX *mem_ctx, struct tldap_context *ld, int rc)
 	const char *ld_error = NULL;
 	char *res;
 
-	ld_error = tldap_msg_diagnosticmessage(tldap_ctx_lastmsg(ld));
+	if (ld != NULL) {
+		ld_error = tldap_msg_diagnosticmessage(tldap_ctx_lastmsg(ld));
+	}
 	res = talloc_asprintf(mem_ctx, "LDAP error %d (%s), %s", rc,
 			      tldap_err2string(rc),
 			      ld_error ? ld_error : "unknown");
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 1c2817d..ee0a100 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -1306,7 +1306,7 @@ done:
 }
 
 /****************************************************************************
- main work for updating the lpq cahe for a printer queue
+ main work for updating the lpq cache for a printer queue
 ****************************************************************************/
 
 static void print_queue_update_internal( struct tevent_context *ev,
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 73b75bb..2670485 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -677,6 +677,10 @@ static bool rw_torture3(struct cli_state *c, char *lockfname)
 
 	if (procnum == 0)
 	{
+		if (!NT_STATUS_IS_OK(cli_unlink(c, lockfname, aSYSTEM | aHIDDEN))) {
+			printf("unlink failed (%s) (normal, this file should not exist)\n", cli_errstr(c));
+		}
+
 		if (!NT_STATUS_IS_OK(cli_open(c, lockfname, O_RDWR | O_CREAT | O_EXCL, 
 				 DENY_NONE, &fnum))) {
 			printf("first open read/write of %s failed (%s)\n",


-- 
Samba Shared Repository