mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
security/sudo: Fix build without sendmail
PR: 251582 Reported by: Alexander Kuznetsov <alex@kuznetcoff.ru> Obtained from: https://www.sudo.ws/repos/sudo/raw-rev/41db1aad85bb Sponsored by: Rubicon Communications, LLC (Netgate)
This commit is contained in:
parent
6dfe0bd3bc
commit
b28d26b700
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=557225
2 changed files with 46 additions and 0 deletions
|
@ -3,6 +3,7 @@
|
|||
|
||||
PORTNAME= sudo
|
||||
PORTVERSION= 1.9.4
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= security
|
||||
MASTER_SITES= SUDO
|
||||
|
||||
|
|
45
security/sudo/files/patch-fix_build_without_sendmail
Normal file
45
security/sudo/files/patch-fix_build_without_sendmail
Normal file
|
@ -0,0 +1,45 @@
|
|||
|
||||
# HG changeset patch
|
||||
# User Todd C. Miller <Todd.Miller@sudo.ws>
|
||||
# Date 1606767492 25200
|
||||
# Node ID 41db1aad85bbce444b511bcb28b9628a0a22fcd9
|
||||
# Parent 96a5cfe3c66b6ee84d7f7b6fb26d932f45a44b76
|
||||
Fix build when configured using --without-sendmail
|
||||
Bug #947
|
||||
|
||||
diff -r 96a5cfe3c66b -r 41db1aad85bb lib/eventlog/eventlog.c
|
||||
--- lib/eventlog/eventlog.c Sun Nov 29 15:11:34 2020 -0700
|
||||
+++ lib/eventlog/eventlog.c Mon Nov 30 13:18:12 2020 -0700
|
||||
@@ -78,7 +78,7 @@
|
||||
static FILE *eventlog_stub_open_log(int type, const char *logfile);
|
||||
static void eventlog_stub_close_log(int type, FILE *fp);
|
||||
|
||||
-/* Eventlog config settings */
|
||||
+/* Eventlog config settings (default values). */
|
||||
static struct eventlog_config evl_conf = {
|
||||
EVLOG_NONE, /* type */
|
||||
EVLOG_SUDO, /* format */
|
||||
@@ -91,7 +91,11 @@
|
||||
false, /* omit_hostname */
|
||||
_PATH_SUDO_LOGFILE, /* logpath */
|
||||
"%h %e %T", /* time_fmt */
|
||||
+#ifdef _PATH_SUDO_SENDMAIL
|
||||
_PATH_SUDO_SENDMAIL, /* mailerpath */
|
||||
+#else
|
||||
+ NULL, /* mailerpath (disabled) */
|
||||
+#endif
|
||||
"-t", /* mailerflags */
|
||||
NULL, /* mailfrom */
|
||||
MAILTO, /* mailto */
|
||||
@@ -1436,8 +1440,10 @@
|
||||
evl_conf.logpath = _PATH_SUDO_LOGFILE;
|
||||
if (evl_conf.time_fmt == NULL)
|
||||
evl_conf.time_fmt = "%h %e %T";
|
||||
+#ifdef _PATH_SUDO_SENDMAIL
|
||||
if (evl_conf.mailerpath == NULL)
|
||||
evl_conf.mailerpath = _PATH_SUDO_SENDMAIL;
|
||||
+#endif
|
||||
if (evl_conf.mailerflags == NULL)
|
||||
evl_conf.mailerflags = "-t";
|
||||
if (evl_conf.mailto == NULL)
|
||||
|
Loading…
Add table
Reference in a new issue