summaryrefslogtreecommitdiff
path: root/source3/winbindd
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-02-26 12:36:19 +0100
committerVolker Lendecke <vl@samba.org>2011-02-27 19:27:44 +0100
commit32731db56f6e99fe5c5febb251a00ad9e194081f (patch)
tree5cd6ea2bef16ba13687fa9ff7de1f33051724e2d /source3/winbindd
parent2c9c8fa036645b8705c281fc5a104373dcee8f27 (diff)
downloadsamba-32731db56f6e99fe5c5febb251a00ad9e194081f.tar.gz
samba-32731db56f6e99fe5c5febb251a00ad9e194081f.tar.bz2
samba-32731db56f6e99fe5c5febb251a00ad9e194081f.zip
s3: Fix some nonempty blank lines
Diffstat (limited to 'source3/winbindd')
-rw-r--r--source3/winbindd/idmap_ad.c16
-rw-r--r--source3/winbindd/idmap_hash/idmap_hash.c4
-rw-r--r--source3/winbindd/idmap_nss.c12
-rw-r--r--source3/winbindd/idmap_tdb.c18
-rw-r--r--source3/winbindd/nss_info_template.c10
5 files changed, 30 insertions, 30 deletions
diff --git a/source3/winbindd/idmap_ad.c b/source3/winbindd/idmap_ad.c
index 32a3e17069..1d09780112 100644
--- a/source3/winbindd/idmap_ad.c
+++ b/source3/winbindd/idmap_ad.c
@@ -192,7 +192,7 @@ static ADS_STATUS ad_idmap_cached_connection(struct idmap_domain *dom)
DEBUG(2,("ad_idmap_cached_connection: Failed to obtain schema details!\n"));
}
}
-
+
return status;
}
@@ -305,7 +305,7 @@ static NTSTATUS idmap_ad_unixids_to_sids(struct idmap_domain *dom, struct id_map
for (i = 0; ids[i]; i++) {
ids[i]->status = ID_UNKNOWN;
}
-
+
/* Only do query if we are online */
if (idmap_is_offline()) {
return NT_STATUS_FILE_IS_OFFLINE;
@@ -348,7 +348,7 @@ again:
(unsigned long)ids[idx]->xid.id);
CHECK_ALLOC_DONE(u_filter);
break;
-
+
case ID_TYPE_GID:
if ( ! g_filter) {
g_filter = talloc_asprintf(memctx, "(&(|"
@@ -557,7 +557,7 @@ again:
")(|",
ATYPE_NORMAL_ACCOUNT, ATYPE_WORKSTATION_TRUST, ATYPE_INTERDOMAIN_TRUST,
ATYPE_SECURITY_GLOBAL_GROUP, ATYPE_SECURITY_LOCAL_GROUP);
-
+
CHECK_ALLOC_DONE(filter);
bidx = idx;
@@ -567,7 +567,7 @@ again:
sidstr = ldap_encode_ndr_dom_sid(talloc_tos(), ids[idx]->sid);
filter = talloc_asprintf_append_buffer(filter, "(objectSid=%s)", sidstr);
-
+
TALLOC_FREE(sidstr);
CHECK_ALLOC_DONE(filter);
}
@@ -700,7 +700,7 @@ static NTSTATUS idmap_ad_close(struct idmap_domain *dom)
}
TALLOC_FREE( ctx->ad_schema );
-
+
return NT_STATUS_OK;
}
@@ -1113,7 +1113,7 @@ static struct idmap_methods ad_methods = {
/* The SFU and RFC2307 NSS plugins share everything but the init
function which sets the intended schema model to use */
-
+
static struct nss_info_methods nss_rfc2307_methods = {
.init = nss_rfc2307_init,
.get_nss_info = nss_ad_get_info,
@@ -1160,7 +1160,7 @@ NTSTATUS idmap_ad_init(void)
if ( !NT_STATUS_IS_OK(status_idmap_ad) )
return status_idmap_ad;
}
-
+
if ( !NT_STATUS_IS_OK( status_nss_rfc2307 ) ) {
status_nss_rfc2307 = smb_register_idmap_nss(SMB_NSS_INFO_INTERFACE_VERSION,
"rfc2307", &nss_rfc2307_methods );
diff --git a/source3/winbindd/idmap_hash/idmap_hash.c b/source3/winbindd/idmap_hash/idmap_hash.c
index c52a90f82b..da5c4e3411 100644
--- a/source3/winbindd/idmap_hash/idmap_hash.c
+++ b/source3/winbindd/idmap_hash/idmap_hash.c
@@ -168,7 +168,7 @@ static NTSTATUS unixids_to_sids(struct idmap_domain *dom,
for (i = 0; ids[i]; i++) {
ids[i]->status = ID_UNKNOWN;
}
-
+
nt_status = be_init(dom, NULL);
BAIL_ON_NTSTATUS_ERROR(nt_status);
@@ -218,7 +218,7 @@ static NTSTATUS sids_to_unixids(struct idmap_domain *dom,
for (i = 0; ids[i]; i++) {
ids[i]->status = ID_UNKNOWN;
}
-
+
nt_status = be_init(dom, NULL);
BAIL_ON_NTSTATUS_ERROR(nt_status);
diff --git a/source3/winbindd/idmap_nss.c b/source3/winbindd/idmap_nss.c
index ac5dd797fa..84404b6344 100644
--- a/source3/winbindd/idmap_nss.c
+++ b/source3/winbindd/idmap_nss.c
@@ -4,17 +4,17 @@
idmap PASSDB backend
Copyright (C) Simo Sorce 2006
-
+
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 <http://www.gnu.org/licenses/>.
*/
@@ -50,7 +50,7 @@ static NTSTATUS idmap_nss_unixids_to_sids(struct idmap_domain *dom, struct id_ma
for (i = 0; ids[i]; i++) {
ids[i]->status = ID_UNKNOWN;
}
-
+
ctx = talloc_new(dom);
if ( ! ctx) {
DEBUG(0, ("Out of memory!\n"));
@@ -63,7 +63,7 @@ static NTSTATUS idmap_nss_unixids_to_sids(struct idmap_domain *dom, struct id_ma
const char *name;
enum lsa_SidType type;
bool ret;
-
+
switch (ids[i]->xid.type) {
case ID_TYPE_UID:
pw = getpwuid((uid_t)ids[i]->xid.id);
@@ -141,7 +141,7 @@ static NTSTATUS idmap_nss_sids_to_unixids(struct idmap_domain *dom, struct id_ma
for (i = 0; ids[i]; i++) {
ids[i]->status = ID_UNKNOWN;
}
-
+
ctx = talloc_new(dom);
if ( ! ctx) {
DEBUG(0, ("Out of memory!\n"));
diff --git a/source3/winbindd/idmap_tdb.c b/source3/winbindd/idmap_tdb.c
index 6d2ab8ef37..aeb4f204cd 100644
--- a/source3/winbindd/idmap_tdb.c
+++ b/source3/winbindd/idmap_tdb.c
@@ -8,17 +8,17 @@
Copyright (C) Jeremy Allison 2006
Copyright (C) Simo Sorce 2003-2006
Copyright (C) Michael Adam 2009-2010
-
+
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 <http://www.gnu.org/licenses/>.
*/
@@ -342,7 +342,7 @@ done:
/**********************************************************************
IDMAP ALLOC TDB BACKEND
**********************************************************************/
-
+
/**********************************
Allocate a new id.
**********************************/
@@ -684,7 +684,7 @@ static NTSTATUS idmap_tdb_id_to_sid(struct idmap_domain *dom, struct id_map *map
case ID_TYPE_UID:
keystr = talloc_asprintf(ctx, "UID %lu", (unsigned long)map->xid.id);
break;
-
+
case ID_TYPE_GID:
keystr = talloc_asprintf(ctx, "GID %lu", (unsigned long)map->xid.id);
break;
@@ -713,7 +713,7 @@ static NTSTATUS idmap_tdb_id_to_sid(struct idmap_domain *dom, struct id_map *map
ret = NT_STATUS_NONE_MAPPED;
goto done;
}
-
+
if (!string_to_sid(map->sid, (const char *)data.dptr)) {
DEBUG(10,("INVALID SID (%s) in record %s\n",
(const char *)data.dptr, keystr));
@@ -807,7 +807,7 @@ static NTSTATUS idmap_tdb_unixids_to_sids(struct idmap_domain *dom, struct id_ma
for (i = 0; ids[i]; i++) {
ids[i]->status = ID_UNKNOWN;
}
-
+
ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
for (i = 0; ids[i]; i++) {
@@ -821,7 +821,7 @@ static NTSTATUS idmap_tdb_unixids_to_sids(struct idmap_domain *dom, struct id_ma
ids[i]->status = ID_UNMAPPED;
continue;
}
-
+
/* some fatal error occurred, return immediately */
goto done;
}
@@ -912,7 +912,7 @@ static NTSTATUS idmap_tdb_sids_to_unixids(struct idmap_domain *dom, struct id_ma
for (i = 0; ids[i]; i++) {
ids[i]->status = ID_UNKNOWN;
}
-
+
ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
state.dom = dom;
diff --git a/source3/winbindd/nss_info_template.c b/source3/winbindd/nss_info_template.c
index 0bc398e908..7eb7510dad 100644
--- a/source3/winbindd/nss_info_template.c
+++ b/source3/winbindd/nss_info_template.c
@@ -8,12 +8,12 @@
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 3 of the License, or (at your option) any later version.
-
+
This library 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
Library General Public License for more details.
-
+
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -45,7 +45,7 @@ static NTSTATUS nss_template_get_info( struct nss_domain_entry *e,
{
if ( !homedir || !shell || !gecos )
return NT_STATUS_INVALID_PARAMETER;
-
+
/* protect against home directories using whitespace in the
username */
*homedir = talloc_strdup( ctx, lp_template_homedir() );
@@ -55,7 +55,7 @@ static NTSTATUS nss_template_get_info( struct nss_domain_entry *e,
if ( !*homedir || !*shell ) {
return NT_STATUS_NO_MEMORY;
}
-
+
return NT_STATUS_OK;
}
@@ -100,7 +100,7 @@ static struct nss_info_methods nss_template_methods = {
.map_from_alias = nss_template_map_from_alias,
.close_fn = nss_template_close
};
-
+
NTSTATUS nss_info_template_init( void )
{
return smb_register_idmap_nss(SMB_NSS_INFO_INTERFACE_VERSION,