mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 23:52:33 +00:00
6602f49495
This reverts commit 741bf840da.
This reverts the fallout from reverting the major changes.
77 lines
2.7 KiB
Diff
77 lines
2.7 KiB
Diff
diff -Naur opensmtpd-5.7.1p1/smtpd/parse.y opensmtpd-5.7.1p1.patched/smtpd/parse.y
|
|
--- opensmtpd-5.7.1p1/smtpd/parse.y 2015-06-30 10:13:34.000000000 +0200
|
|
+++ opensmtpd-5.7.1p1.patched/smtpd/parse.y 2015-09-26 08:41:17.012472516 +0200
|
|
@@ -2519,13 +2519,19 @@
|
|
{
|
|
struct filter_conf *f;
|
|
char *path;
|
|
+ const char *proc_path;
|
|
|
|
if (dict_get(&conf->sc_filters, name)) {
|
|
yyerror("filter \"%s\" already defined", name);
|
|
return (NULL);
|
|
}
|
|
|
|
- if (asprintf(&path, "%s/filter-%s", PATH_LIBEXEC, prog) == -1) {
|
|
+ proc_path = getenv("OPENSMTPD_PROC_PATH");
|
|
+ if (proc_path == NULL) {
|
|
+ proc_path = PATH_LIBEXEC;
|
|
+ }
|
|
+
|
|
+ if (asprintf(&path, "%s/filter-%s", proc_path, prog) == -1) {
|
|
yyerror("filter \"%s\" asprintf failed", name);
|
|
return (0);
|
|
}
|
|
diff -Naur opensmtpd-5.7.1p1/smtpd/smtpd.c opensmtpd-5.7.1p1.patched/smtpd/smtpd.c
|
|
--- opensmtpd-5.7.1p1/smtpd/smtpd.c 2015-06-30 10:13:34.000000000 +0200
|
|
+++ opensmtpd-5.7.1p1.patched/smtpd/smtpd.c 2015-09-26 08:41:16.998472557 +0200
|
|
@@ -854,6 +854,7 @@
|
|
char path[PATH_MAX];
|
|
char name[PATH_MAX];
|
|
char *arg;
|
|
+ char *proc_path;
|
|
|
|
if (strlcpy(name, conf, sizeof(name)) >= sizeof(name)) {
|
|
log_warnx("warn: %s-proc: conf too long", key);
|
|
@@ -864,7 +865,12 @@
|
|
if (arg)
|
|
*arg++ = '\0';
|
|
|
|
- if (snprintf(path, sizeof(path), PATH_LIBEXEC "/%s-%s", key, name) >=
|
|
+ proc_path = getenv("OPENSMTPD_PROC_PATH");
|
|
+ if (proc_path == NULL) {
|
|
+ proc_path = PATH_LIBEXEC;
|
|
+ }
|
|
+
|
|
+ if (snprintf(path, sizeof(path), "%s/%s-%s", proc_path, key, name) >=
|
|
(ssize_t)sizeof(path)) {
|
|
log_warn("warn: %s-proc: exec path too long", key);
|
|
return (-1);
|
|
diff -Naur opensmtpd-5.7.1p1/smtpd/table.c opensmtpd-5.7.1p1.patched/smtpd/table.c
|
|
--- opensmtpd-5.7.1p1/smtpd/table.c 2015-06-30 10:13:34.000000000 +0200
|
|
+++ opensmtpd-5.7.1p1.patched/smtpd/table.c 2015-09-26 08:41:17.005472536 +0200
|
|
@@ -201,6 +201,7 @@
|
|
struct table_backend *tb;
|
|
char buf[LINE_MAX];
|
|
char path[LINE_MAX];
|
|
+ const char *proc_path;
|
|
size_t n;
|
|
struct stat sb;
|
|
|
|
@@ -215,8 +216,14 @@
|
|
if (name && table_find(name, NULL))
|
|
fatalx("table_create: table \"%s\" already defined", name);
|
|
|
|
+ proc_path = getenv("OPENSMTPD_PROC_PATH");
|
|
+ if (proc_path == NULL) {
|
|
+ proc_path = PATH_LIBEXEC;
|
|
+ }
|
|
+
|
|
if ((tb = table_backend_lookup(backend)) == NULL) {
|
|
- if ((size_t)snprintf(path, sizeof(path), PATH_LIBEXEC "/table-%s",
|
|
+ if ((size_t)snprintf(path, sizeof(path), "%s/table-%s",
|
|
+ proc_path,
|
|
backend) >= sizeof(path)) {
|
|
fatalx("table_create: path too long \""
|
|
PATH_LIBEXEC "/table-%s\"", backend);
|