[BZ #2632]

2006-05-02  Ulrich Drepper  <drepper@redhat.com>
	[BZ #2632]
	* nscd/connections.c (nscd_init): Correct initialization of
	in-memory database structure.

	* iconvdata/utf-7.c: Don't require more than one character after

5 files changed, 132 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e5a2765755..3c61e3d7fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-02  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #2632]
+	* nscd/connections.c (nscd_init): Correct initialization of
+	in-memory database structure.
+
 2006-05-02  Thorsten Kukuk  <kukuk@suse.de>
 
 	* sysdeps/unix/sysv/linux/alpha/bits/mman.h: Fix MADV_REMOVE value.
@@ -12,7 +18,7 @@
 2006-05-01  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #2502]
-	* iconvdata/utf-7.c: Don't require more than two characters after
+	* iconvdata/utf-7.c: Don't require more than one character after
 	the '+' sign starting Unicode shifted sequences.
 
 	* misc/tsearch.c (__tdelete): Remove unnecessary test
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index af4e6b9405..70b9e2e8fb 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-02  Ulrich Drepper  <drepper@redhat.com>
+
+	* SUPPORTED (SUPPORTED-LOCALES): Add tr_CY.ISO-8859-9 and
+	tr_CY.UTF-8.
+
+	[BZ #531]
+	* locales/tr_CY: New file.
+
 2006-01-07  Eddy Petrisor  <eddy.petrisor@gmail.com>
 
 	* locales/ro_RO: The sorting order of the letters a circumflex and
diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
index 10b90a3bff..a809c6625f 100644
--- a/localedata/SUPPORTED
+++ b/localedata/SUPPORTED
@@ -335,6 +335,8 @@ tig_ER/UTF-8 \
 tl_PH.UTF-8/UTF-8 \
 tl_PH/ISO-8859-1 \
 tn_ZA/UTF-8 \
+tr_CY.UTF-8/UTF-8 \
+tr_CY/ISO-8859-9 \
 tr_TR.UTF-8/UTF-8 \
 tr_TR/ISO-8859-9 \
 ts_ZA/UTF-8 \
diff --git a/localedata/locales/tr_CY b/localedata/locales/tr_CY
new file mode 100644
index 0000000000..a1057e5fbc
--- /dev/null
+++ b/localedata/locales/tr_CY
@@ -0,0 +1,114 @@
+comment_char %
+escape_char  /
+%
+% Turkish Language Locale for Cyprus
+% Language: tr
+% Territory: CY
+% Revision: 4.4
+% Application: general
+% Users: general
+% Charset: ISO-8859-9
+% Distribution and use is free, also
+% for commercial purposes.
+
+% Adapted from tr_TR by Recai Oktaş <roktas@omu.edu.tr>, 2004
+
+LC_IDENTIFICATION
+title      "Turkish language locale for Cyprus"
+source     "Free Software Foundation, Inc."
+address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+contact    ""
+email      "bug-glibc-locales@gnu.org"
+tel        ""
+fax        ""
+language   "Turkish"
+territory  "Cyprus"
+revision   "1.0"
+date       "2004-10-23"
+audience   ""
+application ""
+abbreviation ""
+%
+category  "tr_CY:2000";LC_IDENTIFICATION
+category  "tr_CY:2000";LC_CTYPE
+category  "tr_CY:2000";LC_COLLATE
+category  "tr_CY:2000";LC_TIME
+category  "tr_CY:2000";LC_NUMERIC
+category  "tr_CY:2000";LC_MONETARY
+category  "tr_CY:2000";LC_MESSAGES
+category  "tr_CY:2000";LC_PAPER
+category  "tr_CY:2000";LC_NAME
+category  "tr_CY:2000";LC_ADDRESS
+category  "tr_CY:2000";LC_TELEPHONE
+category  "tr_CY:2000";LC_MEASUREMENT
+
+END LC_IDENTIFICATION
+
+LC_COLLATE
+copy "tr_TR"
+END LC_COLLATE
+
+LC_CTYPE
+copy "tr_TR"
+END LC_CTYPE
+
+LC_MESSAGES
+copy "tr_TR"
+END LC_MESSAGES
+
+LC_MONETARY
+copy "tr_TR"
+END LC_MONETARY
+
+LC_NUMERIC
+copy "tr_TR"
+END LC_NUMERIC
+
+LC_TIME
+copy "tr_TR"
+END LC_TIME
+
+LC_PAPER
+copy "tr_TR"
+END LC_PAPER
+
+LC_TELEPHONE
+copy "tr_TR"
+END LC_TELEPHONE
+
+LC_MEASUREMENT
+copy "tr_TR"
+END LC_MEASUREMENT
+
+LC_NAME
+copy "tr_TR"
+END LC_NAME
+
+LC_ADDRESS
+postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
+<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
+<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
+<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
+<U004E><U0025><U0063><U0025><U004E>"
+% Northern Cyprus
+country_name	"<U004E><U006F><U0072><U0074><U0068><U0065><U0072><U006E>/
+<U0020><U0043><U0079><U0070><U0072><U0075><U0073>"
+% TR
+country_post	"<U0054><U0052>"
+% TR
+country_car	"<U0054><U0052>"
+country_isbn	975
+country_num	792
+% TR
+country_ab2	"<U0054><U0052>"
+% TUR
+country_ab3	"<U0054><U0055><U0052>"
+% Turkish
+lang_name	"<U0054><U0075><U0072><U006B><U0069><U0073><U0068>"
+% tr
+lang_term	"<U0074><U0075><U0072>"
+% tr
+lang_lib	"<U0074><U0075><U0072>"
+%tr
+lang_ab		"<U0074><U0072>"
+END LC_ADDRESS
diff --git a/nscd/connections.c b/nscd/connections.c
index 38d5f817fd..8b4493a44c 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -722,7 +722,7 @@ cannot set socket to close on exec: %s; disabling paranoia mode"),
 	    dbs[cnt].head = xmalloc (sizeof (struct database_pers_head)
 				     + (dbs[cnt].suggested_module
 					* sizeof (ref_t)));
-	    memset (dbs[cnt].head, '\0', sizeof (dbs[cnt].head));
+	    memset (dbs[cnt].head, '\0', sizeof (struct database_pers_head));
 	    assert (~ENDREF == 0);
 	    memset (dbs[cnt].head->array, '\xff',
 		    dbs[cnt].suggested_module * sizeof (ref_t));