isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't set defaults values for features that are not present.

Browse Source 
This means that lecture_status_dir and timestampdir are only set
if _PATH_SUDO_LECTURE_DIR and _PATH_SUDO_TIMEDIR respectively are
set.  Also, the log server defaults are only set when SUDOERS_LOG_CLIENT
is defined.
This commit is contained in:
Todd C. Miller
2023-08-25 11:19:42 -06:00
parent 993ee338d9
commit 4cdee2e312
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/sudoers/defaults.c
View File

@@ -586,13 +586,15 @@ init_defaults(void)
#ifdef HAVE_ZLIB_H #ifdef HAVE_ZLIB_H
def_compress_io = true; def_compress_io = true;
#endif #endif
def_log_passwords = true;
def_log_server_timeout = 30;
def_log_server_verify = true;
def_log_server_keepalive = true;
def_ignore_audit_errors = true; def_ignore_audit_errors = true;
def_ignore_iolog_errors = false; def_ignore_iolog_errors = false;
def_ignore_logfile_errors = true; def_ignore_logfile_errors = true;
def_log_passwords = true;
#ifdef SUDOERS_LOG_CLIENT
def_log_server_timeout = 30;
def_log_server_verify = true;
def_log_server_keepalive = true;
#endif
/* Now do the strings */ /* Now do the strings */
if ((def_mailto = strdup(MAILTO)) == NULL) if ((def_mailto = strdup(MAILTO)) == NULL)
@@ -601,10 +603,14 @@ init_defaults(void)
goto oom; goto oom;
if ((def_badpass_message = strdup(_(INCORRECT_PASSWORD))) == NULL) if ((def_badpass_message = strdup(_(INCORRECT_PASSWORD))) == NULL)
goto oom; goto oom;
#ifdef _PATH_SUDO_LECTURE_DIR
if ((def_lecture_status_dir = strdup(_PATH_SUDO_LECTURE_DIR)) == NULL) if ((def_lecture_status_dir = strdup(_PATH_SUDO_LECTURE_DIR)) == NULL)
goto oom; goto oom;
#endif
#ifdef _PATH_SUDO_TIMEDIR
if ((def_timestampdir = strdup(_PATH_SUDO_TIMEDIR)) == NULL) if ((def_timestampdir = strdup(_PATH_SUDO_TIMEDIR)) == NULL)
goto oom; goto oom;
#endif
if ((def_passprompt = strdup(_(PASSPROMPT))) == NULL) if ((def_passprompt = strdup(_(PASSPROMPT))) == NULL)
goto oom; goto oom;
if ((def_runas_default = strdup(RUNAS_DEFAULT)) == NULL) if ((def_runas_default = strdup(RUNAS_DEFAULT)) == NULL)