cnid_t is a unsigned variable, Joe! Thanks to Didier for pointing this out.

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

diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c
index 68e33b76c798a277a2b3fa31122aace2925f4834..b732e57c2654f26cabd3762d6e8b32af14edd37e 100644 (file)
--- a/etc/afpd/afp_dsi.c
+++ b/etc/afpd/afp_dsi.c
@@ -1,5 +1,5 @@
 /*
- * $Id: afp_dsi.c,v 1.14 2001-12-23 01:19:55 jmarcus Exp $
+ * $Id: afp_dsi.c,v 1.18 2002-01-19 21:29:55 jmarcus Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
@@ -27,7 +27,7 @@
 #endif /* HAVE_SYS_STAT_H */
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <syslog.h>
+#include <atalk/logger.h>
 
 #include <atalk/dsi.h>
 #include <atalk/compat.h>
@@ -57,12 +57,13 @@ static __inline__ void afp_dsi_close(AFPObj *obj)
     if (obj->logout)
         (*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);
+    set_processname("afpd");
+    syslog_setup(log_debug, logtype_default, logoption_ndelay | logoption_pid, logfacility_daemon);
+    LOG(log_info, logtype_default, "%.2fKB read, %.2fKB written",
+        dsi->read_count/1024.0, dsi->write_count/1024.0);
+
+    dsi_close(dsi);
 }
 
 /* a little bit of code duplication. */
@@ -71,8 +72,8 @@ static void afp_dsi_die(int sig)
     dsi_attention(child.obj->handle, AFPATTN_SHUTDOWN);
     afp_dsi_close(child.obj);
     if (sig) /* if no signal, assume dieing because logins are disabled &
-            don't log it (maintenance mode)*/
-        syslog (LOG_INFO, "Connection terminated");
+                don't log it (maintenance mode)*/
+        LOG(log_info, logtype_default, "Connection terminated");
     if (sig == SIGTERM || sig == SIGALRM) {
         exit( 0 );
     }
@@ -97,7 +98,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: %s", strerror(errno) );
+        LOG(log_error, logtype_default, "afp_timedown: setitimer: %s", strerror(errno) );
         afp_dsi_die(1);
     }
 
@@ -108,7 +109,7 @@ 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: %s", strerror(errno) );
+        LOG(log_error, logtype_default, "afp_timedown: sigaction: %s", strerror(errno) );
         afp_dsi_die(1);
     }
 }
@@ -128,7 +129,7 @@ static void alarm_handler()
     if ((child.flags & CHILD_RUNNING) || (child.tickle++ < child.obj->options.timeout)) {
         dsi_tickle(child.obj->handle);
     } else { /* didn't receive a tickle. close connection */
-        syslog(LOG_ERR, "afp_alarm: child timed out");
+        LOG(log_error, logtype_default, "afp_alarm: child timed out");
         afp_dsi_die(1);
     }
 }
@@ -156,7 +157,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: %s", strerror(errno) );
+        LOG(log_error, logtype_default, "afp_over_dsi: sigaction: %s", strerror(errno) );
         afp_dsi_die(1);
     }
 
@@ -166,7 +167,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: %s", strerror(errno) );
+        LOG(log_error, logtype_default, "afp_over_dsi: sigaction: %s", strerror(errno) );
         afp_dsi_die(1);
     }
 
@@ -177,7 +178,7 @@ 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: %s", strerror(errno) );
+        LOG(log_error, logtype_default, "afp_over_dsi: sigaction: %s", strerror(errno) );
         afp_dsi_die(1);
     }
 #endif /* SERVERTEXT */
@@ -208,7 +209,7 @@ void afp_over_dsi(AFPObj *obj)
         switch(cmd) {
         case DSIFUNC_CLOSE:
             afp_dsi_close(obj);
-            syslog(LOG_INFO, "done");
+            LOG(log_info, logtype_default, "done");
             if (obj->options.flags & OPTION_DEBUG )
                 printf("done\n");
             return;
@@ -218,7 +219,7 @@ void afp_over_dsi(AFPObj *obj)
 #ifdef AFS
             if ( writtenfork ) {
                 if ( flushfork( writtenfork ) < 0 ) {
-                    syslog( LOG_ERR, "main flushfork: %s", strerror(errno) );
+                    LOG(log_error, logtype_default, "main flushfork: %s", strerror(errno) );
                 }
                 writtenfork = NULL;
             }
@@ -240,7 +241,7 @@ void afp_over_dsi(AFPObj *obj)
                                               dsi->data, &dsi->datalen);
                 child.flags &= ~CHILD_RUNNING;
             } else {
-                syslog(LOG_ERR, "bad function %X", function);
+                LOG(log_error, logtype_default, "bad function %X", function);
                 dsi->datalen = 0;
                 err = AFPERR_NOOP;
             }
@@ -257,7 +258,7 @@ void afp_over_dsi(AFPObj *obj)
             }
 
             if (!dsi_cmdreply(dsi, err)) {
-                syslog(LOG_ERR, "dsi_cmdreply(%d): %s", dsi->socket, strerror(errno) );
+                LOG(log_error, logtype_default, "dsi_cmdreply(%d): %s", dsi->socket, strerror(errno) );
                 afp_dsi_die(1);
             }
             break;
@@ -276,7 +277,7 @@ void afp_over_dsi(AFPObj *obj)
                                               dsi->data, &dsi->datalen);
                 child.flags &= ~CHILD_RUNNING;
             } else {
-                syslog( LOG_ERR, "(write) bad function %x", function);
+                LOG(log_error, logtype_default, "(write) bad function %x", function);
                 dsi->datalen = 0;
                 err = AFPERR_NOOP;
             }
@@ -287,7 +288,7 @@ void afp_over_dsi(AFPObj *obj)
             }
 
             if (!dsi_wrtreply(dsi, err)) {
-                syslog( LOG_ERR, "dsi_wrtreply: %s", strerror(errno) );
+                LOG(log_error, logtype_default, "dsi_wrtreply: %s", strerror(errno) );
                 afp_dsi_die(1);
             }
             break;
@@ -300,7 +301,7 @@ void afp_over_dsi(AFPObj *obj)
              * between server and client. if things are correct,
              * we need to flush the rest of the packet if necessary. */
         default:
-            syslog(LOG_INFO,"afp_dsi: spurious command %d", cmd);
+            LOG(log_info, logtype_default,"afp_dsi: spurious command %d", cmd);
             dsi_writeinit(dsi, dsi->data, DSI_DATASIZ);
             dsi_writeflush(dsi);
             break;