AFP 3.x changes

diff --git a/etc/afpd/auth.c b/etc/afpd/auth.c
index 73511d4e03ab9b9bef3293dfb6bfdc2e6251c955..e8343fab508218e44ecb70d0d096a3cc7dd9a5f4 100644 (file)
--- a/etc/afpd/auth.c
+++ b/etc/afpd/auth.c
@@ -1,5 +1,5 @@
 /*
- * $Id: auth.c,v 1.32 2002-10-12 04:02:46 didg Exp $
+ * $Id: auth.c,v 1.33 2002-10-12 16:42:31 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -334,8 +334,8 @@ unsigned int ibuflen, *rbuflen;
 
     *rbuflen = 0;
 
-    ibuf++;
-    ibuflen--;
+    ibuf += 2;
+    ibuflen -= 2;
 
     memcpy(&type, ibuf, sizeof(type));    
     type = ntohs(type);
@@ -389,7 +389,7 @@ int         ibuflen, *rbuflen;
     pid_t               token;
 
     *rbuflen = 0;
-    ibuf++;
+    ibuf += 2;
 
     memcpy(&type, ibuf, sizeof(type));
     type = ntohs(type);

diff --git a/etc/afpd/switch.c b/etc/afpd/switch.c
index 76a818bc84265e1b8de27034ccf27f449923fe1b..7ca7742fc9cb783eb1bb3ac8da1206b650800fd7 100644 (file)
--- a/etc/afpd/switch.c
+++ b/etc/afpd/switch.c
@@ -1,5 +1,5 @@
 /*
- * $Id: switch.c,v 1.10 2002-10-12 13:46:09 didg Exp $
+ * $Id: switch.c,v 1.11 2002-10-12 16:42:31 didg Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
@@ -207,20 +207,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]",

diff --git a/include/atalk/uam.h b/include/atalk/uam.h
index 44847712ac53410ff1a309dcfbe07459e0940878..5bf6b69fb70e1e52bb3cc1608d7bdca23688c6c2 100644 (file)
--- a/include/atalk/uam.h
+++ b/include/atalk/uam.h
@@ -79,6 +79,6 @@ extern int uam_sia_validate_user __P((sia_collect_func_t *, int, char **,
 #define UAM_AFPSERVER_POSTAUTH (1 << 0)
 
 extern int uam_afpserver_action __P((const int /*id*/, const int /*switch*/, 
-                                    int (**)(), int (**)()));
+                                    int (*)(), int (**)()));
 
 #endif