From e00327323ddec6074141a4c5638a12565b6345bd Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 14 Mar 2010 14:06:45 +0100 Subject: s3: Fix some nonempty blank lines --- source3/groupdb/mapping.c | 32 +++++++++++++++----------------- source3/include/authdata.h | 7 +++---- source3/include/dbwrap.h | 6 +++--- source3/include/debug.h | 6 +++--- source3/include/dynconfig.h | 6 +++--- 5 files changed, 27 insertions(+), 30 deletions(-) (limited to 'source3') diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c index b648c58202..7add05e84c 100644 --- a/source3/groupdb/mapping.c +++ b/source3/groupdb/mapping.c @@ -51,13 +51,13 @@ NTSTATUS add_initial_entry(gid_t gid, const char *sid, enum lsa_SidType sid_name DEBUG(0,("failed to initialize group mapping\n")); return NT_STATUS_UNSUCCESSFUL; } - + map.gid=gid; if (!string_to_sid(&map.sid, sid)) { DEBUG(0, ("string_to_sid failed: %s", sid)); return NT_STATUS_UNSUCCESSFUL; } - + map.sid_name_use=sid_name_use; fstrcpy(map.nt_name, nt_name); fstrcpy(map.comment, comment); @@ -105,7 +105,7 @@ bool get_domain_group_from_sid(DOM_SID sid, GROUP_MAP *map) { struct group *grp; bool ret; - + if(!init_group_mapping()) { DEBUG(0,("failed to initialize group mapping\n")); return(False); @@ -114,28 +114,26 @@ bool get_domain_group_from_sid(DOM_SID sid, GROUP_MAP *map) DEBUG(10, ("get_domain_group_from_sid\n")); /* if the group is NOT in the database, it CAN NOT be a domain group */ - + become_root(); ret = pdb_getgrsid(map, sid); unbecome_root(); - + /* special case check for rid 513 */ - + if ( !ret ) { uint32 rid; - + sid_peek_rid( &sid, &rid ); - + if ( rid == DOMAIN_GROUP_RID_USERS ) { fstrcpy( map->nt_name, "None" ); fstrcpy( map->comment, "Ordinary Users" ); sid_copy( &map->sid, &sid ); map->sid_name_use = SID_NAME_DOM_GRP; map->gid = (gid_t)-1; - return True; } - return False; } @@ -147,13 +145,13 @@ bool get_domain_group_from_sid(DOM_SID sid, GROUP_MAP *map) } DEBUG(10, ("get_domain_group_from_sid: SID is a domain group\n")); - + if (map->gid==-1) { return False; } DEBUG(10, ("get_domain_group_from_sid: SID is mapped to gid:%lu\n",(unsigned long)map->gid)); - + grp = getgrgid(map->gid); if ( !grp ) { DEBUG(10, ("get_domain_group_from_sid: gid DOESN'T exist in UNIX security\n")); @@ -745,22 +743,22 @@ NTSTATUS pdb_create_builtin_alias(uint32 rid) fstring groupname; DEBUG(10, ("Trying to create builtin alias %d\n", rid)); - + if ( !sid_compose( &sid, &global_sid_Builtin, rid ) ) { return NT_STATUS_NO_SUCH_ALIAS; } - + if ( (mem_ctx = talloc_new(NULL)) == NULL ) { return NT_STATUS_NO_MEMORY; } - + if ( !lookup_sid(mem_ctx, &sid, NULL, &name, &type) ) { TALLOC_FREE( mem_ctx ); return NT_STATUS_NO_SUCH_ALIAS; } - + /* validate RID so copy the name and move on */ - + fstrcpy( groupname, name ); TALLOC_FREE( mem_ctx ); diff --git a/source3/include/authdata.h b/source3/include/authdata.h index e1a5155927..f9578aa16b 100644 --- a/source3/include/authdata.h +++ b/source3/include/authdata.h @@ -2,18 +2,17 @@ Unix SMB/CIFS implementation. Kerberos authorization data Copyright (C) Jim McDonough 2003 - - + 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 . */ diff --git a/source3/include/dbwrap.h b/source3/include/dbwrap.h index 1803587c4a..846e1c2815 100644 --- a/source3/include/dbwrap.h +++ b/source3/include/dbwrap.h @@ -2,17 +2,17 @@ Unix SMB/CIFS implementation. Database interface wrapper around tdb Copyright (C) Volker Lendecke 2005-2007 - + 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 . */ diff --git a/source3/include/debug.h b/source3/include/debug.h index 56d0237c3f..2c910dac39 100644 --- a/source3/include/debug.h +++ b/source3/include/debug.h @@ -5,17 +5,17 @@ Copyright (C) John H Terpstra 1996-1998 Copyright (C) Luke Kenneth Casson Leighton 1996-1998 Copyright (C) Paul Ashton 1998 - + 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 . */ diff --git a/source3/include/dynconfig.h b/source3/include/dynconfig.h index 86c77138e7..850ef1edd5 100644 --- a/source3/include/dynconfig.h +++ b/source3/include/dynconfig.h @@ -2,17 +2,17 @@ Unix SMB/CIFS implementation. Copyright (C) 2001 by Martin Pool Copyright (C) 2003 by Jim McDonough - + 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 . */ -- cgit