* 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.

1 files changed, 7 insertions, 1 deletions

diff --git a/elf/tst-tls1.c b/elf/tst-tls1.c
index 3b9b10f9aa..478f5bbdcd 100644
--- a/elf/tst-tls1.c
+++ b/elf/tst-tls1.c
@@ -3,18 +3,21 @@
 
 #include <tls.h>
 
-#include "tls-macros.h"
+#ifdef USE_TLS
+# include "tls-macros.h"
 
 
 /* Two common 'int' variables in TLS.  */
 COMMON_INT_DEF(foo);
 COMMON_INT_DEF(bar);
+#endif
 
 
 #define TEST_FUNCTION do_test ()
 static int
 do_test (void)
 {
+#ifdef USE_TLS
   int result = 0;
   int *ap, *bp;
 
@@ -79,6 +82,9 @@ do_test (void)
     }
 
   return result;
+#else
+  return 0;
+#endif
 }