From: Ulrich Drepper <drepper@redhat.com>
Date: Sun, 27 Aug 2000 18:46:15 +0000 (+0000)
Subject: (DCGETTEXT): Remove _nl_find_language in code to determine invalid
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=612a09d60490a939fece0d89925b1bafff5d0e79;p=thirdparty%2Fglibc.git

(DCGETTEXT): Remove _nl_find_language in code to determine invalid
locale name.
---

diff --git a/intl/dcgettext.c b/intl/dcgettext.c
index cc5299e460b..30c5154bcc7 100644
--- a/intl/dcgettext.c
+++ b/intl/dcgettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dcgettext(3) function.
-   Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1995,1996,1997,1998,1999,2000 Free Software Foundation, Inc.
 
    This file is part of the GNU C Library.  Its master source is NOT part of
    the C library, however.
@@ -372,9 +372,7 @@ DCGETTEXT (domainname, msgid, category)
 	  /* When this is a SUID binary we must not allow accessing files
 	     outside the dedicated directories.  */
 	  if (ENABLE_SECURE
-	      && (memchr (single_locale, '/',
-			  _nl_find_language (single_locale) - single_locale)
-		  != NULL))
+	      && memchr (single_locale, '/', single_locale) != NULL)
 	    /* Ingore this entry.  */
 	    continue;
 	}