Define AFP func no macros. Move 3.2 calls to 3.2 case switch.

diff --git a/etc/afpd/auth.c b/etc/afpd/auth.c
index 4b834bdb390ffcc4563bf230325055bb7ec139fc..5bce7013fa9b03cca26a9aeaf56b0cd5b010e523 100644 (file)
--- a/etc/afpd/auth.c
+++ b/etc/afpd/auth.c
@@ -1,5 +1,5 @@
 /*
- * $Id: auth.c,v 1.59 2009-02-25 22:51:36 didg Exp $
+ * $Id: auth.c,v 1.60 2009-02-26 14:05:05 franklahm Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -202,6 +202,9 @@ static int set_auth_switch(int expired)
         afp_switch = postauth_switch;
         switch (afp_version) {
         case 32:
+           uam_afpserver_action(AFP_SPOTLIGHT_PRIVATE, UAM_AFPSERVER_POSTAUTH, afp_null_nolog, NULL);
+           uam_afpserver_action(AFP_SYNCDIR, UAM_AFPSERVER_POSTAUTH, afp_syncdir, NULL);
+           uam_afpserver_action(AFP_SYNCFORK, UAM_AFPSERVER_POSTAUTH, afp_syncfork, NULL);
 #ifdef HAVE_NFSv4_ACLS
            uam_afpserver_action(AFP_GETACL, UAM_AFPSERVER_POSTAUTH, afp_getacl, NULL);
            uam_afpserver_action(AFP_SETACL, UAM_AFPSERVER_POSTAUTH, afp_setacl, NULL);
@@ -215,9 +218,6 @@ static int set_auth_switch(int expired)
 #endif
         case 31:
            uam_afpserver_action(AFP_ENUMERATE_EXT2, UAM_AFPSERVER_POSTAUTH, afp_enumerate_ext2, NULL);
-           uam_afpserver_action(76, UAM_AFPSERVER_POSTAUTH, afp_null_nolog, NULL);
-           uam_afpserver_action(AFP_SYNCDIR, UAM_AFPSERVER_POSTAUTH, afp_syncdir, NULL);
-           uam_afpserver_action(AFP_SYNCFORK, UAM_AFPSERVER_POSTAUTH, afp_syncfork, NULL);
         case 30:
            uam_afpserver_action(AFP_ENUMERATE_EXT, UAM_AFPSERVER_POSTAUTH, afp_enumerate_ext, NULL); 
            uam_afpserver_action(AFP_BYTELOCK_EXT,  UAM_AFPSERVER_POSTAUTH, afp_bytelock_ext, NULL); 

diff --git a/include/atalk/afp.h b/include/atalk/afp.h
index c7e8a556a06df77fb01735aca90e370f05190db9..6dfa93ef253bd38a58ee7586eecd6d2ec746b9ef 100644 (file)
--- a/include/atalk/afp.h
+++ b/include/atalk/afp.h
@@ -202,6 +202,15 @@ typedef enum {
 #define AFP_ZZZ                 122
 
 /* version 3.2 */
-#define AFP_FPSYNCDIR          78
+#define AFP_GETEXTATTR          69
+#define AFP_SETEXTATTR          70
+#define AFP_REMOVEATTR          71
+#define AFP_LISTEXTATTR         72
+#define AFP_GETACL              73
+#define AFP_SETACL              74
+#define AFP_ACCESS              75
+#define AFP_SPOTLIGHT_PRIVATE   76
+#define AFP_SYNCDIR            78
+#define AFP_SYNCFORK            79
 
 #endif