diff options
| author |   Gilles Chehade <gilles@poolp.org> | 2018-12-14 19:47:48 +0100 |
|---|---|---|
| committer | Gilles Chehade <gilles@poolp.org> | 2018-12-14 19:47:48 +0100 |
| commit | c5d43eb8017b0631dd1236a02e5f3c874ab18e43 (patch) | |
| tree | b2c7e9398333a8b3b70ab633f67857f808b514d0 | |
| parent | unbreak building with db (diff) | |
| download | OpenSMTPD-opensmtpd-6.4.1p1.tar.xz OpenSMTPD-opensmtpd-6.4.1p1.zip | |
fix packaging reported by Michael Figiel <mifigiel@gmail.com>opensmtpd-6.4.1p1
| -rw-r--r-- | mk/smtpctl/Makefile.am | 6 | ||||
| -rw-r--r-- | smtpd/lka_session.c | 2 | ||||
| -rw-r--r-- | smtpd/parse.y | 20 |
3 files changed, 14 insertions, 14 deletions
diff --git a/mk/smtpctl/Makefile.am b/mk/smtpctl/Makefile.am index ee3fe4c8..54bc1170 100644 --- a/mk/smtpctl/Makefile.am +++ b/mk/smtpctl/Makefile.am @@ -34,7 +34,7 @@ endif smtpctl_SOURCES+= $(smtpd_srcdir)/crypto.c -smtpctl_CFLAGS= -DNO_IO +smtpctl_CFLAGS= -DNO_IO -DCONFIG_MINIMUM smtpctl_CFLAGS+= -DPATH_GZCAT=\"$(ZCAT)\" \ -DPATH_ENCRYPT=\"$(pkglibexecdir)/encrypt\" @@ -80,8 +80,8 @@ $(MANPAGES): $(MANPAGES_IN) install-exec-hook: $(CONFIGFILES) $(MANPAGES) $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 - chgrp $(SMTPD_QUEUE_USER) $(DESTDIR)$(sbindir)/smtpctl - chmod 2555 $(DESTDIR)$(sbindir)/smtpctl + chgrp $(SMTPD_QUEUE_USER) $(DESTDIR)$(sbindir)/smtpctl || true + chmod 2555 $(DESTDIR)$(sbindir)/smtpctl || true $(INSTALL) -m 644 smtpctl.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/smtpctl.8 $(INSTALL) -m 644 sendmail.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sendmail.8 $(INSTALL) -m 644 makemap.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/makemap.8 diff --git a/smtpd/lka_session.c b/smtpd/lka_session.c index 74066a28..04277df1 100644 --- a/smtpd/lka_session.c +++ b/smtpd/lka_session.c @@ -517,7 +517,7 @@ lka_submit(struct lka_session *lks, struct rule *rule, struct expandnode *xn) "run with %s privileges", SMTPD_USER); if (xn->type == EXPAND_FILENAME) - format = "/usr/libexec/mail.mboxfile -f %%{mbox.from} %s"; + format = PATH_LIBEXEC"/mail.mboxfile -f %%{mbox.from} %s"; else if (xn->type == EXPAND_FILTER) format = "%s"; (void)snprintf(ep->mda_exec, sizeof(ep->mda_exec), diff --git a/smtpd/parse.y b/smtpd/parse.y index 459be325..f3b928b0 100644 --- a/smtpd/parse.y +++ b/smtpd/parse.y @@ -591,41 +591,41 @@ dispatcher_local: MBOX { dispatcher->u.local.requires_root = 1; dispatcher->u.local.user = xstrdup("root"); - asprintf(&dispatcher->u.local.command, "/usr/libexec/mail.local -f %%{mbox.from} %%{user.username}"); + asprintf(&dispatcher->u.local.command, PATH_LIBEXEC"/mail.local -f %%{mbox.from} %%{user.username}"); } dispatcher_local_options | MAILDIR { - asprintf(&dispatcher->u.local.command, "/usr/libexec/mail.maildir"); + asprintf(&dispatcher->u.local.command, PATH_LIBEXEC"/mail.maildir"); } dispatcher_local_options | MAILDIR JUNK { - asprintf(&dispatcher->u.local.command, "/usr/libexec/mail.maildir -j"); + asprintf(&dispatcher->u.local.command, PATH_LIBEXEC"/mail.maildir -j"); } dispatcher_local_options | MAILDIR STRING { if (strncmp($2, "~/", 2) == 0) asprintf(&dispatcher->u.local.command, - "/usr/libexec/mail.maildir \"%%{user.directory}/%s\"", $2+2); + PATH_LIBEXEC"/mail.maildir \"%%{user.directory}/%s\"", $2+2); else asprintf(&dispatcher->u.local.command, - "/usr/libexec/mail.maildir \"%s\"", $2); + PATH_LIBEXEC"/mail.maildir \"%s\"", $2); } dispatcher_local_options | MAILDIR STRING JUNK { if (strncmp($2, "~/", 2) == 0) asprintf(&dispatcher->u.local.command, - "/usr/libexec/mail.maildir -j \"%%{user.directory}/%s\"", $2+2); + PATH_LIBEXEC"/mail.maildir -j \"%%{user.directory}/%s\"", $2+2); else asprintf(&dispatcher->u.local.command, - "/usr/libexec/mail.maildir -j \"%s\"", $2); + PATH_LIBEXEC"/mail.maildir -j \"%s\"", $2); } dispatcher_local_options | LMTP STRING { asprintf(&dispatcher->u.local.command, - "/usr/libexec/mail.lmtp -f %%{mbox.from} -d %s %%{user.username}", $2); + PATH_LIBEXEC"/mail.lmtp -f %%{mbox.from} -d %s %%{user.username}", $2); } dispatcher_local_options | LMTP STRING RCPT_TO { asprintf(&dispatcher->u.local.command, - "/usr/libexec/mail.lmtp -f %%{mbox.from} -d %s %%{dest}", $2); + PATH_LIBEXEC"/mail.lmtp -f %%{mbox.from} -d %s %%{dest}", $2); } dispatcher_local_options | MDA STRING { asprintf(&dispatcher->u.local.command, - "/usr/libexec/mail.mda \"%s\"", $2); + PATH_LIBEXEC"/mail.mda \"%s\"", $2); } dispatcher_local_options | FORWARD_ONLY { dispatcher->u.local.forward_only = 1; |