s3 onefs: rename custom parameter to plural to match previous usage
authorSteven Danneman <steven.danneman@isilon.com>
Thu, 12 Feb 2009 22:07:30 +0000 (14:07 -0800)
committerSteven Danneman <steven.danneman@isilon.com>
Thu, 12 Feb 2009 22:08:56 +0000 (14:08 -0800)
source3/modules/onefs.h
source3/modules/onefs_acl.c
source3/modules/onefs_open.c

index 72be682c2126cd12c75ee09655ed579e882f3a57..b88719f3a200650c564159c0e768ac2f69c6fd0a 100644 (file)
@@ -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"
index 02394794c24348fef0b2fe36bbe85eae8c29cc76..7bc4a1728f1d6e8282e26356e1fc0f43d2bfb71e 100644 (file)
@@ -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 {
index e335dc7e281ee32b4b1cb4934e150b6f407b3537..1f5f8551ffb0e1196c70841d4a9e4aaad6417f59 100644 (file)
@@ -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;
        }