aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--catgets/catgets.c3
-rw-r--r--locale/findlocale.c13
-rw-r--r--sysdeps/i370/Implies1
-rw-r--r--sysdeps/mvs/Implies1
5 files changed, 17 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 9db8282..3d693fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2000-08-21 Ulrich Drepper <drepper@redhat.com>
+ * sysdeps/i370/Implies: Removed.
+ * sysdeps/mvs/Implies: Removed.
+
+ * catgets/catgets.c (catopen): Filter out env_var values with / if
+ necessary.
+
+ * locale/findlocale.c (_nl_find_locale): Move test for unusable
+ locale name after all getenvs.
+
* configure.in: Allow sed versions like 3.02.8.
Patch by Rodrigo Barbosa <rodrigob@conectiva.com.br>.
diff --git a/catgets/catgets.c b/catgets/catgets.c
index 86ff0ff..cad515d 100644
--- a/catgets/catgets.c
+++ b/catgets/catgets.c
@@ -50,7 +50,8 @@ catopen (const char *cat_name, int flag)
/* Use the LANG environment variable. */
env_var = getenv ("LANG");
- if (env_var == NULL)
+ if (env_var == NULL || *env_var == '\0'
+ || (__libc_enable_secure && strchr (env_var, '/') != NULL))
env_var = "C";
env_var_len = strlen (env_var) + 1;
diff --git a/locale/findlocale.c b/locale/findlocale.c
index 7c77dd8..275f7fc 100644
--- a/locale/findlocale.c
+++ b/locale/findlocale.c
@@ -54,11 +54,7 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len,
const char *revision;
struct loaded_l10nfile *locale_file;
- if ((*name)[0] == '\0'
- /* In SUID binaries we must not allow people to access files
- outside the dedicated locale directories. */
- || (__builtin_expect (__libc_enable_secure, 0)
- && memchr (*name, '/', _nl_find_language (*name) - *name) != NULL))
+ if ((*name)[0] == '\0')
{
/* The user decides which locale to use by setting environment
variables. */
@@ -67,10 +63,13 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len,
*name = getenv (_nl_category_names[category]);
if (*name == NULL || (*name)[0] == '\0')
*name = getenv ("LANG");
- if (*name == NULL || (*name)[0] == '\0')
- *name = (char *) _nl_C_name;
}
+ if (*name == NULL || (*name)[0] == '\0'
+ || (__builtin_expect (__libc_enable_secure, 0)
+ && memchr (*name, '/', _nl_find_language (*name) - *name) != NULL))
+ *name = (char *) _nl_C_name;
+
if (__builtin_expect (strcmp (*name, _nl_C_name), 1) == 0
|| __builtin_expect (strcmp (*name, _nl_POSIX_name), 1) == 0)
{
diff --git a/sysdeps/i370/Implies b/sysdeps/i370/Implies
deleted file mode 100644
index 39a34c5..0000000
--- a/sysdeps/i370/Implies
+++ /dev/null
@@ -1 +0,0 @@
-wordsize-32
diff --git a/sysdeps/mvs/Implies b/sysdeps/mvs/Implies
deleted file mode 100644
index b3188f7..0000000
--- a/sysdeps/mvs/Implies
+++ /dev/null
@@ -1 +0,0 @@
-posix