Remove NEED_QUOTACTL_WRAPPER cruft. I think that was needed for old Linux

versions. If it's still needed, please notify me and I will revert this
change.

diff --git a/configure.in b/configure.in
index 84753a66c018f2e185c409d663d3663d66eccee8..196b59a561c15bbce7894594eba40cb68845417f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.192 2003-12-15 04:33:28 srittau Exp $
+dnl $Id: configure.in,v 1.193 2003-12-15 04:49:56 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(etc/afpd/main.c)
@@ -527,12 +527,6 @@ if test "x$ac_have_atalk_addr" = "xyes"; then
        AC_DEFINE(HAVE_ATALK_ADDR, 1, [set if struct at_addr is called atalk_addr])
 fi
 
-       dnl ----- check if we need the quotactl wrapper
-       AC_CHECK_FUNC(quotactl,,
-               AC_DEFINE(NEED_QUOTACTL_WRAPPER, 1, [Define if the quotactl wrapper is needed])
-               AC_MSG_RESULT([enabling quotactl wrapper])
-       )
-
        dnl ----- as far as I can tell, dbtob always does the wrong thing
        dnl ----- on every single version of linux I've ever played with.
        dnl ----- see etc/afpd/quota.c

diff --git a/etc/afpd/quota.c b/etc/afpd/quota.c
index dded3350b29e10450fa011a547c5626d2aa0fb2b..36bf3bc84f24b68ae63330ba6d3e29b71b50eced 100644 (file)
--- a/etc/afpd/quota.c
+++ b/etc/afpd/quota.c
@@ -1,5 +1,5 @@
 /*
- * $Id: quota.c,v 1.22 2002-08-29 17:22:06 jmarcus Exp $
+ * $Id: quota.c,v 1.23 2003-12-15 04:49:56 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -47,12 +47,6 @@ char *strchr (), *strrchr ();
 #include "unix.h"
 
 #ifndef NO_QUOTA_SUPPORT
-#ifdef NEED_QUOTACTL_WRAPPER
-int quotactl(int cmd, const char *special, int id, caddr_t addr)
-{
-    return syscall(__NR_quotactl, cmd, special, id, addr);
-}
-#endif /* NEED_QUOTACTL_WRAPPER */
 
 
 #if defined(HAVE_SYS_MNTTAB_H) || defined(__svr4__)

diff --git a/etc/afpd/unix.h b/etc/afpd/unix.h
index 21b4854f2c051b5ca73115d61093ef23313dc340..70bdb16bf62557e9068505d0d0837141876defb3 100644 (file)
--- a/etc/afpd/unix.h
+++ b/etc/afpd/unix.h
@@ -1,5 +1,5 @@
 /*
- * $Id: unix.h,v 1.13 2003-06-05 09:17:12 didg Exp $
+ * $Id: unix.h,v 1.14 2003-12-15 04:49:56 srittau Exp $
  */
 
 #ifndef AFPD_UNIX_H
@@ -59,13 +59,7 @@ typedef int  mode_t;
 #endif /* ! __svr4__ || HAVE_DQB_BTIMELIMIT */
 
 #if defined(linux) || defined(ultrix) || defined(HAVE_QUOTA_H)
-#ifndef NEED_QUOTACTL_WRAPPER
 #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 */
 
 #ifdef __svr4__