summaryrefslogtreecommitdiff
path: root/nptl_db
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2007-01-12 14:37:24 +0000
committerJakub Jelinek <jakub@redhat.com>2007-01-12 14:37:24 +0000
commit00e3dec8025c93ccde8ed810657e7f2115ddc8cb (patch)
tree30b8f6bdb08d364b986ae3ec3ec7664c520f0ad9 /nptl_db
parentd6220e9ee38c1c9285221b023346201ec5f511b3 (diff)
downloadglibc-00e3dec8025c93ccde8ed810657e7f2115ddc8cb.tar
glibc-00e3dec8025c93ccde8ed810657e7f2115ddc8cb.tar.gz
glibc-00e3dec8025c93ccde8ed810657e7f2115ddc8cb.tar.bz2
glibc-00e3dec8025c93ccde8ed810657e7f2115ddc8cb.zip
* nis/nis_table.c (nis_list): If __follow_path fails in the new
code, make sure the nis_freeresult call doesn't crash and that the result is reported correctly. * nis/nis_table.c (nis_list): Handle FOLLOW_PATH | ALL_RESULTS when callback is NULL. * nis/Versions (libnss_nisplus): Add _nss_nisplus_initgroups_dyn@@GLIBC_PRIVATE. * nis/Makefile (libnss_nisplus-routines): Add nisplus-initgroups. * nis/nss_nisplus/nisplus-grp.c (tablename_val, tablename_len, _nss_create_tablename): Rename to... (grp_tablename_val, grp_tablename_len, _nss_grp_create_tablename): ... these. No longer static. (internal_setgrent): Adjust users. (_nss_nisplus_getgrnam_r, _nss_nisplus_getgrgid_r): Likewise. Don't use locking around _nss_grp_create_tablename call. * nis/nss_nisplus/nisplus-initgroups.c: New file.
Diffstat (limited to 'nptl_db')
-rw-r--r--nptl_db/ChangeLog9
-rw-r--r--nptl_db/db_info.c2
-rw-r--r--nptl_db/structs.def6
3 files changed, 6 insertions, 11 deletions
diff --git a/nptl_db/ChangeLog b/nptl_db/ChangeLog
index 3a8c3c68e8..2bb82f488c 100644
--- a/nptl_db/ChangeLog
+++ b/nptl_db/ChangeLog
@@ -1,12 +1,3 @@
-2006-10-26 Pete Eberlein <eberlein@us.ibm.com>
-
- * nptl_db/db_info.c [TLS_DTV_AT_TP]: Fixed size init for dtvp
- to sizeof a pointer, instead of sizeof the union.
-
-2006-10-27 Ulrich Drepper <drepper@redhat.com>
-
- * structs.def: USE_TLS support is now default.
-
2006-02-03 Roland McGrath <roland@redhat.com>
* structs.def: Add a descriptor for pointer.val field of dtv_t.
diff --git a/nptl_db/db_info.c b/nptl_db/db_info.c
index 6d5eb4b1d8..5000b99ba5 100644
--- a/nptl_db/db_info.c
+++ b/nptl_db/db_info.c
@@ -59,7 +59,7 @@ typedef struct link_map link_map;
i.e. at the very end of the area covered by TLS_PRE_TCB_SIZE. */
DESC (_thread_db_pthread_dtvp,
TLS_PRE_TCB_SIZE + offsetof (tcbhead_t, dtv)
- - (TLS_TCB_SIZE == 0 ? sizeof (tcbhead_t) : 0), union dtv *)
+ - (TLS_TCB_SIZE == 0 ? sizeof (tcbhead_t) : 0), union dtv)
#endif
diff --git a/nptl_db/structs.def b/nptl_db/structs.def
index 20fa014909..823af5cba2 100644
--- a/nptl_db/structs.def
+++ b/nptl_db/structs.def
@@ -68,11 +68,15 @@ DB_STRUCT_FIELD (pthread_key_data, data)
DB_STRUCT (pthread_key_data_level2)
DB_STRUCT_ARRAY_FIELD (pthread_key_data_level2, data)
+#if USE_TLS
DB_STRUCT_FIELD (link_map, l_tls_modid)
+#endif
+#if !defined IS_IN_libpthread || USE_TLS
DB_STRUCT_ARRAY_FIELD (dtv, dtv)
-#define pointer_val pointer.val /* Field of anonymous struct in dtv_t. */
+# define pointer_val pointer.val /* Field of anonymous struct in dtv_t. */
DB_STRUCT_FIELD (dtv_t, pointer_val)
+#endif
#if !defined IS_IN_libpthread || TLS_TCB_AT_TP
DB_STRUCT_FIELD (pthread, dtvp)
#endif