Check for sys/quota.h and include it if and only if this is defined in unix.h.

[netatalk.git] / etc / afpd / unix.h

diff --git a/etc/afpd/unix.h b/etc/afpd/unix.h
index a846eb8931bd3134f24ed5f655f190775f97d5e4..a15cee23c031e6b76ca7194f6c4325b7bd5743fb 100644 (file)
--- a/etc/afpd/unix.h
+++ b/etc/afpd/unix.h
@@ -1,5 +1,5 @@
 /*
- * $Id: unix.h,v 1.9 2001-12-03 05:03:38 jmarcus Exp $
+ * $Id: unix.h,v 1.15 2003-12-15 04:59:45 srittau Exp $
  */
 
 #ifndef AFPD_UNIX_H
@@ -58,15 +58,9 @@ typedef int  mode_t;
 #define dqb_btimelimit  dqb_btime
 #endif /* ! __svr4__ || HAVE_DQB_BTIMELIMIT */
 
-#if defined(linux) || defined(ultrix) || defined(HAVE_QUOTA_H)
-#ifndef NEED_QUOTACTL_WRAPPER
+#if defined(HAVE_SYS_QUOTA_H)
 #include <sys/quota.h>
-#else /* ! NEED_QUOTACTL_WRAPPER */
-#include <asm/types.h>
-#include <asm/unistd.h>
-#include <linux/quota.h>
-#endif /* ! NEED_QUOTACTL_WRAPPER */
-#endif /* linux || ultrix || HAVE_QUOTA_H */
+#endif /* HAVE_SYS_QUOTA_H */
 
 #ifdef __svr4__ 
 #include <sys/fs/ufs_quota.h>
@@ -80,9 +74,10 @@ typedef int  mode_t;
 #include <ufs/quota.h>
 #endif /* HAVE_UFS_QUOTA_H */
 
-#ifdef _IBMR2
-#include <jfs/quota.h>
-#endif /* _IBMR2 */
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include "directory.h"
 
 extern int getnfsquota __P((const struct vol *, const int, const u_int32_t,
                                 struct dqblk *));
@@ -93,10 +88,20 @@ extern int uquota_getvolspace __P((const struct vol *, VolSpace *, VolSpace *,
 
 extern struct afp_options default_options;
 
-extern int gmem         __P((const gid_t));
-extern int setdeskmode  __P((const mode_t));
-extern int setdirmode   __P((const mode_t, const int, const int));
-extern int setdeskowner __P((const uid_t, const gid_t));
-extern int setdirowner  __P((const uid_t, const gid_t, const int));
+extern int gmem            __P((const gid_t));
+extern int setdeskmode      __P((const mode_t));
+extern int setdirunixmode   __P((const mode_t, const int, const int));
+extern int setdirmode       __P((const mode_t, const int, const int));
+extern int setdeskowner     __P((const uid_t, const gid_t));
+extern int setdirowner      __P((const uid_t, const gid_t, const int));
+extern int setfilmode       __P((char *, mode_t , struct stat *));
+extern int setfilemode      __P((struct path*, const mode_t));
+extern int unix_rename      __P((const char *oldpath, const char *newpath));
+
+extern void accessmode      __P((char *, struct maccess *, struct dir *, struct stat *));
+
+#ifdef AFS     
+    #define accessmode afsmode
+#endif 
 
 #endif /* UNIX_H */