Rename option acl2os9mode to acl2uarights

diff --git a/etc/afpd/acls.c b/etc/afpd/acls.c
index d121e4d83ae95b9c24526d1508eba156a5586295..3cb3de4a7b67f706bff7a3d1a4deb56ddad82ee1 100644 (file)
--- a/etc/afpd/acls.c
+++ b/etc/afpd/acls.c
@@ -1340,7 +1340,7 @@ void acltoownermode(char *path, struct stat *st, uid_t uid, struct maccess *ma)
     atalk_uuid_t uuid;
     int r_ok, w_ok, x_ok;
 
-    if ( ! (AFPobj->options.flags & OPTION_UUID) || ! (AFPobj->options.flags & OPTION_ACL2OS9MODE))
+    if ( ! (AFPobj->options.flags & OPTION_UUID) || ! (AFPobj->options.flags & OPTION_ACL2UARIGHTS))
         return;
 
     LOG(log_maxdebug, logtype_afpd, "acltoownermode('%s')", path);

diff --git a/etc/afpd/afp_options.c b/etc/afpd/afp_options.c
index 12a338508238dd60a4bf017a39e832029d6c5393..0d3ef8cb8dd573f66d9d8d1fd69672de061ed300 100644 (file)
--- a/etc/afpd/afp_options.c
+++ b/etc/afpd/afp_options.c
@@ -244,8 +244,8 @@ int afp_options_parseline(char *buf, struct afp_options *options)
         options->flags |= OPTION_CUSTOMICON;
     if (strstr(buf, " -advertise_ssh"))
         options->flags |= OPTION_ANNOUNCESSH;
-    if (strstr(buf, " -acl2os9mode"))
-        options->flags |= OPTION_ACL2OS9MODE;
+    if (strstr(buf, " -acl2uarights"))
+        options->flags |= OPTION_ACL2UARIGHTS;
 
     /* passwd bits */
     if (strstr(buf, " -nosavepassword"))

diff --git a/etc/afpd/globals.h b/etc/afpd/globals.h
index 6ce22a8ae146f9991383efe5f528f8861a1a0e3c..1d86fd35282db0955f6d3da430ff22aa94851d53 100644 (file)
--- a/etc/afpd/globals.h
+++ b/etc/afpd/globals.h
@@ -35,7 +35,7 @@
 #define OPTION_NOSLP         (1 << 5)
 #define OPTION_ANNOUNCESSH   (1 << 6)
 #define OPTION_UUID          (1 << 7)
-#define OPTION_ACL2OS9MODE   (1 << 8)
+#define OPTION_ACL2UARIGHTS  (1 << 8)
 #define OPTION_NOZEROCONF    (1 << 9)
 
 #ifdef FORCE_UIDGID