The branch, v3-6-test has been updated
via 7ec71c2 s3-winbind: DON'T PANIC if we couldn't find the domain.
from 1bb5d20 Fix bug #9124 - Samba fails to set "inherited" bit on
inherited ACE's.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 7ec71c28e9153164d222966a3753333f1804c8c7
Author: Andreas Schneider <a...@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.
Signed-off-by: Andreas Schneider <a...@samba.org>
Fix bug #9135 - Don't segfault if we don't find a domain in
resolve_username_to_alias()/fill_grent() .
-----------------------------------------------------------------------
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 9cc1d14..8662a9c 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
