/*
- * $Id: messages.c,v 1.22 2009-10-29 13:38:15 didg Exp $
+ * $Id: messages.c,v 1.23 2009-11-24 15:44:40 didg Exp $
*
* Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
* All Rights Reserved. See COPYRIGHT.
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");
}
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 (*message && *obj->options.loginmesg) {
+ strlcat(message, " - ", MAXMESGSIZE);
+ }
+ strlcat(message, obj->options.loginmesg, MAXMESGSIZE);
break;
case AFPMESG_SERVER: /* server */
- message = servermesg;
break;
default:
return AFPERR_BITMAP;
*rbuflen += 1;
}
*rbuflen += outlen;
-
+ *message = 0;
return AFP_OK;
}