Reworked logger

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

diff --git a/etc/afpd/auth.c b/etc/afpd/auth.c
index 398eee2e6e371f4cf339d934aa86a53fe13015f7..836cd375bd9ae36074a46fff2d012270f1cbd1dd 100644 (file)
--- a/etc/afpd/auth.c
+++ b/etc/afpd/auth.c
@@ -1,5 +1,5 @@
 /*
- * $Id: auth.c,v 1.57 2009-02-25 16:14:08 franklahm Exp $
+ * $Id: auth.c,v 1.61 2009-02-27 09:14:40 franklahm Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -170,6 +170,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)
 {
@@ -194,22 +202,22 @@ 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(73, UAM_AFPSERVER_POSTAUTH, afp_getacl, NULL);
-           uam_afpserver_action(74, UAM_AFPSERVER_POSTAUTH, afp_setacl, NULL);
-           uam_afpserver_action(75, UAM_AFPSERVER_POSTAUTH, afp_access, NULL);
+           uam_afpserver_action(AFP_GETACL, UAM_AFPSERVER_POSTAUTH, afp_getacl, NULL);
+           uam_afpserver_action(AFP_SETACL, UAM_AFPSERVER_POSTAUTH, afp_setacl, NULL);
+           uam_afpserver_action(AFP_ACCESS, UAM_AFPSERVER_POSTAUTH, afp_access, NULL);
 #endif
 #ifdef HAVE_EXT_ATTRS
-           uam_afpserver_action(69, UAM_AFPSERVER_POSTAUTH, afp_getextattr, NULL);
-           uam_afpserver_action(70, UAM_AFPSERVER_POSTAUTH, afp_setextattr, NULL);
-           uam_afpserver_action(71, UAM_AFPSERVER_POSTAUTH, afp_remextattr, NULL);
-           uam_afpserver_action(72, UAM_AFPSERVER_POSTAUTH, afp_listextattr, NULL);
+           uam_afpserver_action(AFP_GETEXTATTR, UAM_AFPSERVER_POSTAUTH, afp_getextattr, NULL);
+           uam_afpserver_action(AFP_SETEXTATTR, UAM_AFPSERVER_POSTAUTH, afp_setextattr, NULL);
+           uam_afpserver_action(AFP_REMOVEATTR, UAM_AFPSERVER_POSTAUTH, afp_remextattr, NULL);
+           uam_afpserver_action(AFP_LISTEXTATTR, UAM_AFPSERVER_POSTAUTH, afp_listextattr, NULL);
 #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, NULL);
-           uam_afpserver_action(78, UAM_AFPSERVER_POSTAUTH, afp_syncdir, NULL);
-           uam_afpserver_action(79, 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); 
@@ -240,9 +248,9 @@ static int login(AFPObj *obj, struct passwd *pwd, void (*logout)(void), int expi
     int admin = 0;
 #endif /* ADMIN_GRP */
 
-    /* UAM had syslog control; afpd needs to reassert itself */
+#if 0
     set_processname("afpd");
-    syslog_setup(log_debug, logtype_default, logoption_ndelay|logoption_pid, logfacility_daemon);
+#endif
 
     if ( pwd->pw_uid == 0 ) {  /* don't allow root login */
         LOG(log_error, logtype_afpd, "login: root login denied!" );
@@ -939,12 +947,9 @@ AFPObj  *obj _U_;
 char   *ibuf, *rbuf;
 int    ibuflen _U_, *rbuflen;
 {
-    int ret;
     u_int8_t  thisuser;
     u_int32_t id;
     u_int16_t bitmap;
-    uuid_t uuid;
-    char *uuidstring;
 
     LOG(log_debug, logtype_afpd, "begin afp_getuserinfo:");
 
@@ -985,6 +990,10 @@ int        ibuflen _U_, *rbuflen;
 
 #ifdef HAVE_NFSv4_ACLS
     if (bitmap & USERIBIT_UUID) {
+        int ret;
+        uuid_t uuid;
+        char *uuidstring;
+        
        if ( ! (obj->options.flags & OPTION_UUID))
            return AFPERR_BITMAP;
        LOG(log_debug, logtype_afpd, "afp_getuserinfo: get UUID for \'%s\'", obj->username);