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

In sudo_warn_gettext_v1() call dgettext() not gettext() to make

Browse Source 
sure the domain is set correctly.  The sudoers plugin uses its own
text domain.
This commit is contained in:
Todd C. Miller
2015-05-12 15:58:05 -06:00
parent 336b99ade2
commit 80cb630bc0
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/sudo_fatal.h
View File

@@ -124,7 +124,7 @@ struct sudo_conv_reply;
__dso_public int sudo_fatal_callback_deregister_v1(sudo_fatal_callback_t func);
__dso_public int sudo_fatal_callback_register_v1(sudo_fatal_callback_t func);
__dso_public char *sudo_warn_gettext_v1(const char *msgid) __format_arg(1);
__dso_public char *sudo_warn_gettext_v1(const char *domainname, const char *msgid) __format_arg(2);
__dso_public void sudo_warn_set_locale_func_v1(bool (*func)(bool, int *));
__dso_public void sudo_fatal_nodebug_v1(const char *fmt, ...) __printf0like(1, 2) __attribute__((__noreturn__));
__dso_public void sudo_fatalx_nodebug_v1(const char *fmt, ...) __printflike(1, 2) __attribute__((__noreturn__));
@@ -138,7 +138,6 @@ __dso_public void sudo_warn_set_conversation_v1(int (*conv)(int num_msgs, const
#define sudo_fatal_callback_deregister(_a) sudo_fatal_callback_deregister_v1((_a))
#define sudo_fatal_callback_register(_a) sudo_fatal_callback_register_v1((_a))
#define sudo_warn_gettext(_a) sudo_warn_gettext_v1((_a))
#define sudo_warn_set_locale_func(_a) sudo_warn_set_locale_func_v1((_a))
#define sudo_fatal_nodebug sudo_fatal_nodebug_v1
#define sudo_fatalx_nodebug sudo_fatalx_nodebug_v1
@@ -151,4 +150,10 @@ __dso_public void sudo_warn_set_conversation_v1(int (*conv)(int num_msgs, const
#define sudo_warn_set_conversation(_a) sudo_warn_set_conversation_v1(_a)
#define sudo_warn_set_conversation(_a) sudo_warn_set_conversation_v1(_a)
#ifdef DEFAULT_TEXT_DOMAIN
# define sudo_warn_gettext(_a) sudo_warn_gettext_v1(DEFAULT_TEXT_DOMAIN, (_a))
#else
# define sudo_warn_gettext(_a) sudo_warn_gettext_v1(NULL, (_a))
#endif
#endif /* _SUDO_FATAL_H_ */

4
lib/util/fatal.c
View File

@@ -258,7 +258,7 @@ sudo_warn_set_locale_func_v1(bool (*func)(bool, int *))
#ifdef HAVE_LIBINTL_H
char *
sudo_warn_gettext_v1(const char *msgid)
sudo_warn_gettext_v1(const char *domainname, const char *msgid)
{
int cookie;
char *msg;
@@ -267,7 +267,7 @@ sudo_warn_gettext_v1(const char *msgid)
if (sudo_warn_setlocale != NULL)
sudo_warn_setlocale(false, &cookie);
msg = gettext(msgid);
msg = dgettext(domainname, msgid);
/* Restore old locale as needed. */
if (sudo_warn_setlocale != NULL)