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

Add sudo_ prefix to alloc.c functions and rename alloc.h -> sudo_alloc.h

Browse Source
This commit is contained in:
Todd C. Miller
2014-06-27 10:48:31 -06:00
parent c4c253847e
commit 2d61d38c23
65 changed files with 736 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
plugins/sudoers/defaults.c
View File

@@ -418,17 +418,17 @@ init_defaults(void)
#ifdef UMASK_OVERRIDE
def_umask_override = true;
#endif
def_iolog_file = estrdup("%{seq}");
def_iolog_dir = estrdup(_PATH_SUDO_IO_LOGDIR);
def_sudoers_locale = estrdup("C");
def_iolog_file = sudo_estrdup("%{seq}");
def_iolog_dir = sudo_estrdup(_PATH_SUDO_IO_LOGDIR);
def_sudoers_locale = sudo_estrdup("C");
def_env_reset = ENV_RESET;
def_set_logname = true;
def_closefrom = STDERR_FILENO + 1;
def_pam_service = estrdup("sudo");
def_pam_service = sudo_estrdup("sudo");
#ifdef HAVE_PAM_LOGIN
def_pam_login_service = estrdup("sudo-i");
def_pam_login_service = sudo_estrdup("sudo-i");
#else
def_pam_login_service = estrdup("sudo");
def_pam_login_service = sudo_estrdup("sudo");
#endif
#ifdef NO_PAM_SESSION
def_pam_session = false;
@@ -467,27 +467,27 @@ init_defaults(void)
#endif
/* Now do the strings */
def_mailto = estrdup(MAILTO);
def_mailsub = estrdup(N_(MAILSUBJECT));
def_badpass_message = estrdup(_(INCORRECT_PASSWORD));
def_lecture_status_dir = estrdup(_PATH_SUDO_LECTURE_DIR);
def_timestampdir = estrdup(_PATH_SUDO_TIMEDIR);
def_passprompt = estrdup(_(PASSPROMPT));
def_runas_default = estrdup(RUNAS_DEFAULT);
def_mailto = sudo_estrdup(MAILTO);
def_mailsub = sudo_estrdup(N_(MAILSUBJECT));
def_badpass_message = sudo_estrdup(_(INCORRECT_PASSWORD));
def_lecture_status_dir = sudo_estrdup(_PATH_SUDO_LECTURE_DIR);
def_timestampdir = sudo_estrdup(_PATH_SUDO_TIMEDIR);
def_passprompt = sudo_estrdup(_(PASSPROMPT));
def_runas_default = sudo_estrdup(RUNAS_DEFAULT);
#ifdef _PATH_SUDO_SENDMAIL
def_mailerpath = estrdup(_PATH_SUDO_SENDMAIL);
def_mailerflags = estrdup("-t");
def_mailerpath = sudo_estrdup(_PATH_SUDO_SENDMAIL);
def_mailerflags = sudo_estrdup("-t");
#endif
#if (LOGGING & SLOG_FILE)
def_logfile = estrdup(_PATH_SUDO_LOGFILE);
def_logfile = sudo_estrdup(_PATH_SUDO_LOGFILE);
#endif
#ifdef EXEMPTGROUP
def_exempt_group = estrdup(EXEMPTGROUP);
def_exempt_group = sudo_estrdup(EXEMPTGROUP);
#endif
#ifdef SECURE_PATH
def_secure_path = estrdup(SECURE_PATH);
def_secure_path = sudo_estrdup(SECURE_PATH);
#endif
def_editor = estrdup(EDITOR);
def_editor = sudo_estrdup(EDITOR);
def_set_utmp = true;
def_pam_setcred = true;
@@ -709,7 +709,7 @@ store_str(char *val, struct sudo_defs_types *def, int op)
if (op == false)
def->sd_un.str = NULL;
else
def->sd_un.str = estrdup(val);
def->sd_un.str = sudo_estrdup(val);
if (def->callback)
debug_return_bool(def->callback(val));
debug_return_bool(true);
@@ -871,8 +871,8 @@ list_op(char *val, size_t len, struct sudo_defs_types *def, enum list_ops op)
/* Add new node to the head of the list. */
if (op == add) {
cur = ecalloc(1, sizeof(struct list_member));
cur->value = estrndup(val, len);
cur = sudo_ecalloc(1, sizeof(struct list_member));
cur->value = sudo_estrndup(val, len);
SLIST_INSERT_HEAD(&def->sd_un.list, cur, entries);
}
debug_return;