-/*
+/*
+ * $Id: messages.c,v 1.16 2002-03-24 01:23:41 sibaz Exp $
+ *
* Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
* All Rights Reserved. See COPYRIGHT.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
#include <stdio.h>
#include <string.h>
+#include <errno.h>
#include <atalk/afp.h>
-#include <syslog.h>
+#include <atalk/logger.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif /* HAVE_UNISTD_H */
#include "globals.h"
#include "misc.h"
void setmessage(const char *message)
{
- strncpy(servermesg, message, MAXMESGSIZE);
+ strncpy(servermesg, message, MAXMESGSIZE);
}
void readmessage(void)
{
-/* Read server message from file defined as SERVERTEXT */
+ /* Read server message from file defined as SERVERTEXT */
#ifdef SERVERTEXT
- FILE *message;
- char * filename;
- int i;
- static int c;
-
- i=0;
- // Construct file name SERVERTEXT/message.[pid]
- filename=malloc(sizeof(SERVERTEXT)+15);
- sprintf(filename, "%s/message.%d", SERVERTEXT, getpid());
-
- syslog (LOG_DEBUG, "Reading file %s ", filename);
-
- message=fopen(filename, "r");
- if (message==NULL) {
- syslog (LOG_INFO, "Unable to open file %s", filename);
- sprintf(filename, "%s/message", SERVERTEXT);
+ FILE *message;
+ char * filename;
+ int i, rc;
+ static int c;
+ uid_t euid;
+
+ i=0;
+ /* Construct file name SERVERTEXT/message.[pid] */
+ filename=malloc(sizeof(SERVERTEXT)+15);
+ sprintf(filename, "%s/message.%d", SERVERTEXT, getpid());
+
+#ifdef DEBUG
+ LOG(log_debug, logtype_afpd, "Reading file %s ", filename);
+#endif /* DEBUG */
+
message=fopen(filename, "r");
- }
-
- if (message!=NULL) /* if either message.pid or message exists */
- {
- /* added while loop to get characters and put in servermesg */
- while ((( c=fgetc(message)) != EOF) && (i < (MAXMESGSIZE - 1))) {
- if ( c == '\n') c = ' ';
- servermesg[i++] = c;
- }
- servermesg[i] = 0;
-
- /* cleanup */
- fclose(message);
-/* Below code can be uncommented if you want to experiment with getting afpd
-to delete the text file when it's done. Currently, it doesn't work. If you
-can get it to work, delete this comment and enable the code! */
-/* i=unlink (filename);
- if (i)
- syslog (LOG_INFO, "Error deleting %s: %m", filename);
- else
- syslog (LOG_DEBUG, "Deleted %s", filename);
- free (filename);
-
- syslog (LOG_DEBUG, "Set server message to \"%s\"", servermesg); */
- }
- free(filename);
-#endif
+ if (message==NULL) {
+ LOG(log_info, logtype_afpd, "Unable to open file %s", filename);
+ sprintf(filename, "%s/message", SERVERTEXT);
+ message=fopen(filename, "r");
+ }
+
+ /* if either message.pid or message exists */
+ if (message!=NULL) {
+ /* added while loop to get characters and put in servermesg */
+ while ((( c=fgetc(message)) != EOF) && (i < (MAXMESGSIZE - 1))) {
+ if ( c == '\n') c = ' ';
+ servermesg[i++] = c;
+ }
+ servermesg[i] = 0;
+
+ /* cleanup */
+ fclose(message);
+
+ /* Save effective uid and switch to root to delete file. */
+ /* Delete will probably fail otherwise, but let's try anyways */
+ euid = geteuid();
+ if (seteuid(0) < 0) {
+ LOG(log_error, logtype_afpd, "Could not switch back to root: %s",
+ strerror(errno));
+ }
+
+ rc = unlink(filename);
+
+ /* 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));
+ }
+
+ if (rc < 0) {
+ LOG(log_error, logtype_afpd, "Error deleting %s: %s", filename, strerror(rc));
+ }
+#ifdef DEBUG
+ else {
+ LOG(log_info, logtype_afpd, "Deleted %s", filename);
+ }
+
+ LOG(log_info, logtype_afpd, "Set server message to \"%s\"", servermesg);
+#endif /* DEBUG */
+ }
+ free(filename);
+#endif /* SERVERTEXT */
}
int afp_getsrvrmesg(obj, ibuf, ibuflen, rbuf, rbuflen)
- AFPObj *obj;
- char *ibuf, *rbuf;
- int ibuflen, *rbuflen;
+AFPObj *obj;
+char *ibuf, *rbuf;
+int ibuflen, *rbuflen;
{
- char *message;
- u_int16_t type, bitmap;
-
- memcpy(&type, ibuf + 2, sizeof(type));
- memcpy(&bitmap, ibuf + 4, sizeof(bitmap));
-
- switch (ntohs(type)) {
- case AFPMESG_LOGIN: /* login */
- message = obj->options.loginmesg;
- break;
- case AFPMESG_SERVER: /* server */
- message = servermesg;
- break;
- default:
- *rbuflen = 0;
- return AFPERR_BITMAP;
- }
-
- if(strlen(message)==0)
- return AFP_OK;
+ char *message;
+ u_int16_t type, bitmap;
+
+ memcpy(&type, ibuf + 2, sizeof(type));
+ memcpy(&bitmap, ibuf + 4, sizeof(bitmap));
+
+ switch (ntohs(type)) {
+ case AFPMESG_LOGIN: /* login */
+ message = obj->options.loginmesg;
+ break;
+ case AFPMESG_SERVER: /* server */
+ message = servermesg;
+ break;
+ default:
+ *rbuflen = 0;
+ return AFPERR_BITMAP;
+ }
+
+ /* output format:
+ * message type: 2 bytes
+ * bitmap: 2 bytes
+ * message length: 1 byte
+ * message: up to 199 bytes
+ */
+ memcpy(rbuf, &type, sizeof(type));
+ rbuf += sizeof(type);
+ memcpy(rbuf, &bitmap, sizeof(bitmap));
+ rbuf += sizeof(bitmap);
+ *rbuflen = strlen(message);
+ if (*rbuflen > MAXMESGSIZE)
+ *rbuflen = MAXMESGSIZE;
+ *rbuf++ = *rbuflen;
+ memcpy(rbuf, message, *rbuflen);
+
+ *rbuflen += 5;
- /* output format:
- * message type: 2 bytes
- * bitmap: 2 bytes
- * message length: 1 byte
- * message: up to 199 bytes
- */
- memcpy(rbuf, &type, sizeof(type));
- rbuf += sizeof(type);
- memcpy(rbuf, &bitmap, sizeof(bitmap));
- rbuf += sizeof(bitmap);
- *rbuflen = strlen(message);
- if (*rbuflen > MAXMESGSIZE)
- *rbuflen = MAXMESGSIZE;
- *rbuf++ = *rbuflen;
- memcpy(rbuf, message, *rbuflen);
-
- *rbuflen += 5;
-
- return AFP_OK;
+ return AFP_OK;
}
projects / netatalk.git / blobdiff