Merge remote branch 'sf/product-2-2' into develop

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

diff --git a/etc/afpd/messages.c b/etc/afpd/messages.c
index d5afefd9f5f385e38560d5d99425a00b28b94fb2..241f0d08166a166ed2a4b22f8d8b5e088c0b7876 100644 (file)
--- a/etc/afpd/messages.c
+++ b/etc/afpd/messages.c
@@ -1,6 +1,4 @@
 /*
- * $Id: messages.c,v 1.19 2009-10-13 22:55:37 didg Exp $
- *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved.  See COPYRIGHT.
  */
@@ -9,9 +7,7 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
@@ -20,9 +16,9 @@
 #include <atalk/dsi.h>
 #include <atalk/util.h>
 #include <atalk/logger.h>
-#include "globals.h"
-#include "misc.h"
+#include <atalk/globals.h>
 
+#include "misc.h"
 
 #define MAXMESGSIZE 199
 
@@ -45,9 +41,9 @@ void readmessage(AFPObj *obj)
     int rc;
     static int c;
     uid_t euid;
-    u_int32_t maxmsgsize;
+    uint32_t maxmsgsize;
 
-    maxmsgsize = (obj->proto == AFPPROTO_DSI)?MIN(MAX(((DSI*)obj->handle)->attn_quantum, MAXMESGSIZE),MAXPATHLEN):MAXMESGSIZE;
+    maxmsgsize = MIN(MAX(obj->dsi->attn_quantum, MAXMESGSIZE), MAXPATHLEN);
 
     i=0;
     /* Construct file name SERVERTEXT/message.[pid] */
@@ -59,12 +55,12 @@ void readmessage(AFPObj *obj)
     sprintf(filename, "%s/message.%d", SERVERTEXT, getpid());
 
 #ifdef DEBUG
-    LOG(log_debug, logtype_afpd, "Reading file %s ", filename);
-#endif /* DEBUG */
+    LOG(log_debug9, logtype_afpd, "Reading file %s ", filename);
+#endif 
 
     message=fopen(filename, "r");
     if (message==NULL) {
-        LOG(log_info, logtype_afpd, "Unable to open file %s", filename);
+        /* try without the process id */
         sprintf(filename, "%s/message", SERVERTEXT);
         message=fopen(filename, "r");
     }
@@ -89,12 +85,13 @@ void readmessage(AFPObj *obj)
                                strerror(errno));
         }
 
-        if ( 0 < (rc = unlink(filename)) )
+        if ((rc = unlink(filename)) != 0)
            LOG(log_error, logtype_afpd, "File '%s' could not be deleted", strerror(errno));
 
         /* Drop privs again, failing this is very bad */
         if (seteuid(euid) < 0) {
             LOG(log_error, logtype_afpd, "Could not switch back to uid %d: %s", euid, strerror(errno));
+            exit(EXITERR_SYS);
         }
 
         if (rc < 0) {
@@ -102,38 +99,47 @@ void readmessage(AFPObj *obj)
         }
 #ifdef DEBUG
         else {
-            LOG(log_info, logtype_afpd, "Deleted %s", filename);
+            LOG(log_debug9, logtype_afpd, "Deleted %s", filename);
         }
 
-        LOG(log_info, logtype_afpd, "Set server message to \"%s\"", servermesg);
-#endif /* DEBUG */
+        LOG(log_debug9, logtype_afpd, "Set server message to \"%s\"", servermesg);
+#endif
     }
     free(filename);
 #endif /* SERVERTEXT */
 }
 
-int afp_getsrvrmesg(AFPObj *obj, char *ibuf, int ibuflen _U_, char *rbuf, int *rbuflen)
+int afp_getsrvrmesg(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *rbuflen)
 {
     char *message;
-    u_int16_t type, bitmap;
-    u_int16_t msgsize;
+    uint16_t type, bitmap;
+    uint16_t msgsize;
     size_t outlen = 0;
     size_t msglen = 0;
     int utf8 = 0;
 
     *rbuflen = 0;
 
-    msgsize = (obj->proto == AFPPROTO_DSI)?MAX(((DSI*)obj->handle)->attn_quantum, MAXMESGSIZE):MAXMESGSIZE;
+    msgsize = MAX(obj->dsi->attn_quantum, MAXMESGSIZE);
 
     memcpy(&type, ibuf + 2, sizeof(type));
     memcpy(&bitmap, ibuf + 4, sizeof(bitmap));
 
+    message = servermesg;
     switch (ntohs(type)) {
     case AFPMESG_LOGIN: /* login */
-        message = obj->options.loginmesg;
+        /* at least TIGER loses server messages
+         * if it receives a server msg attention before
+         * it has asked the login msg...
+         * Workaround: concatenate the two if any, ugly.
+         */
+        if (obj->options.loginmesg) {
+            if (*message)
+                strlcat(message, " - ", MAXMESGSIZE);
+            strlcat(message, obj->options.loginmesg, MAXMESGSIZE);
+        }
         break;
     case AFPMESG_SERVER: /* server */
-        message = servermesg;
         break;
     default:
         return AFPERR_BITMAP;
@@ -181,6 +187,6 @@ int afp_getsrvrmesg(AFPObj *obj, char *ibuf, int ibuflen _U_, char *rbuf, int *r
        *rbuflen += 1;
     }
     *rbuflen += outlen;
-
+    *message = 0;
     return AFP_OK;
 }