/*
- * $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.
*/
#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>
#include <atalk/afp.h>
#include <atalk/dsi.h>
#include <atalk/util.h>
+#include <atalk/unix.h>
#include <atalk/logger.h>
-#include "globals.h"
-#include "misc.h"
+#include <atalk/globals.h>
+#include "misc.h"
#define MAXMESGSIZE 199
unsigned int i;
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] */
/* 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));
- }
+ become_root();
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);
- }
+ unbecome_root();
if (rc < 0) {
LOG(log_error, logtype_afpd, "Error deleting %s: %s", filename, strerror(rc));
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));
* it has asked the login msg...
* Workaround: concatenate the two if any, ugly.
*/
- if (*message && *obj->options.loginmesg) {
- strlcat(message, " - ", MAXMESGSIZE);
+ if (obj->options.loginmesg) {
+ if (*message)
+ strlcat(message, " - ", MAXMESGSIZE);
+ strlcat(message, obj->options.loginmesg, MAXMESGSIZE);
}
- strlcat(message, obj->options.loginmesg, MAXMESGSIZE);
break;
case AFPMESG_SERVER: /* server */
break;