From 4fa28af91db993e3d7d2996287dba97247b87e55 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 2 Aug 2009 22:28:49 +0200 Subject: Fix some nonempty blank lines --- source3/winbindd/winbindd_ads.c | 56 +++++++++++++++++++-------------------- source3/winbindd/winbindd_creds.c | 14 +++++----- source3/winbindd/winbindd_rpc.c | 42 ++++++++++++++--------------- 3 files changed, 56 insertions(+), 56 deletions(-) (limited to 'source3/winbindd') diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c index 137a88505c..50985ccdda 100644 --- a/source3/winbindd/winbindd_ads.c +++ b/source3/winbindd/winbindd_ads.c @@ -6,17 +6,17 @@ Copyright (C) Andrew Tridgell 2001 Copyright (C) Andrew Bartlett 2003 Copyright (C) Gerald (Jerry) Carter 2004 - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -174,7 +174,7 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain, } ads = ads_cached_connection(domain); - + if (!ads) { domain->last_status = NT_STATUS_SERVER_DISABLED; goto done; @@ -226,7 +226,7 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain, if (gecos == NULL) { gecos = ads_pull_string(ads, mem_ctx, msg, "name"); } - + if (!ads_pull_sid(ads, msg, "objectSid", &(*info)[i].user_sid)) { DEBUG(1,("No sid for %s !?\n", name)); @@ -343,7 +343,7 @@ static NTSTATUS enum_dom_groups(struct winbindd_domain *domain, } i = 0; - + for (msg = ads_first_entry(ads, res); msg; msg = ads_next_entry(ads, msg)) { char *name, *gecos; DOM_SID sid; @@ -397,7 +397,7 @@ static NTSTATUS enum_local_groups(struct winbindd_domain *domain, * to be split out */ *num_entries = 0; - + return NT_STATUS_OK; } @@ -471,25 +471,25 @@ static NTSTATUS query_user(struct winbindd_domain *domain, info->primary_gid = (gid_t)-1; /* try netsamlogon cache first */ - + if ( (user = netsamlogon_cache_get( mem_ctx, sid )) != NULL ) { - + DEBUG(5,("query_user: Cache lookup succeeded for %s\n", sid_string_dbg(sid))); sid_compose(&info->user_sid, &domain->sid, user->base.rid); sid_compose(&info->group_sid, &domain->sid, user->base.primary_gid); - + info->acct_name = talloc_strdup(mem_ctx, user->base.account_name.string); info->full_name = talloc_strdup(mem_ctx, user->base.full_name.string); - + nss_get_info_cached( domain, sid, mem_ctx, NULL, NULL, &info->homedir, &info->shell, &info->full_name, &info->primary_gid ); TALLOC_FREE(user); - + return NT_STATUS_OK; } @@ -628,14 +628,14 @@ static NTSTATUS lookup_usergroups_member(struct winbindd_domain *domain, TALLOC_FREE(escaped_dn); rc = ads_search_retry(ads, &res, ldap_exp, group_attrs); - + if (!ADS_ERR_OK(rc) || !res) { DEBUG(1,("lookup_usergroups ads_search member=%s: %s\n", user_dn, ads_errstr(rc))); return ads_ntstatus(rc); } - + count = ads_count_replies(ads, res); - + *user_sids = NULL; num_groups = 0; @@ -650,12 +650,12 @@ static NTSTATUS lookup_usergroups_member(struct winbindd_domain *domain, for (msg = ads_first_entry(ads, res); msg; msg = ads_next_entry(ads, msg)) { DOM_SID group_sid; - + if (!ads_pull_sid(ads, msg, "objectSid", &group_sid)) { DEBUG(1,("No sid for this group ?!?\n")); continue; } - + /* ignore Builtin groups from ADS - Guenther */ if (sid_check_is_in_builtin(&group_sid)) { continue; @@ -833,7 +833,7 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain, } ads = ads_cached_connection(domain); - + if (!ads) { domain->last_status = NT_STATUS_SERVER_DISABLED; status = NT_STATUS_SERVER_DISABLED; @@ -848,7 +848,7 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain, "%s\n", sid_string_dbg(sid), ads_errstr(rc))); goto done; } - + count = ads_count_replies(ads, msg); if (count != 1) { status = NT_STATUS_UNSUCCESSFUL; @@ -891,7 +891,7 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain, if (count == 0) { /* no tokenGroups */ - + /* lookup what groups this user is a member of by DN search on * "memberOf" */ @@ -921,7 +921,7 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain, if (!NT_STATUS_IS_OK(status)) { goto done; } - + for (i=0;ilast_status = NT_STATUS_SERVER_DISABLED; return NT_STATUS_UNSUCCESSFUL; } rc = ads_USN(ads, seq); - + if (!ADS_ERR_OK(rc)) { - + /* its a dead connection, destroy it */ if (domain->private_data) { @@ -1279,7 +1279,7 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain, struct rpc_pipe_client *cli; uint32 fr_flags = (NETR_TRUST_FLAG_IN_FOREST | NETR_TRUST_FLAG_TREEROOT); int ret_count; - + DEBUG(3,("ads: trusted_domains\n")); *num_domains = 0; @@ -1340,7 +1340,7 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain, ret_count = 0; for (i = 0; i < trusts.count; i++) { struct winbindd_domain d; - + ZERO_STRUCT(d); /* drop external trusts if this is not our primary @@ -1356,7 +1356,7 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain, trusts.array[i].netbios_name)); continue; } - + (*names)[ret_count] = CONST_DISCARD(char *, trusts.array[i].netbios_name); (*alt_names)[ret_count] = CONST_DISCARD(char *, trusts.array[i].dns_name); if (trusts.array[i].sid) { @@ -1436,7 +1436,7 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain, d.domain_trust_attribs = domain->domain_trust_attribs; } TALLOC_FREE(parent); - + wcache_tdc_add_domain( &d ); ret_count++; } diff --git a/source3/winbindd/winbindd_creds.c b/source3/winbindd/winbindd_creds.c index 2f64f8b689..98a16ee937 100644 --- a/source3/winbindd/winbindd_creds.c +++ b/source3/winbindd/winbindd_creds.c @@ -65,23 +65,23 @@ NTSTATUS winbindd_store_creds(struct winbindd_domain *domain, DOM_SID cred_sid; if (info3 != NULL) { - + DOM_SID sid; sid_copy(&sid, info3->base.domain_sid); sid_append_rid(&sid, info3->base.rid); sid_copy(&cred_sid, &sid); info3->base.user_flags |= NETLOGON_CACHED_ACCOUNT; - + } else if (user_sid != NULL) { - + sid_copy(&cred_sid, user_sid); - + } else if (user != NULL) { - + /* do lookup ourself */ enum lsa_SidType type; - + if (!lookup_cached_name(mem_ctx, domain->name, user, @@ -92,7 +92,7 @@ NTSTATUS winbindd_store_creds(struct winbindd_domain *domain, } else { return NT_STATUS_INVALID_PARAMETER; } - + if (pass) { int count = 0; diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c index 17ffffe5da..037fae09c6 100644 --- a/source3/winbindd/winbindd_rpc.c +++ b/source3/winbindd/winbindd_rpc.c @@ -7,17 +7,17 @@ Copyright (C) Andrew Tridgell 2001 Copyright (C) Volker Lendecke 2005 Copyright (C) Guenther Deschner 2008 (pidl conversion) - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -106,7 +106,7 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain, (*info)[i].homedir = NULL; (*info)[i].shell = NULL; sid_compose(&(*info)[i].user_sid, &domain->sid, rid); - + /* For the moment we set the primary group for every user to be the Domain Users group. There are serious problems with determining @@ -114,7 +114,7 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain, This should really be made into a 'winbind force group' smb.conf parameter or something like that. */ - + sid_compose(&(*info)[i].group_sid, &domain->sid, DOMAIN_GROUP_RID_USERS); } @@ -316,7 +316,7 @@ static NTSTATUS msrpc_name_to_sid(struct winbindd_domain *domain, result = rpccli_lsa_lookup_names(cli, mem_ctx, &lsa_policy, 1, (const char**) &full_name, NULL, 1, &sids, &types); - + if (!NT_STATUS_IS_OK(result)) return result; @@ -356,7 +356,7 @@ static NTSTATUS msrpc_sid_to_name(struct winbindd_domain *domain, nt_errstr(result))); return result; } - + result = rpccli_lsa_lookup_sids(cli, mem_ctx, &lsa_policy, 1, sid, &domains, &names, &types); @@ -471,53 +471,53 @@ static NTSTATUS query_user(struct winbindd_domain *domain, if (!sid_peek_check_rid(&domain->sid, user_sid, &user_rid)) return NT_STATUS_UNSUCCESSFUL; - + user_info->homedir = NULL; user_info->shell = NULL; user_info->primary_gid = (gid_t)-1; - + /* try netsamlogon cache first */ - + if ( (user = netsamlogon_cache_get( mem_ctx, user_sid )) != NULL ) { - + DEBUG(5,("query_user: Cache lookup succeeded for %s\n", sid_string_dbg(user_sid))); sid_compose(&user_info->user_sid, &domain->sid, user->base.rid); sid_compose(&user_info->group_sid, &domain->sid, user->base.primary_gid); - + user_info->acct_name = talloc_strdup(mem_ctx, user->base.account_name.string); user_info->full_name = talloc_strdup(mem_ctx, user->base.full_name.string); - + TALLOC_FREE(user); - + return NT_STATUS_OK; } - + if ( !winbindd_can_contact_domain( domain ) ) { DEBUG(10,("query_user: No incoming trust for domain %s\n", domain->name)); return NT_STATUS_OK; } - + if ( !winbindd_can_contact_domain( domain ) ) { DEBUG(10,("query_user: No incoming trust for domain %s\n", domain->name)); return NT_STATUS_OK; } - + if ( !winbindd_can_contact_domain( domain ) ) { DEBUG(10,("query_user: No incoming trust for domain %s\n", domain->name)); return NT_STATUS_OK; } - + /* no cache; hit the wire */ - + result = cm_connect_sam(domain, mem_ctx, &cli, &dom_pol); if (!NT_STATUS_IS_OK(result)) return result; @@ -597,7 +597,7 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain, } /* no cache; hit the wire */ - + result = cm_connect_sam(domain, mem_ctx, &cli, &dom_pol); if (!NT_STATUS_IS_OK(result)) return result; @@ -824,7 +824,7 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain, for (j=0;j<(*num_names);j++) sid_compose(&(*sid_mem)[j], &domain->sid, rid_mem[j]); - + if (*num_names>0 && (!*names || !*name_types)) return NT_STATUS_NO_MEMORY; -- cgit