diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2004-01-06 00:27:34 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2004-01-06 00:27:34 +0000 |
| commit | 523a4ddd5fb851d86b50238ca4d22b98c2159c50 (patch) | |
| tree | e60f26488ff311677a85209f9da2a6e129e8f6ec /source3/nsswitch/winbindd_ads.c | |
| parent | eb1aa6a2cc0331cbbbc5ea466e5695e4df39e6ee (diff) | |
| download | samba-523a4ddd5fb851d86b50238ca4d22b98c2159c50.tar.gz samba-523a4ddd5fb851d86b50238ca4d22b98c2159c50.tar.bz2 samba-523a4ddd5fb851d86b50238ca4d22b98c2159c50.zip | |
(merge from 3.0)
Try to keep vl happy - shorten some of these lines.
--
Grumble... grumble... fix the build...
--
Show the sid type in name->sid translatons in a way that can be easily
understood by humans.
Andrew Bartlett
(This used to be commit c5d1e2112baa7d87cd6b9f0855c2fd8b006af01d)
Diffstat (limited to 'source3/nsswitch/winbindd_ads.c')
| -rw-r--r-- | source3/nsswitch/winbindd_ads.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/source3/nsswitch/winbindd_ads.c b/source3/nsswitch/winbindd_ads.c index 889f63a42c..f8582aee99 100644 --- a/source3/nsswitch/winbindd_ads.c +++ b/source3/nsswitch/winbindd_ads.c @@ -598,18 +598,21 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain, rc = ads_search_retry_dn(ads, (void**)&msg, user_dn, attrs); if (!ADS_ERR_OK(rc)) { status = ads_ntstatus(rc); - DEBUG(1,("lookup_usergroups(sid=%s) ads_search tokenGroups: %s\n", sid_to_string(sid_string, sid), ads_errstr(rc))); + DEBUG(1,("lookup_usergroups(sid=%s) ads_search tokenGroups: %s\n", + sid_to_string(sid_string, sid), ads_errstr(rc))); goto done; } if (!msg) { - DEBUG(1,("lookup_usergroups(sid=%s) ads_search tokenGroups: NULL msg\n", sid_to_string(sid_string, sid))); + DEBUG(1,("lookup_usergroups(sid=%s) ads_search tokenGroups: NULL msg\n", + sid_to_string(sid_string, sid))); status = NT_STATUS_UNSUCCESSFUL; goto done; } if (!ads_pull_uint32(ads, msg, "primaryGroupID", &primary_group_rid)) { - DEBUG(1,("%s: No primary group for sid=%s !?\n", domain->name, sid_to_string(sid_string, sid))); + DEBUG(1,("%s: No primary group for sid=%s !?\n", + domain->name, sid_to_string(sid_string, sid))); goto done; } @@ -677,7 +680,8 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain, uint32 current_usn; int num_retries = 0; - DEBUG(10,("ads: lookup_groupmem %s sid=%s\n", domain->name, sid_string_static(group_sid))); + DEBUG(10,("ads: lookup_groupmem %s sid=%s\n", domain->name, + sid_string_static(group_sid))); *num_names = 0; @@ -738,13 +742,15 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain, } if (first_usn != current_usn) { - DEBUG(5, ("ads: lookup_groupmem USN on this record changed - restarting search\n")); + DEBUG(5, ("ads: lookup_groupmem USN on this record changed" + " - restarting search\n")); if (num_retries < 5) { num_retries++; num_members = 0; continue; } else { - DEBUG(5, ("ads: lookup_groupmem USN on this record changed - restarted search too many times, aborting!\n")); + DEBUG(5, ("ads: lookup_groupmem USN on this record changed" + " - restarted search too many times, aborting!\n")); status = NT_STATUS_UNSUCCESSFUL; goto done; } @@ -858,7 +864,8 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain, } if ( NT_STATUS_IS_OK(result) ) - result = cli_ds_enum_domain_trusts( cli, mem_ctx, cli->desthost, flags, &domains, (unsigned int *)&count ); + result = cli_ds_enum_domain_trusts( cli, mem_ctx, cli->desthost, + flags, &domains, (unsigned int *)&count ); if ( NT_STATUS_IS_OK(result) && count) { |