about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--NEWS4
-rw-r--r--sunrpc/rpc_main.c4
3 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d9c38d2b68..17e2e983d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-05-10  Andreas Jaeger  <aj@suse.de>
+
+	[BZ #15395]
+	* sunrpc/rpc_main.c (main): Invoke setlocale and textdomain for
+	localization.
+	Include <locale.h>.
+
 2013-05-09  Carlos O'Donell  <carlos@redhat.com>
 
 	* elf/dl-close.c (_dl_close_worker): Add comments.
diff --git a/NEWS b/NEWS
index 74124949a8..01cef27057 100644
--- a/NEWS
+++ b/NEWS
@@ -15,8 +15,8 @@ Version 2.18
   14994, 14996, 15003, 15006, 15007, 15020, 15023, 15036, 15054, 15055,
   15062, 15078, 15084, 15085, 15086, 15160, 15214, 15221, 15232, 15234,
   15283, 15285, 15287, 15304, 15305, 15307, 15309, 15327, 15330, 15335,
-  15336, 15337, 15342, 15346, 15359, 15361, 15366, 15380, 15394, 15405,
-  15406, 15409, 15416, 15418, 15419, 15423, 15426, 15429.
+  15336, 15337, 15342, 15346, 15359, 15361, 15366, 15380, 15394, 15395,
+  15405, 15406, 15409, 15416, 15418, 15419, 15423, 15426, 15429.
 
 * CVE-2013-0242 Buffer overrun in regexp matcher has been fixed (Bugzilla
   #15078).
diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c
index 1477b43a7d..d03ec991ea 100644
--- a/sunrpc/rpc_main.c
+++ b/sunrpc/rpc_main.c
@@ -39,6 +39,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <libintl.h>
+#include <locale.h>
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/param.h>
@@ -173,6 +174,9 @@ main (int argc, const char *argv[])
 {
   struct commandline cmd;
 
+  setlocale (LC_ALL, "");
+  textdomain (_libc_intl_domainname);
+
   (void) memset ((char *) &cmd, 0, sizeof (struct commandline));
   clear_args ();
   if (!parseargs (argc, argv, &cmd))