diff options
| author |   Eric Faurot <eric@faurot.net> | 2014-06-10 13:51:51 +0200 |
|---|---|---|
| committer | Eric Faurot <eric@faurot.net> | 2014-06-10 13:51:51 +0200 |
| commit | 7b3c64eca5d3b05fe1afd72ea39e3cec8bd073a8 (patch) | |
| tree | 04985f6a28065782e6e70f3bc167fc5f93a70b94 /smtpd/queue_ram.c | |
| parent | Merge branch 'master' into portable (diff) | |
| parent | Various queue-proce related updates: (diff) | |
| download | OpenSMTPD-7b3c64eca5d3b05fe1afd72ea39e3cec8bd073a8.tar.xz OpenSMTPD-7b3c64eca5d3b05fe1afd72ea39e3cec8bd073a8.zip | |
Merge branch 'master' into portable
Conflicts:
smtpd/smtpd.h
Diffstat (limited to 'smtpd/queue_ram.c')
| -rw-r--r-- | smtpd/queue_ram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/smtpd/queue_ram.c b/smtpd/queue_ram.c index 6b8a0675..7a6641d4 100644 --- a/smtpd/queue_ram.c +++ b/smtpd/queue_ram.c @@ -320,7 +320,7 @@ queue_ram_envelope_walk(uint64_t *evpid, char *buf, size_t len) } static int -queue_ram_init(struct passwd *pw, int server) +queue_ram_init(struct passwd *pw, int server, const char * conf) { tree_init(&messages); |