X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Funix.h;h=3b3c281b528c57dd4c035243796340823c35ec8f;hb=bd3b0cfd7c0c51048ff898e5e1b121f8a3dd1126;hp=d2987706e3b8beaffdd11c00f06fd27548b15081;hpb=5ab4f0463c00263b3d842f1e1a3648ecf35b4d65;p=netatalk.git

diff --git a/etc/afpd/unix.h b/etc/afpd/unix.h
index d2987706..3b3c281b 100644
--- a/etc/afpd/unix.h
+++ b/etc/afpd/unix.h
@@ -53,6 +53,7 @@ typedef int	mode_t;
 
 
 #ifndef NO_QUOTA_SUPPORT
+#if !defined(HAVE_LIBQUOTA)
 
 #if !(defined(__svr4__) || defined(HAVE_DQB_BTIMELIMIT))
 #define dqb_btimelimit  dqb_btime
@@ -202,24 +203,22 @@ extern long quotactl (unsigned int, const char *, int, caddr_t);
 
 #endif /* linux */
 
-extern int getnfsquota (struct vol *, const int, const u_int32_t,
-                                struct dqblk *);
+extern int getnfsquota (struct vol *, const int, const uint32_t,
+                        struct dqblk *);
 
-extern int uquota_getvolspace (struct vol *, VolSpace *, VolSpace *,
-                                       const u_int32_t);
+#endif /* ! HAVE_LIBQUOTA */
+extern int uquota_getvolspace (const AFPObj *obj, struct vol *, VolSpace *, VolSpace *,
+                               const uint32_t);
 #endif /* NO_QUOTA_SUPPORT */
 
 extern struct afp_options default_options;
 
-extern int gmem            (const gid_t);
-extern int setdeskmode      (const mode_t);
-extern int setdirunixmode   (const struct vol *, const char *, mode_t);
+extern int setdirunixmode   (const struct vol *, char *, mode_t);
 extern int setdirmode       (const struct vol *, const char *, mode_t);
-extern int setdeskowner     (const uid_t, const gid_t);
 extern int setdirowner      (const struct vol *, const char *, const uid_t, const gid_t);
 extern int setfilunixmode   (const struct vol *, struct path*, const mode_t);
 extern int setfilowner      (const struct vol *, const uid_t, const gid_t, struct path*);
-extern void accessmode      (char *, struct maccess *, struct dir *, struct stat *);
+extern void accessmode      (const AFPObj *obj, const struct vol *, char *, struct maccess *, struct dir *, struct stat *);
 
 #ifdef AFS	
     #define accessmode afsmode