Attachment 68660 Details for Bug 148056

[patch] bugzilla-148065.patch

bugzilla-148065.patch (text/plain), 2.50 KB, created by Mike Fabian on 2006-02-15 16:20:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Fabian

Created: 2006-02-15 16:20:25 UTC

Size: 2.50 KB

patch

obsolete

>diff -ru pam_login-3.29.orig/src/login.c pam_login-3.29/src/login.c
>--- pam_login-3.29.orig/src/login.c	2005-12-21 09:48:18.000000000 +0100
>+++ pam_login-3.29/src/login.c	2006-02-15 16:55:32.000000000 +0100
>@@ -429,10 +429,48 @@
> 
>   init_sighandler ();
> 
>-  locale = getlogindefs_str ("RC_LC_ALL", NULL);
>-  if (locale == NULL || strlen (locale) == 0)
>-    if ((locale = getlogindefs_str ("RC_LANG", "")) == NULL)
>-      locale = "";
>+  /* find locale for translations:                           */
>+  /* If the locale environment variables are already set     */
>+  /* set when the login program is called, just use them.    */
>+  /* Usually they are not set though, because                */
>+  /*     - this program is called before the user has logged */
>+  /*       in, e.g. when logging in from the Linux console   */
>+  /*       or from a serial console and no profiles have     */
>+  /*       sourced yet.                                      */
>+  /*     - this program is called by the telnet server, in   */
>+  /*       that case only the environment variables          */
>+  /*       DISPLAY, TERM, and REMOTEHOST are set.            */
>+  /* If the locale environment is not set, determine the     */
>+  /* language from /etc/sysconfig/language.                  */
>+  
>+  if ((locale = getenv ("LC_ALL")) == NULL
>+      || strlen (locale) == 0)
>+    if ((locale = getenv ("LC_MESSAGES")) == NULL
>+	|| strlen (locale) == 0)
>+      if ((locale = getenv ("LANG")) == NULL
>+	  || strlen (locale) == 0)
>+        if ((locale = getlogindefs_str ("RC_LC_ALL", NULL)) == NULL
>+	    || strlen (locale) == 0)
>+          if ((locale = getlogindefs_str ("RC_LC_MESSAGES", NULL)) == NULL
>+	      || strlen (locale) == 0)
>+            locale = getlogindefs_str ("RC_LANG", "POSIX");
>+
>+  /* don't use translations for languages which cannot be */
>+  /* displayed on the Linux console yet                   */
>+  if (strstr (locale, "ja") == locale || 
>+      strstr (locale, "zh") == locale || 
>+      strstr (locale, "ko") == locale || 
>+      strstr (locale, "bn") == locale || 
>+      strstr (locale, "gu") == locale || 
>+      strstr (locale, "hi") == locale || 
>+      strstr (locale, "kn") == locale || 
>+      strstr (locale, "ml") == locale || 
>+      strstr (locale, "mr") == locale || 
>+      strstr (locale, "pa") == locale || 
>+      strstr (locale, "ta") == locale || 
>+      strstr (locale, "te") == locale || 
>+      strstr (locale, "km") == locale) 
>+	locale = "POSIX"; 
> 
>   setlocale (LC_ALL, locale);
>   bindtextdomain ("pam_login", LOCALEDIR);

Actions: View | Diff

Attachments on bug 148056: 66959 | 68660