remove perm option

diff --git a/include/atalk/volume.h b/include/atalk/volume.h
index 6ae66baac1a7ae8304aac5518f039bbdf366581e..010dcfde039c9295dfdc5e19a068624bcedb2bed 100644 (file)
--- a/include/atalk/volume.h
+++ b/include/atalk/volume.h
@@ -44,7 +44,6 @@ struct vol {
     char            v_stamp[ADEDLEN_PRIVSYN];
     VolSpace        v_limitsize; /* Size limit, if any, in MiB */
     mode_t          v_umask;
-    mode_t          v_perm;  /* default permission value OR with requested perm*/
     mode_t          v_dperm; /* default directories permission value OR with requested perm*/
     mode_t          v_fperm; /* default files permission value OR with requested perm*/
     ucs2_t          *v_u8mname;     /* converted to utf8-mac in ucs2 */

diff --git a/libatalk/util/netatalk_conf.c b/libatalk/util/netatalk_conf.c
index 3265c58e73f5e58729e76066bc28cb2c019a8195..0c70abe2dc7c780f75ea3e4cf1aa02c0ba4615f6 100644 (file)
--- a/libatalk/util/netatalk_conf.c
+++ b/libatalk/util/netatalk_conf.c
@@ -632,9 +632,6 @@ static struct vol *creatvol(AFPObj *obj,
     if (val = getoption(obj->iniconfig, section, "file perm", preset))
         volume->v_fperm = (int)strtol(val, NULL, 8);
 
-    if (val = getoption(obj->iniconfig, section, "perm", preset))
-        volume->v_perm = (int)strtol(val, NULL, 8);
-
     if (val = getoption(obj->iniconfig, section, "vol size limit", preset))
         volume->v_limitsize = (uint32_t)strtoul(val, NULL, 10);
 
@@ -871,9 +868,6 @@ static struct vol *creatvol(AFPObj *obj,
     }
 #endif
 
-    volume->v_dperm |= volume->v_perm;
-    volume->v_fperm |= volume->v_perm;
-
     /* Check EA support on volume */
     if (volume->v_vfs_ea == AFPVOL_EA_AUTO || volume->v_adouble == AD_VERSION_EA)
         check_ea_support(volume);