Merge forgotten null/no-log FPSpotlight implementation from HEAD

diff --git a/etc/afpd/auth.c b/etc/afpd/auth.c
index e813edd5b7c4254ae7c5044d29cade8343f545fa..b6becc5cd11aca37e2917c10609d70b950e7b0eb 100644 (file)
--- a/etc/afpd/auth.c
+++ b/etc/afpd/auth.c
@@ -1,5 +1,5 @@
 /*
- * $Id: auth.c,v 1.44.2.3.2.15.2.5 2009-09-11 12:40:14 franklahm Exp $
+ * $Id: auth.c,v 1.44.2.3.2.15.2.6 2009-10-05 08:10:07 franklahm Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -163,6 +163,14 @@ int        ibuflen _U_, *rbuflen;
     return AFPERR_PWDEXPR;
 }
 
+static int afp_null_nolog(obj, ibuf, ibuflen, rbuf, rbuflen )
+AFPObj  *obj _U_;
+char   *ibuf _U_, *rbuf _U_;
+int    ibuflen _U_, *rbuflen;
+{
+    *rbuflen = 0;
+    return( AFPERR_NOOP );
+}
 
 static int set_auth_switch(int expired)
 {
@@ -189,6 +197,7 @@ static int set_auth_switch(int expired)
         case 31:
            uam_afpserver_action(AFP_SYNCDIR, UAM_AFPSERVER_POSTAUTH, afp_syncdir, NULL);
            uam_afpserver_action(AFP_SYNCFORK, UAM_AFPSERVER_POSTAUTH, afp_syncfork, NULL);
+           uam_afpserver_action(AFP_SPOTLIGHT_PRIVATE, UAM_AFPSERVER_POSTAUTH, afp_null_nolog, NULL);
            uam_afpserver_action(AFP_ENUMERATE_EXT2, UAM_AFPSERVER_POSTAUTH, afp_enumerate_ext2, NULL); 
         case 30:
            uam_afpserver_action(AFP_ENUMERATE_EXT, UAM_AFPSERVER_POSTAUTH, afp_enumerate_ext, NULL); 

diff --git a/include/atalk/afp.h b/include/atalk/afp.h
index 5b7ef635b914b38cfebb29284aa80e3dde8b715a..df1d0971daec73800553c802f24b065ab140dec9 100644 (file)
--- a/include/atalk/afp.h
+++ b/include/atalk/afp.h
@@ -199,6 +199,7 @@ typedef enum {
 
 /* version 3.1 */
 #define AFP_ENUMERATE_EXT2      68
+#define AFP_SPOTLIGHT_PRIVATE   76
 #define AFP_SYNCDIR             78
 #define AFP_SYNCFORK            79
 #define AFP_ZZZ                 122