[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  b85a323 s3: Improve a debug message, we have more than pdb_tdb.
       via  e99d1de s3: Protect tldap_errstr against a NULL ld
      from  ac19b39 s3: Fix return code of pdb_ads_getsamupriv if the user does not exist

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


- Log -----------------------------------------------------------------
commit b85a323d02c69beffc9e20fc2164930cc5e91234
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

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

    s3: Protect tldap_errstr against a NULL ld

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

Summary of changes:
 source3/groupdb/mapping.c |    2 +-
 source3/lib/tldap_util.c  |    4 +++-
 2 files changed, 4 insertions(+), 2 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 b83a1b7..8f7ad88 100644
--- a/source3/lib/tldap_util.c
+++ b/source3/lib/tldap_util.c
@@ -337,7 +337,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");


-- 
Samba Shared Repository