%m -> %s strerror(errno) (Warnings)

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

diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c
index a0624ec51bf0b89ad41b79af8ede33df35461927..98ae7fc91601a9bd5924e2ce68e217817372b196 100644 (file)
--- a/etc/afpd/afp_dsi.c
+++ b/etc/afpd/afp_dsi.c
@@ -1,4 +1,6 @@
 /* 
+ * $Id: afp_dsi.c,v 1.9 2001-11-14 21:45:12 srittau Exp $
+ *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -8,16 +10,21 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <string.h>
+#include <errno.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif /* HAVE_UNISTD_H */
 #include <sys/socket.h>
 #include <sys/time.h>
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif /* HAVE_SYS_STAT_H */
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <syslog.h>
@@ -50,6 +57,9 @@ static __inline__ void afp_dsi_close(AFPObj *obj)
       (*obj->logout)();
                      
     dsi_close(dsi);
+
+    /* UAM had syslog control; afpd needs to reassert itself */
+    openlog( "afpd", LOG_NDELAY|LOG_PID, LOG_DAEMON);
     syslog(LOG_INFO, "%.2fKB read, %.2fKB written",
           dsi->read_count/1024.0, dsi->write_count/1024.0);
 }
@@ -59,10 +69,15 @@ static void afp_dsi_die(int sig)
 {
     dsi_attention(child.obj->handle, AFPATTN_SHUTDOWN);
     afp_dsi_close(child.obj);
-    if (sig == SIGTERM || sig == SIGALRM)
+    if (sig) /* if no signal, assume dieing because logins are disabled &
+       don't log it (maintenance mode)*/
+      syslog (LOG_INFO, "Connection terminated");
+    if (sig == SIGTERM || sig == SIGALRM) {
       exit( 0 );
-    else
+    }
+    else {
       exit(sig);
+    }
 }
 
 static void afp_dsi_timedown()
@@ -81,7 +96,7 @@ static void afp_dsi_timedown()
     it.it_value.tv_sec = 300;
     it.it_value.tv_usec = 0;
     if ( setitimer( ITIMER_REAL, &it, 0 ) < 0 ) {
-       syslog( LOG_ERR, "afp_timedown: setitimer: %m" );
+       syslog( LOG_ERR, "afp_timedown: setitimer: %s", strerror(errno) );
        afp_dsi_die(1);
     }
 
@@ -92,18 +107,18 @@ static void afp_dsi_timedown()
     sigaddset(&sv.sa_mask, SIGTERM);
     sv.sa_flags = SA_RESTART;
     if ( sigaction( SIGALRM, &sv, 0 ) < 0 ) {
-       syslog( LOG_ERR, "afp_timedown: sigaction: %m" );
+       syslog( LOG_ERR, "afp_timedown: sigaction: %s", strerror(errno) );
        afp_dsi_die(1);
     }
 }
 
 #ifdef SERVERTEXT
-static void afp_dsi_getmesg (void)
+static void afp_dsi_getmesg (int sig)
 {
       readmessage();
-      dsi_attention(child.dsi, AFPATTN_MESG | AFPATTN_TIME(5));
+      dsi_attention(child.obj->handle, AFPATTN_MESG | AFPATTN_TIME(5));
 }
-#endif
+#endif /* SERVERTEXT */
 
 static void alarm_handler()
 {
@@ -140,7 +155,7 @@ void afp_over_dsi(AFPObj *obj)
   sigaddset(&action.sa_mask, SIGTERM);
   action.sa_flags = SA_RESTART;
   if ( sigaction( SIGHUP, &action, 0 ) < 0 ) {
-    syslog( LOG_ERR, "afp_over_dsi: sigaction: %m" );
+    syslog( LOG_ERR, "afp_over_dsi: sigaction: %s", strerror(errno) );
     afp_dsi_die(1);
   }
 
@@ -150,7 +165,7 @@ void afp_over_dsi(AFPObj *obj)
   sigaddset(&action.sa_mask, SIGHUP);
   action.sa_flags = SA_RESTART;
   if ( sigaction( SIGTERM, &action, 0 ) < 0 ) {
-    syslog( LOG_ERR, "afp_over_dsi: sigaction: %m" );
+    syslog( LOG_ERR, "afp_over_dsi: sigaction: %s", strerror(errno) );
     afp_dsi_die(1);
   }
 
@@ -161,10 +176,10 @@ void afp_over_dsi(AFPObj *obj)
   sigaddset(&action.sa_mask, SIGUSR2);
   action.sa_flags = SA_RESTART;
   if ( sigaction( SIGUSR2, &action, 0) < 0 ) {
-    syslog( LOG_ERR, "afp_over_dsi: sigaction: %m" );
+    syslog( LOG_ERR, "afp_over_dsi: sigaction: %s", strerror(errno) );
     afp_dsi_die(1);
   }
-#endif
+#endif /* SERVERTEXT */
 
   /* tickle handler */
   action.sa_handler = alarm_handler;
@@ -202,11 +217,11 @@ void afp_over_dsi(AFPObj *obj)
 #ifdef AFS
       if ( writtenfork ) {
        if ( flushfork( writtenfork ) < 0 ) {
-         syslog( LOG_ERR, "main flushfork: %m" );
+         syslog( LOG_ERR, "main flushfork: %s", strerror(errno) );
        }
        writtenfork = NULL;
       }
-#endif AFS
+#endif /* AFS */
 
       function = (u_char) dsi->commands[0];
       if (obj->options.flags & OPTION_DEBUG ) {
@@ -241,7 +256,7 @@ void afp_over_dsi(AFPObj *obj)
       }
 
       if (!dsi_cmdreply(dsi, err)) {
-       syslog(LOG_ERR, "dsi_cmdreply(%d): %m", dsi->socket);
+       syslog(LOG_ERR, "dsi_cmdreply(%d): %s", dsi->socket, strerror(errno) );
        afp_dsi_die(1);
       }
       break;
@@ -249,7 +264,7 @@ void afp_over_dsi(AFPObj *obj)
     case DSIFUNC_WRITE: /* FPWrite and FPAddIcon */
       function = (u_char) dsi->commands[0];
       if ( obj->options.flags & OPTION_DEBUG ) {
-       printf("(write) command: %d, %ld\n", function, dsi->cmdlen);
+       printf("(write) command: %d, %d\n", function, dsi->cmdlen);
        bprint(dsi->commands, dsi->cmdlen);
       }
 
@@ -271,7 +286,7 @@ void afp_over_dsi(AFPObj *obj)
       }
 
       if (!dsi_wrtreply(dsi, err)) {
-       syslog( LOG_ERR, "dsi_wrtreply: %m" );
+       syslog( LOG_ERR, "dsi_wrtreply: %s", strerror(errno) );
        afp_dsi_die(1);
       }
       break;
@@ -293,7 +308,7 @@ void afp_over_dsi(AFPObj *obj)
     if ( obj->options.flags & OPTION_DEBUG ) {
 #ifdef notdef
       pdesc( stdout );
-#endif notdef
+#endif /* notdef */
       of_pforkdesc( stdout );
       fflush( stdout );
     }