diff options
| author | Steven Danneman <steven.danneman@isilon.com> | 2009-02-12 14:07:30 -0800 |
|---|---|---|
| committer | Steven Danneman <steven.danneman@isilon.com> | 2009-02-12 14:08:56 -0800 |
| commit | dc19a60e50b89886f98541ad227e6f3a3bc8720b (patch) | |
| tree | 56f394478690fe6ab19245af2686791322a94ad2 | |
| parent | 1b6543c5f9acea16b1ec4cf6d7c46283732b4522 (diff) | |
| download | samba-dc19a60e50b89886f98541ad227e6f3a3bc8720b.tar.gz samba-dc19a60e50b89886f98541ad227e6f3a3bc8720b.tar.bz2 samba-dc19a60e50b89886f98541ad227e6f3a3bc8720b.zip | |
s3 onefs: rename custom parameter to plural to match previous usage
| -rw-r--r-- | source3/modules/onefs.h | 4 | ||||
| -rw-r--r-- | source3/modules/onefs_acl.c | 4 | ||||
| -rw-r--r-- | source3/modules/onefs_open.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source3/modules/onefs.h b/source3/modules/onefs.h index 72be682c21..b88719f3a2 100644 --- a/source3/modules/onefs.h +++ b/source3/modules/onefs.h @@ -48,8 +48,8 @@ enum onefs_acl_wire_format #define PARM_CREATOR_OWNER_GETS_FULL_CONTROL_DEFAULT true #define PARM_CTIME_NOW "ctime now files" #define PARM_CTIME_SLOP "ctime now slop" -#define PARM_IGNORE_SACL "ignore sacl" -#define PARM_IGNORE_SACL_DEFAULT false +#define PARM_IGNORE_SACLS "ignore sacls" +#define PARM_IGNORE_SACLS_DEFAULT false #define PARM_MTIME_NOW "mtime now files" #define PARM_MTIME_STATIC "mtime static files" #define PARM_MTIME_SLOP "mtime now slop" diff --git a/source3/modules/onefs_acl.c b/source3/modules/onefs_acl.c index 02394794c2..7bc4a1728f 100644 --- a/source3/modules/onefs_acl.c +++ b/source3/modules/onefs_acl.c @@ -620,7 +620,7 @@ onefs_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp, fsp->fsp_name, security_info)); if (lp_parm_bool(SNUM(fsp->conn), PARM_ONEFS_TYPE, - PARM_IGNORE_SACL, PARM_IGNORE_SACL_DEFAULT)) { + PARM_IGNORE_SACLS, PARM_IGNORE_SACLS_DEFAULT)) { DEBUG(5, ("Ignoring SACL on %s.\n", fsp->fsp_name)); security_info &= ~SACL_SECURITY_INFORMATION; } @@ -851,7 +851,7 @@ NTSTATUS onefs_samba_sd_to_sd(uint32 security_info_sent, SEC_DESC *psd, if (security_info_sent & SACL_SECURITY_INFORMATION) { if (lp_parm_bool(snum, PARM_ONEFS_TYPE, - PARM_IGNORE_SACL, PARM_IGNORE_SACL_DEFAULT)) { + PARM_IGNORE_SACLS, PARM_IGNORE_SACLS_DEFAULT)) { DEBUG(5, ("Ignoring SACLs.\n")); security_info_sent &= ~SACL_SECURITY_INFORMATION; } else { diff --git a/source3/modules/onefs_open.c b/source3/modules/onefs_open.c index e335dc7e28..1f5f8551ff 100644 --- a/source3/modules/onefs_open.c +++ b/source3/modules/onefs_open.c @@ -745,7 +745,7 @@ NTSTATUS onefs_open_file_ntcreate(connection_struct *conn, } if (lp_parm_bool(SNUM(fsp->conn), PARM_ONEFS_TYPE, - PARM_IGNORE_SACL, PARM_IGNORE_SACL_DEFAULT)) { + PARM_IGNORE_SACLS, PARM_IGNORE_SACLS_DEFAULT)) { access_mask &= ~SYSTEM_SECURITY_ACCESS; } |