Initial checkin of ACLs patch

[netatalk.git] / etc / afpd / switch.c

diff --git a/etc/afpd/switch.c b/etc/afpd/switch.c
index 7f7ce973fb527ef116cd2658ef02a91c898c98ae..fd9770841910f6da250aaa334c8371281bcc81e6 100644 (file)
--- a/etc/afpd/switch.c
+++ b/etc/afpd/switch.c
@@ -1,4 +1,6 @@
 /*
+ * $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.
  *
@@ -23,11 +25,11 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
 
 #include <stdio.h>  /* to pick up NULL */
 #include <sys/stat.h> /* works around a bug */
-#include <syslog.h>
+#include <atalk/logger.h>
 
 #include <atalk/afp.h>
 #include <atalk/uam.h>
@@ -44,13 +46,16 @@
 #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;
 {
-    syslog( LOG_INFO, "afp_null handle %d", *ibuf );
+    LOG(log_info, logtype_afpd, "afp_null handle %d", *ibuf );
     *rbuflen = 0;
     return( AFPERR_NOOP );
 }
@@ -70,13 +75,13 @@ 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,                           /*  56 -  63 */
     NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL,                                    /*  64 -  71 */
     NULL, NULL, NULL, NULL,
@@ -138,10 +143,10 @@ int       (*postauth_switch[])() = {
     afp_logout, afp_mapid, afp_mapname, afp_moveandrename,     /*  16 -  23 */
     afp_openvol, afp_opendir, afp_openfork, afp_read,
     afp_rename, afp_setdirparams, afp_setfilparams, afp_setforkparams,
-                                                               /*  24 -  31 */
+    /*  24 -  31 */
     afp_setvolparams, afp_write, afp_getfildirparams, afp_setfildirparams,
     afp_changepw, afp_getuserinfo, afp_getsrvrmesg, afp_createid, /*  32 -  39 */
-    afp_deleteid, afp_resolveid, afp_exchangefiles, afp_null /*afp_catsearch*/,
+    afp_deleteid, afp_resolveid, afp_exchangefiles, afp_catsearch,
     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 */
@@ -150,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,
@@ -201,26 +206,26 @@ 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;
-    break;
-  case UAM_AFPSERVER_POSTAUTH:
-    if (old)
-      *old = postauth_switch[id];
-    if (new)
-      postauth_switch[id] = *new;
-    break;
-  default:
-    syslog(LOG_DEBUG, "uam_afpserver_action: unknown switch %d[%d]", 
-          which, id);
-    return -1;
-  }
+    switch (which) {
+    case UAM_AFPSERVER_PREAUTH:
+        if (old)
+            *old = preauth_switch[id];
+        if (new)
+            preauth_switch[id] = new;
+        break;
+    case UAM_AFPSERVER_POSTAUTH:
+        if (old)
+            *old = postauth_switch[id];
+        if (new)
+            postauth_switch[id] = new;
+        break;
+    default:
+        LOG(log_debug, logtype_afpd, "uam_afpserver_action: unknown switch %d[%d]",
+            which, id);
+        return -1;
+    }
 
-  return 0;
+    return 0;
 }