[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  3390d99 s3-winbind: DON'T PANIC if we couldn't find the domain.
      from  4def1c1 file_server: Remove explicit set of passdb backend in fileserver.conf

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


- Log -----------------------------------------------------------------
commit 3390d9902a4e0b74e3437594f9f20d621b18305b
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Sep 4 14:30:38 2012 +0200

    s3-winbind: DON'T PANIC if we couldn't find the domain.
    
    If we don't have a connection to a trusted domain but still try to do a
    lookup we shouldn't segfault.
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Tue Sep  4 18:16:06 CEST 2012 on sn-devel-104

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

Summary of changes:
 source3/winbindd/winbindd_group.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_group.c b/source3/winbindd/winbindd_group.c
index 2f8ba6a..ae461bf 100644
--- a/source3/winbindd/winbindd_group.c
+++ b/source3/winbindd/winbindd_group.c
@@ -35,9 +35,17 @@ bool fill_grent(TALLOC_CTX *mem_ctx, struct winbindd_gr *gr,
 {
 	fstring full_group_name;
 	char *mapped_name = NULL;
-	struct winbindd_domain *domain = find_domain_from_name_noinit(dom_name);
+	struct winbindd_domain *domain;
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
 
+	domain = find_domain_from_name_noinit(dom_name);
+	if (domain == NULL) {
+		DEBUG(0, ("Failed to find domain '%s'. "
+			  "Check connection to trusted domains!\n",
+			  dom_name));
+		return false;
+	}
+
 	nt_status = normalize_name_map(mem_ctx, domain, gr_name,
 				       &mapped_name);
 


-- 
Samba Shared Repository