Update.

1999-03-15  Ulrich Drepper  <drepper@cygnus.com>

	* intl/locale.alias: Add entries for Croatian.
	Patch by Tomislav Vujec <tvujec@CARNet.hr>.

4 files changed, 49 insertions, 42 deletions

diff --git a/ChangeLog b/ChangeLog
index 03e2623e3d..b91df670d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-03-15  Ulrich Drepper  <drepper@cygnus.com>
+
+	* intl/locale.alias: Add entries for Croatian.
+	Patch by Tomislav Vujec <tvujec@CARNet.hr>.
+
 1999-03-13  Mark Kettenis  <kettenis@gnu.org>
 
 	* sysdeps/unix/bsd/getpt.c (__getpt): Do not use `isatty' to check
diff --git a/intl/locale.alias b/intl/locale.alias
index cca2921409..4028191677 100644
--- a/intl/locale.alias
+++ b/intl/locale.alias
@@ -26,6 +26,7 @@
 # it with the rest of us.  Send it using the `glibcbug' script to
 # bugs@gnu.org.
 
+croatian	hr_HR.ISO-8859-2
 czech		cs_CZ.ISO-8859-2
 danish          da_DK.ISO-8859-1
 dansk		da_DK.ISO-8859-1
@@ -37,6 +38,7 @@ french		fr_FR.ISO-8859-1
 german		de_DE.ISO-8859-1
 greek           el_GR.ISO-8859-7
 hebrew          iw_IL.ISO-8859-8
+hrvatski	hr_HR.ISO-8859-2
 hungarian       hu_HU.ISO-8859-2
 icelandic       is_IS.ISO-8859-1
 italian         it_IT.ISO-8859-1
diff --git a/localedata/locales/hr_HR b/localedata/locales/hr_HR
index cf9101fa8e..d01ffcb052 100644
--- a/localedata/locales/hr_HR
+++ b/localedata/locales/hr_HR
@@ -3,17 +3,17 @@ escape_char  /
 repertoiremap mnemonic.ds
 %
 % Croatian Language Locale for Croatia
-% Source: USM/MZT
-% Address: Kotnikova 6,
-%    Ljubljana, Slovenia
-% Contact: Borka Jerman-Blaz<ic<
-% Email: jerman-blazic@ijs.si
-% Tel: +38 - 61 - 653225
-% Fax: none
+% Source: CARNet/MZT
+% Address: Josipa Marohnica bb
+%    Zagreb, Hrvatska
+% Contact: Tomislav Vujec
+% Email: tvujec@carnet.hr
+% Tel: +385 - 1 - 6164194
+% Fax: +385 - 1 - 6164395
 % Language: hr
 % Territory: HR
-% Revision: 4.4
-% Date: 1997-04-17
+% Revision: 5.0
+% Date: 1999-03-01
 % Application: general
 % Users: general
 % Repertoiremap: mnemonic.ds
@@ -2127,8 +2127,8 @@ mon_thousands_sep         "<SP>"
 mon_grouping              3;3
 positive_sign             ""
 negative_sign             "<->"
-int_frac_digits           0
-frac_digits               0
+int_frac_digits           2
+frac_digits               2
 p_cs_precedes             1
 p_sep_by_space            1
 n_cs_precedes             1
@@ -2145,37 +2145,37 @@ END LC_NUMERIC
 
 LC_TIME
 
-abday   "<n><e><d>";"<p><o><n>";/
-        "<t><o><r>";"<s><r><e>";/
-        "<c<><e><t>";"<p><e><t>";/
-        "<s><u><b>"
-day     "<n><e><d><e><l><j><a>";/
-        "<p><o><n><e><d><e><l><j><a><k>";/
-        "<u><t><o><r><a><k>";/
-        "<s><r><e><d><a>";/
-        "<c<><e><t><v><r><t><a><k>";/
-        "<p><e><t><a><k>";/
-        "<s><u><b><o><t><a>"
-abmon   "<j><a><n>";"<f><e><b>";/
-        "<m><a><r>";"<a><p><r>";/
-        "<m><a><j>";"<j><u><n>";/
-        "<j><u><l>";"<a><u><g>";/
-        "<s><e><p>";"<o><k><t>";/
-        "<n><o><v>";"<d><e><c>"
-mon     "<j><a><n><u><a><r>";/
-        "<f><e><b><r><u><a><r>";/
-        "<m><a><r><t>";/
-        "<a><p><r><i><l>";/
-        "<m><a><j>";/
-        "<j><u><n>";/
-        "<j><u><l>";/
-        "<a><u><g><u><s><t>";/
-        "<s><e><p><t><e><m><b><a><r>";/
-        "<o><k><t><o><b><a><r>";/
-        "<n><o><v><e><m><b><a><r>";/
-        "<d><e><c><e><m><b><a><r>"
+abday   "<N><e><d>";"<P><o><n>";/
+        "<U><t><o>";"<S><r><i>";/
+        "<C<><e><t>";"<P><e><t>";/
+        "<S><u><b>"
+day     "<N><e><d><j><e><l><j><a>";/
+        "<P><o><n><e><d><j><e><l><j><a><k>";/
+        "<U><t><o><r><a><k>";/
+        "<S><r><i><j><e><d><a>";/
+        "<C<><e><t><v><r><t><a><k>";/
+        "<P><e><t><a><k>";/
+        "<S><u><b><o><t><a>"
+abmon   "<S><i><j>";"<V><e><l>";/
+        "<O><z<><u>";"<T><r><a>";/
+        "<S><v><i>";"<L><i><p>";/
+        "<S><r><p>";"<K><o><l>";/
+        "<R><u><j>";"<L><i><s>";/
+        "<S><t><u>";"<P><r><o>"
+mon     "<S><i><j><e><c<><a><n><j>";/
+        "<V><e><l><j><a><c<><a>";/
+        "<O><z<><u><j><a><k>";/
+        "<T><r><a><v><a><n><j>";/
+        "<S><v><i><b><a><n><j>";/
+        "<L><i><p><a><n><j>";/
+        "<S><r><p><a><n><j>";/
+        "<K><o><l><o><v><o><z>";/
+        "<R><u><j><a><n>";/
+        "<L><i><s><t><o><p><a><d>";/
+        "<S><t><u><d><e><n><i>";/
+        "<P><r><o><s><i><n><a><c>"
 d_t_fmt "<%><a><SP><%><d><SP><%><b><SP><%><Y><SP><%><T>"
-d_fmt   "<%><Y><-><%><m><-><%><d>"
+d_fmt   "<%><d><.><%><m><.><%><Y>"
 t_fmt   "<%><T>"
 am_pm   "";""
 t_fmt_ampm ""
diff --git a/login/utmp_daemon.c b/login/utmp_daemon.c
index 148a472900..1cf899f2a6 100644
--- a/login/utmp_daemon.c
+++ b/login/utmp_daemon.c
@@ -98,7 +98,7 @@ setutent_daemon (void)
       /* We have to make sure the socket is `closed on exec'.  */
       result = __fcntl (daemon_sock, F_GETFD, 0);
       if (result >= 0)
-	result = __fcntl (daemon_sock, F_SETFD, flags | FD_CLOEXEC);
+	result = __fcntl (daemon_sock, F_SETFD, result | FD_CLOEXEC);
       if (result == -1)
 	{
 	  close (daemon_sock);