/*
+ * Copyright (c) 2008-2014, Simon Schubert <2@0x2c.org>.
* Copyright (c) 2008 The DragonFly Project. All rights reserved.
*
* This code is derived from software contributed to The DragonFly Project
- * by Simon 'corecode' Schubert <corecode@fs.ei.tum.de> and
+ * by Simon Schubert <2@0x2c.org> and
* Matthias Schmidt <matthias@dragonflybsd.org>.
*
* Redistribution and use in source and binary forms, with or without
#include <arpa/inet.h>
#include <openssl/ssl.h>
#include <netdb.h>
+#include <sysexits.h>
-#ifndef __unused
-#ifdef __GNUC__
-#define __unused __attribute__((unused))
-#else
-#define __unused
-#endif /* __GNUC__ */
-#endif
-
-#define VERSION "DragonFly Mail Agent"
+#define VERSION "DragonFly Mail Agent " DMA_VERSION
#define BUF_SIZE 2048
+#define ERRMSG_SIZE 1024
+#define USERNAME_SIZE 50
+#define EHLO_RESPONSE_SIZE BUF_SIZE
#define MIN_RETRY 300 /* 5 minutes */
#define MAX_RETRY (3*60*60) /* retry at least every 3 hours */
#define MAX_TIMEOUT (5*24*60*60) /* give up after 5 days */
+#define SLEEP_TIMEOUT 30 /* check for queue flush every 30 seconds */
#ifndef PATH_MAX
#define PATH_MAX 1024 /* Max path len */
#endif
#define SMTP_PORT 25 /* Default SMTP port */
-#define CON_TIMEOUT 120 /* Connection timeout */
+#define CON_TIMEOUT (5*60) /* Connection timeout per RFC5321 */
-#define VIRTUAL 0x001 /* Support for address rewrites */
#define STARTTLS 0x002 /* StartTLS support */
#define SECURETRANS 0x004 /* SSL/TLS in general */
#define NOSSL 0x008 /* Do not use SSL */
#define DEFER 0x010 /* Defer mails */
#define INSECURE 0x020 /* Allow plain login w/o encryption */
#define FULLBOUNCE 0x040 /* Bounce the full message */
+#define TLS_OPP 0x080 /* Opportunistic STARTTLS */
+#define NULLCLIENT 0x100 /* Nullclient support */
#ifndef CONF_PATH
-#define CONF_PATH "/etc/dma/dma.conf" /* Default path to dma.conf */
+#error Please define CONF_PATH
#endif
+#ifndef LIBEXEC_PATH
+#error Please define LIBEXEC_PATH
+#endif
+
+#define SPOOL_FLUSHFILE "flush"
+
+#ifndef DMA_ROOT_USER
+#define DMA_ROOT_USER "mail"
+#endif
+#ifndef DMA_GROUP
+#define DMA_GROUP "mail"
+#endif
+
+#ifndef MBOX_STRICT
+#define MBOX_STRICT 0
+#endif
+
+
struct stritem {
SLIST_ENTRY(stritem) next;
char *str;
int port;
const char *aliases;
const char *spooldir;
- const char *virtualpath;
const char *authpath;
const char *certfile;
int features;
const char *mailname;
- const char *mailnamefile;
+ const char *masquerade_host;
+ const char *masquerade_user;
/* XXX does not belong into config */
SSL *ssl;
};
-struct virtuser {
- SLIST_ENTRY(virtuser) next;
- char *login;
- char *address;
-};
-SLIST_HEAD(virtusers, virtuser);
-
struct authuser {
SLIST_ENTRY(authuser) next;
char *login;
struct sockaddr_storage sa;
};
+struct smtp_auth_mechanisms {
+ int cram_md5;
+ int login;
+};
+
+struct smtp_features {
+ struct smtp_auth_mechanisms auth;
+ int starttls;
+};
/* global variables */
extern struct aliases aliases;
extern struct config config;
extern struct strlist tmpfs;
-extern struct virtusers virtusers;
extern struct authusers authusers;
-extern const char *username;
+extern char username[USERNAME_SIZE];
+extern uid_t useruid;
extern const char *logident_base;
-extern char neterr[BUF_SIZE];
+extern char neterr[ERRMSG_SIZE];
+extern char errmsg[ERRMSG_SIZE];
/* aliases_parse.y */
int yyparse(void);
+int yywrap(void);
+int yylex(void);
extern FILE *yyin;
/* conf.c */
void trim_line(char *);
void parse_conf(const char *);
-void parse_virtuser(const char *);
void parse_authfile(const char *);
/* crypto.c */
-void hmac_md5(unsigned char *, int, unsigned char *, int, caddr_t);
+void hmac_md5(unsigned char *, int, unsigned char *, int, unsigned char *);
int smtp_auth_md5(int, char *, char *);
-int smtp_init_crypto(int, int);
+int smtp_init_crypto(int, int, struct smtp_features*);
/* dns.c */
int dns_get_mx_list(const char *, int, struct mx_hostentry **, int);
/* net.c */
char *ssl_errstr(void);
int read_remote(int, int, char *);
-ssize_t send_remote_command(int, const char*, ...);
-int deliver_remote(struct qitem *, const char **);
+ssize_t send_remote_command(int, const char*, ...) __attribute__((__nonnull__(2), __format__ (__printf__, 2, 3)));
+int perform_server_greeting(int, struct smtp_features*);
+int deliver_remote(struct qitem *);
/* base64.c */
int base64_encode(const void *, int, char **);
int base64_decode(const char *, void *);
/* dma.c */
+#define EXPAND_ADDR 1
+#define EXPAND_WILDCARD 2
int add_recp(struct queue *, const char *, int);
void run_queue(struct queue *);
void delqueue(struct qitem *);
int acquirespool(struct qitem *);
void dropspool(struct queue *, struct qitem *);
+int flushqueue_since(unsigned int);
+int flushqueue_signal(void);
/* local.c */
-int deliver_local(struct qitem *, const char **errmsg);
+int deliver_local(struct qitem *);
/* mail.c */
void bounce(struct qitem *, const char *);
/* util.c */
const char *hostname(void);
-void setlogident(const char *, ...);
-void errlog(int, const char *, ...);
-void errlogx(int, const char *, ...);
+void setlogident(const char *, ...) __attribute__((__format__ (__printf__, 1, 2)));
+void errlog(int, const char *, ...) __attribute__((__format__ (__printf__, 2, 3)));
+void errlogx(int, const char *, ...) __attribute__((__format__ (__printf__, 2, 3)));
void set_username(void);
void deltmp(void);
+int do_timeout(int, int);
int open_locked(const char *, int, ...);
char *rfc822date(void);
int strprefixcmp(const char *, const char *);
+void init_random(void);
#endif