Updated patch 02-ACL/0002 to be compatible with -Werror compile flag.

This commit is contained in:
Sebastian Lackner 2014-03-08 02:22:13 +01:00
parent ca1e83ef3f
commit ebf2fb3d7d

View File

@ -1,20 +1,28 @@
From bfad7f20bef7f8ef39e6354d0b47c0c349eac967 Mon Sep 17 00:00:00 2001
From b83ae7cc77483519ed870ead3a167e83acbf1cff Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Thu, 13 Feb 2014 15:45:48 -0700
Subject: server: Unify the retrieval of security attributes for files and
directories.
---
server/change.c | 27 +++++----------------------
server/change.c | 32 +++++---------------------------
server/file.c | 34 ++++++++++++++++++++++------------
server/file.h | 2 ++
3 files changed, 29 insertions(+), 34 deletions(-)
3 files changed, 29 insertions(+), 39 deletions(-)
diff --git a/server/change.c b/server/change.c
index 76fc9f7..0b7b979 100644
index 76fc9f7..eb16923 100644
--- a/server/change.c
+++ b/server/change.c
@@ -286,31 +286,14 @@ static int get_dir_unix_fd( struct dir *dir )
@@ -278,39 +278,17 @@ static struct fd *dir_get_fd( struct object *obj )
return (struct fd *)grab_object( dir->fd );
}
-static int get_dir_unix_fd( struct dir *dir )
-{
- return get_unix_fd( dir->fd );
-}
-
static struct security_descriptor *dir_get_sd( struct object *obj )
{
struct dir *dir = (struct dir *)obj;