X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fswitch.c;h=fd9770841910f6da250aaa334c8371281bcc81e6;hb=5ee4cf1e95071dea98a833ca37d24899cd899978;hp=93d0ae81a02c3208373a9fdc3c5503d937e148f0;hpb=050320bb93e255f9b5770074d51e4d5900b1f8d0;p=netatalk.git

diff --git a/etc/afpd/switch.c b/etc/afpd/switch.c
index 93d0ae81..fd977084 100644
--- a/etc/afpd/switch.c
+++ b/etc/afpd/switch.c
@@ -1,5 +1,5 @@
 /*
- * $Id: switch.c,v 1.9 2002-10-12 04:02:46 didg Exp $
+ * $Id: switch.c,v 1.15 2009-02-02 11:55:01 franklahm Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
@@ -46,11 +46,14 @@
 #include "filedir.h"
 #include "status.h"
 #include "misc.h"
+#ifdef HAVE_NFSv4_ACLS
+#include "acls.h"
+#endif
 
 static int afp_null(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj  *obj _U_;
+char	*ibuf, *rbuf _U_;
+int	ibuflen _U_, *rbuflen;
 {
     LOG(log_info, logtype_afpd, "afp_null handle %d", *ibuf );
     *rbuflen = 0;
@@ -72,14 +75,14 @@ int	(*preauth_switch[])() = {
     NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL,					/*  24 -  31 */
     NULL, NULL, NULL, NULL,
-    NULL, NULL, NULL, NULL,				/*  32 -  39 */
+    NULL, NULL, NULL, NULL,					/*  32 -  39 */
     NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL,					/*  40 -  47 */
     NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL,					/*  48 -  55 */
     NULL, NULL, NULL, NULL,
-    NULL, NULL, NULL, NULL,					/*  56 -  63 */
-    NULL, NULL, NULL, afp_login_ext,
+    NULL, NULL, NULL, afp_login_ext,				/*  56 -  63 */
+    NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL,					/*  64 -  71 */
     NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL,					/*  72 -  79 */
@@ -143,11 +146,7 @@ int	(*postauth_switch[])() = {
     /*  24 -  31 */
     afp_setvolparams, afp_write, afp_getfildirparams, afp_setfildirparams,
     afp_changepw, afp_getuserinfo, afp_getsrvrmesg, afp_createid, /*  32 -  39 */
-#ifdef WITH_CATSEARCH
     afp_deleteid, afp_resolveid, afp_exchangefiles, afp_catsearch,
-#else
-    afp_deleteid, afp_resolveid, afp_exchangefiles, afp_null,
-#endif
     afp_null, afp_null, afp_null, afp_null,			/*  40 -  47 */
     afp_opendt, afp_closedt, afp_null, afp_geticon,
     afp_geticoninfo, afp_addappl, afp_rmvappl, afp_getappl,	/*  48 -  55 */
@@ -156,7 +155,7 @@ int	(*postauth_switch[])() = {
     NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL,					/*  64 -  71 */
     NULL, NULL, NULL, NULL,
-    NULL, NULL, NULL, NULL,					/*  72 -  79 */
+    NULL, NULL, afp_syncdir, NULL,				/*  72 -  79 */
     NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL,					/*  80 -  87 */
     NULL, NULL, NULL, NULL,
@@ -207,20 +206,20 @@ int	(*postauth_switch[])() = {
 /* add a new function if it's specified. return the old function in
  * "old" if there's a pointer there. */
 int uam_afpserver_action(const int id, const int which,
-                         int (**new)(), int (**old)())
+                         int (*new)(), int (**old)())
 {
     switch (which) {
     case UAM_AFPSERVER_PREAUTH:
         if (old)
             *old = preauth_switch[id];
         if (new)
-            preauth_switch[id] = *new;
+            preauth_switch[id] = new;
         break;
     case UAM_AFPSERVER_POSTAUTH:
         if (old)
             *old = postauth_switch[id];
         if (new)
-            postauth_switch[id] = *new;
+            postauth_switch[id] = new;
         break;
     default:
         LOG(log_debug, logtype_afpd, "uam_afpserver_action: unknown switch %d[%d]",