|
1 https://bugzilla.samba.org/show_bug.cgi?id=10487 |
|
2 Common synopsis: Samba Winbind GETGRENT interface fails when any trusted domain is not available |
|
3 Bugs 16298670, 18191913 |
|
4 |
|
5 --- a/nsswitch/wb_common.c 2014-02-07 17:26:50.046234000 +0100 |
|
6 +++ b/nsswitch/wb_common.c 2014-02-07 17:33:40.280002000 +0100 |
|
7 @@ -462,7 +462,7 @@ |
|
8 |
|
9 if (ret == 0) { |
|
10 /* Not ready for read yet... */ |
|
11 - if (total_time >= 30) { |
|
12 + if (total_time >= 1000) { |
|
13 /* Timeout */ |
|
14 winbind_close_sock(); |
|
15 return -1; |
|
16 --- a/source3/winbindd/wb_next_grent.c 2014-02-07 17:27:14.079647000 +0100 |
|
17 +++ b/source3/winbindd/wb_next_grent.c 2014-02-07 17:58:36.599520000 +0100 |
|
18 @@ -103,18 +103,16 @@ |
|
19 TALLOC_FREE(subreq); |
|
20 if (tevent_req_nterror(req, status)) { |
|
21 /* Ignore errors here, just log it */ |
|
22 - DEBUG(10, ("query_user_list for domain %s returned %s\n", |
|
23 + DEBUG(3, ("query_user_list for domain %s returned: %s\n", |
|
24 state->gstate->domain->name, |
|
25 nt_errstr(status))); |
|
26 - return; |
|
27 } |
|
28 if (!NT_STATUS_IS_OK(result)) { |
|
29 /* Ignore errors here, just log it */ |
|
30 - DEBUG(10, ("query_user_list for domain %s returned %s/%s\n", |
|
31 + DEBUG(1, ("query_user_list for domain %s failed with: %s/%s\n", |
|
32 state->gstate->domain->name, |
|
33 nt_errstr(status), nt_errstr(result))); |
|
34 - tevent_req_nterror(req, result); |
|
35 - return; |
|
36 + state->gstate->num_groups = 0; |
|
37 } |
|
38 |
|
39 state->gstate->num_groups = state->next_groups.num_principals; |