Add sudo_ prefix to alloc.c functions and rename alloc.h -> sudo_alloc.h
This commit is contained in:
@@ -144,7 +144,7 @@ bsdauth_verify(struct passwd *pw, char *prompt, sudo_auth *auth)
|
||||
len = strlen(prompt) - 1;
|
||||
while (isspace(prompt[len]) || prompt[len] == ':')
|
||||
prompt[len--] = '\0';
|
||||
easprintf(&s, "%s [echo on]: ", prompt);
|
||||
sudo_easprintf(&s, "%s [echo on]: ", prompt);
|
||||
pass = auth_getpass(prompt, def_passwd_timeout * 60,
|
||||
SUDO_CONV_PROMPT_ECHO_ON);
|
||||
free(s);
|
||||
|
@@ -80,7 +80,7 @@ static krb5_error_code
|
||||
krb5_get_init_creds_opt_alloc(krb5_context context,
|
||||
krb5_get_init_creds_opt **opts)
|
||||
{
|
||||
*opts = emalloc(sizeof(krb5_get_init_creds_opt));
|
||||
*opts = sudo_emalloc(sizeof(krb5_get_init_creds_opt));
|
||||
krb5_get_init_creds_opt_init(*opts);
|
||||
return 0;
|
||||
}
|
||||
@@ -120,7 +120,7 @@ sudo_krb5_setup(struct passwd *pw, char **promptp, sudo_auth *auth)
|
||||
|
||||
/* Only rewrite prompt if user didn't specify their own. */
|
||||
/*if (!strcmp(prompt, PASSPROMPT)) { */
|
||||
easprintf(&krb5_prompt, "Password for %s: ", pname);
|
||||
sudo_easprintf(&krb5_prompt, "Password for %s: ", pname);
|
||||
/*}*/
|
||||
free(pname);
|
||||
}
|
||||
@@ -140,7 +140,7 @@ sudo_krb5_init(struct passwd *pw, sudo_auth *auth)
|
||||
auth->data = (void *) &sudo_krb5_data; /* Stash all our data here */
|
||||
|
||||
if (sudo_krb5_instance != NULL) {
|
||||
easprintf(&pname, "%s%s%s", pw->pw_name,
|
||||
sudo_easprintf(&pname, "%s%s%s", pw->pw_name,
|
||||
sudo_krb5_instance[0] != '/' ? "/" : "", sudo_krb5_instance);
|
||||
}
|
||||
|
||||
|
@@ -360,7 +360,7 @@ converse(int num_msg, PAM_CONST struct pam_message **msg,
|
||||
goto done;
|
||||
#endif
|
||||
}
|
||||
pr->resp = estrdup(pass);
|
||||
pr->resp = sudo_estrdup(pass);
|
||||
memset_s(pass, SUDO_CONV_REPL_MAX, 0, strlen(pass));
|
||||
break;
|
||||
case PAM_TEXT_INFO:
|
||||
|
@@ -110,7 +110,7 @@ sudo_rfc1938_setup(struct passwd *pw, char **promptp, sudo_auth *auth)
|
||||
/* Get space for new prompt with embedded challenge */
|
||||
if (np_size < op_len + strlen(challenge) + 7) {
|
||||
np_size = op_len + strlen(challenge) + 7;
|
||||
new_prompt = (char *) erealloc(new_prompt, np_size);
|
||||
new_prompt = (char *) sudo_erealloc(new_prompt, np_size);
|
||||
}
|
||||
|
||||
if (def_long_otp_prompt)
|
||||
|
@@ -94,7 +94,7 @@ sudo_sia_setup(struct passwd *pw, char **promptp, sudo_auth *auth)
|
||||
|
||||
/* Rebuild argv for sia_ses_init() */
|
||||
sudo_argc = NewArgc + 1;
|
||||
sudo_argv = emallocarray(sudo_argc + 1, sizeof(char *));
|
||||
sudo_argv = sudo_emallocarray(sudo_argc + 1, sizeof(char *));
|
||||
sudo_argv[0] = "sudo";
|
||||
for (i = 0; i < NewArgc; i++)
|
||||
sudo_argv[i + 1] = NewArgv[i];
|
||||
|
Reference in New Issue
Block a user