diff options
| author | Jeremy Allison <jra@samba.org> | 2009-07-27 12:09:40 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-07-27 12:09:40 -0700 |
| commit | 9297b975f58a6c8a8609e05d0bed7b4846a2be32 (patch) | |
| tree | 129ac7e913e6b9245c626f6b2b97fb57b21333f6 /source3/modules/vfs_acl_xattr.c | |
| parent | 67d9130c134e885c17242596aacd2f265737d805 (diff) | |
| download | samba-9297b975f58a6c8a8609e05d0bed7b4846a2be32.tar.gz samba-9297b975f58a6c8a8609e05d0bed7b4846a2be32.tar.bz2 samba-9297b975f58a6c8a8609e05d0bed7b4846a2be32.zip | |
Fix the build breakage by #including modules/vfs_acl_common.c
into acl_tdb and acl_xattr. Duplicates the code size, but keeps
the code in common so I don't have to do bug fixes in two places
(which is what I really cared about).
Jeremy.
Diffstat (limited to 'source3/modules/vfs_acl_xattr.c')
| -rw-r--r-- | source3/modules/vfs_acl_xattr.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c index d7711760ed..7a9cd27e5f 100644 --- a/source3/modules/vfs_acl_xattr.c +++ b/source3/modules/vfs_acl_xattr.c @@ -28,11 +28,14 @@ #undef DBGC_CLASS #define DBGC_CLASS DBGC_VFS +/* Pull in the common functions. */ +#include "modules/vfs_acl_common.c" + /******************************************************************* Pull a security descriptor into a DATA_BLOB from a xattr. *******************************************************************/ -NTSTATUS get_acl_blob(TALLOC_CTX *ctx, +static NTSTATUS get_acl_blob(TALLOC_CTX *ctx, vfs_handle_struct *handle, files_struct *fsp, const char *name, @@ -90,7 +93,7 @@ NTSTATUS get_acl_blob(TALLOC_CTX *ctx, Store a DATA_BLOB into an xattr given an fsp pointer. *******************************************************************/ -NTSTATUS store_acl_blob_fsp(vfs_handle_struct *handle, +static NTSTATUS store_acl_blob_fsp(vfs_handle_struct *handle, files_struct *fsp, DATA_BLOB *pblob) { @@ -128,7 +131,7 @@ NTSTATUS store_acl_blob_fsp(vfs_handle_struct *handle, Store a DATA_BLOB into an xattr given a pathname. *******************************************************************/ -NTSTATUS store_acl_blob_pathname(vfs_handle_struct *handle, +static NTSTATUS store_acl_blob_pathname(vfs_handle_struct *handle, const char *fname, DATA_BLOB *pblob) { |