[PATCH] Fix some bad indentation
Volker Lendecke
Volker.Lendecke at SerNet.DE
Tue May 5 02:35:34 MDT 2015
Hi!
Review&push appreciated!
Thanks,
Volker
--
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de
-------------- next part --------------
From 8516b0aee407a21c06d38d1b31b276db1f6322df Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Tue, 5 May 2015 08:32:59 +0000
Subject: [PATCH 1/2] lib: Fix whitespace
Signed-off-by: Volker Lendecke <vl at samba.org>
---
source3/lib/sysacls.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c
index 2ec3d68..945ccdc 100644
--- a/source3/lib/sysacls.c
+++ b/source3/lib/sysacls.c
@@ -1,20 +1,20 @@
-/*
+/*
Unix SMB/CIFS implementation.
Samba system utilities for ACL support.
Copyright (C) Jeremy Allison 2000.
Copyright (C) Volker Lendecke 2006
Copyright (C) Michael Adam 2006,2008
-
+
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/>.
*/
@@ -128,14 +128,14 @@ int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
errno = EINVAL;
return -1;
}
-
+
if (permset_d == NULL) {
errno = EINVAL;
return -1;
}
*permset_d |= perm;
-
+
return 0;
}
@@ -183,7 +183,7 @@ char *sys_acl_to_text(const struct smb_acl_t *acl_d, ssize_t *len_p)
ap->a_type);
tag = tagbuf;
break;
-
+
case SMB_ACL_USER:
id = uidtoname(ap->info.user.uid);
/* FALL TROUGH */
@@ -255,7 +255,7 @@ SMB_ACL_T sys_acl_init(TALLOC_CTX *mem_ctx)
errno = ENOMEM;
return NULL;
}
-
+
a->count = 0;
a->next = -1;
@@ -337,7 +337,7 @@ int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d)
}
entry_d->a_perm = *permset_d;
-
+
return 0;
}
@@ -358,26 +358,26 @@ int sys_acl_valid(SMB_ACL_T acl_d)
* sys_acl_delete_def_file are to be redirected to the default
* statically-bound acl vfs module, but they are replacable.
*/
-
+
#if defined(HAVE_POSIX_ACLS)
-
-SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
+
+SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
const char *path_p, SMB_ACL_TYPE_T type, TALLOC_CTX *mem_ctx)
{
return posixacl_sys_acl_get_file(handle, path_p, type, mem_ctx);
}
-
+
SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp, TALLOC_CTX *mem_ctx)
{
return posixacl_sys_acl_get_fd(handle, fsp, mem_ctx);
}
-
+
int sys_acl_set_file(vfs_handle_struct *handle,
const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
{
return posixacl_sys_acl_set_file(handle, name, type, acl_d);
}
-
+
int sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp,
SMB_ACL_T acl_d)
{
@@ -424,7 +424,7 @@ int sys_acl_delete_def_file(vfs_handle_struct *handle,
}
#elif defined(HAVE_TRU64_ACLS)
-
+
SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
const char *path_p, SMB_ACL_TYPE_T type,
TALLOC_CTX *mem_ctx)
--
1.7.9.5
From 5b332dccbb18039782d7e6b5ab8c18f5ee60f76a Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Tue, 5 May 2015 08:34:11 +0000
Subject: [PATCH 2/2] lib: Fix indentation
Signed-off-by: Volker Lendecke <vl at samba.org>
---
source3/lib/sysacls.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c
index 945ccdc..7cff488 100644
--- a/source3/lib/sysacls.c
+++ b/source3/lib/sysacls.c
@@ -104,14 +104,14 @@ void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
{
if (entry_d->a_type == SMB_ACL_USER) {
return &entry_d->info.user.uid;
- }
+ }
if (entry_d->a_type == SMB_ACL_GROUP) {
return &entry_d->info.group.gid;
}
errno = EINVAL;
- return NULL;
+ return NULL;
}
int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d)
@@ -127,7 +127,7 @@ int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
&& perm != SMB_ACL_EXECUTE) {
errno = EINVAL;
return -1;
- }
+ }
if (permset_d == NULL) {
errno = EINVAL;
@@ -319,7 +319,7 @@ int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
if (entry_d->a_type == SMB_ACL_USER) {
entry_d->info.user.uid = *((uid_t *)qual_p);
return 0;
- }
+ }
if (entry_d->a_type == SMB_ACL_GROUP) {
entry_d->info.group.gid = *((gid_t *)qual_p);
return 0;
--
1.7.9.5
More information about the samba-technical
mailing list