From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Tue, 12 May 2015 21:58:05 +0000 (-0600)
Subject: In sudo_warn_gettext_v1() call dgettext() not gettext() to make
X-Git-Tag: SUDO_1_8_14^2~133
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=80cb630bc031780826a7083054aaa7df0a45c5b8;p=sudo

In sudo_warn_gettext_v1() call dgettext() not gettext() to make
sure the domain is set correctly.  The sudoers plugin uses its own
text domain.
---

diff --git a/include/sudo_fatal.h b/include/sudo_fatal.h
index 63d002b36..4e647f601 100644
--- a/include/sudo_fatal.h
+++ b/include/sudo_fatal.h
@@ -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_ */
diff --git a/lib/util/fatal.c b/lib/util/fatal.c
index fec0c0e96..e4b9fc9b9 100644
--- a/lib/util/fatal.c
+++ b/lib/util/fatal.c
@@ -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)