big merge for db frontend and unicode.

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

diff --git a/etc/afpd/afp_asp.c b/etc/afpd/afp_asp.c
index e822a89ed37b2e47a2eab3774d7f391b4607bca9..477217f1a778e5d95b18738ecd716c0ce0c6a59d 100644 (file)
--- a/etc/afpd/afp_asp.c
+++ b/etc/afpd/afp_asp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: afp_asp.c,v 1.18 2002-12-04 10:59:36 didg Exp $
+ * $Id: afp_asp.c,v 1.18.6.1 2003-09-09 16:42:19 didg Exp $
  *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
@@ -53,6 +53,7 @@ static __inline__ void afp_asp_close(AFPObj *obj)
 {
     ASP asp = obj->handle;
 
+    close_all_vol();
     if (obj->options.authprintdir) afp_authprint_remove(obj);
 
     if (obj->logout)
@@ -175,6 +176,16 @@ static void afp_asp_timedown()
     }
 }
 
+/* ---------------------- */
+#ifdef SERVERTEXT
+static void afp_asp_getmesg (int sig)
+{
+    readmessage(child);
+    asp_attention(child->handle, AFPATTN_MESG | AFPATTN_TIME(5));
+}
+#endif /* SERVERTEXT */
+
+
 void afp_over_asp(AFPObj *obj)
 {
     ASP asp;
@@ -205,6 +216,19 @@ void afp_over_asp(AFPObj *obj)
         afp_asp_die(1);
     }
 
+#ifdef SERVERTEXT
+    /* Added for server message support */
+    action.sa_handler = afp_asp_getmesg;
+    sigemptyset( &action.sa_mask );
+    sigaddset(&action.sa_mask, SIGUSR2);
+    action.sa_flags = SA_RESTART;
+    if ( sigaction( SIGUSR2, &action, 0) < 0 ) {
+        LOG(log_error, logtype_afpd, "afp_over_asp: sigaction: %s", strerror(errno) );
+        afp_asp_die(1);
+    }
+#endif /* SERVERTEXT */
+
+
     LOG(log_info, logtype_afpd, "session from %u.%u:%u on %u.%u:%u",
         ntohs( asp->asp_sat.sat_addr.s_net ),
         asp->asp_sat.sat_addr.s_node, asp->asp_sat.sat_port,