remove perm option

[netatalk.git] / include / atalk / volume.h

diff --git a/include/atalk/volume.h b/include/atalk/volume.h
index e495fe5410de46b3ca78adf0cd3e37c35ca589d2..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 */
@@ -70,7 +69,8 @@ struct vol {
     
     /* only when opening/closing volumes or in error */
     int             v_casefold;
-    char            *v_localname;   /* as defined in AppleVolumes.default */
+    char            *v_configname;   /* as defined in afpc.conf */
+    char            *v_localname;    /* as defined in afp.conf but with vars expanded */
     char            *v_volcodepage;
     char            *v_maccodepage;
     char            *v_password;
@@ -78,8 +78,10 @@ struct vol {
     char            *v_dbpath;
     char            *v_cnidserver;
     char            *v_cnidport;
+#if 0
     int             v_hide;       /* new volume wait until old volume is closed */
     int             v_new;        /* volume deleted but there's a new one with the same name */
+#endif
     int             v_deleted;    /* volume open but deleted in new config file */
     char            *v_root_preexec;
     char            *v_preexec;
@@ -110,6 +112,7 @@ struct vol {
   Keep in sync with libatalk/util/volinfo.c
 */
 #define AFPVOL_NOV2TOEACONV (1 << 5) /* no adouble:v2 to adouble:ea conversion */
+#define AFPVOL_UNIX_CTXT (1 << 6)   /* volume created by getvolbypath ie UNIX access, not afpd AFP user session */
 #define AFPVOL_RO        (1 << 8)   /* read-only volume */
 #define AFPVOL_NOHEX     (1 << 10)  /* don't do :hex translation */
 #define AFPVOL_USEDOTS   (1 << 11)  /* use real dots */