Move getlogin_r_chk to login/ subdir.

diff --git a/ChangeLog b/ChangeLog
index fa96814f397bcfea350dfc07987adec588bbe8c5..78fcc9c33e6d6be80e8f6034ff4472f6580563dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2013-05-06  Roland McGrath  <roland@hack.frob.com>
 
+       * debug/getlogin_r_chk.c: Moved to ...
+       * login/getlogin_r_chk.c: ... here.
+       * debug/Makefile (routines): Move getlogin_r_chk to ...
+       * login/Makefile (routines): ... here.
+       * debug/Versions (libc: GLIBC_2.4): Move getlogin_r_chk to ...
+       * login/Versions (libc: GLIBC_2.4): ... here.
+
        * io/poll.c (__poll): Renamed from poll.
        Add libc_hidden_def.
        (poll): Define as weak alias.

diff --git a/debug/Makefile b/debug/Makefile
index 682f14c7d3354ed23afb9f9d73e04f42a7dd1015..9b5afb4d22527ba5a5f45a8990fa8e82fef76f65 100644 (file)
--- a/debug/Makefile
+++ b/debug/Makefile
@@ -22,9 +22,9 @@ subdir        := debug
 
 headers        := execinfo.h
 
-# Note that ptsname_r_chk is not here but in login/Makefile instead.
-# If that subdir is omitted from the build, its _FORTIFY_SOURCE
-# support will be too.
+# Note that ptsname_r_chk and getlogin_r are not here, but in
+# login/Makefile instead.  If that subdir is omitted from the
+# build, its _FORTIFY_SOURCE support will be too.
 routines  = backtrace backtracesyms backtracesymsfd noophooks \
            memcpy_chk memmove_chk mempcpy_chk memset_chk stpcpy_chk \
            strcat_chk strcpy_chk strncat_chk strncpy_chk stpncpy_chk \
@@ -39,7 +39,7 @@ routines  = backtrace backtracesyms backtracesymsfd noophooks \
            wcpncpy_chk \
            swprintf_chk vswprintf_chk wprintf_chk fwprintf_chk \
            vwprintf_chk vfwprintf_chk fgetws_chk fgetws_u_chk \
-           confstr_chk getgroups_chk ttyname_r_chk getlogin_r_chk \
+           confstr_chk getgroups_chk ttyname_r_chk \
            gethostname_chk getdomainname_chk wcrtomb_chk mbsnrtowcs_chk \
            wcsnrtombs_chk mbsrtowcs_chk wcsrtombs_chk mbstowcs_chk \
            wcstombs_chk asprintf_chk vasprintf_chk dprintf_chk \

diff --git a/debug/Versions b/debug/Versions
index e2b90ebed557440b67b92b8323df212d2820e320..0482c85f19e275b77ff677bde18d492ed93997f1 100644 (file)
--- a/debug/Versions
+++ b/debug/Versions
@@ -29,7 +29,7 @@ libc {
     __wcsncpy_chk; __wcscat_chk; __wcsncat_chk; __wmemset_chk; __wcpncpy_chk;
     __swprintf_chk; __vswprintf_chk; __wprintf_chk; __fwprintf_chk;
     __vwprintf_chk; __vfwprintf_chk; __fgetws_chk; __fgetws_unlocked_chk;
-    __confstr_chk; __getgroups_chk; __ttyname_r_chk; __getlogin_r_chk;
+    __confstr_chk; __getgroups_chk; __ttyname_r_chk;
     __gethostname_chk; __getdomainname_chk; __wcrtomb_chk; __mbsnrtowcs_chk;
     __wcsnrtombs_chk; __mbsrtowcs_chk; __wcsrtombs_chk; __mbstowcs_chk;
     __wcstombs_chk;

diff --git a/login/Makefile b/login/Makefile
index fa5aa71381a83d71bb1666b5875419843b7686a5..61c9d7efbe0484ec42793932872786475e08f370 100644 (file)
--- a/login/Makefile
+++ b/login/Makefile
@@ -23,7 +23,7 @@ subdir        := login
 
 headers        := utmp.h bits/utmp.h lastlog.h pty.h
 
-routines := getlogin getlogin_r setlogin \
+routines := getlogin getlogin_r setlogin getlogin_r_chk \
            getutent getutent_r getutid getutline getutid_r getutline_r \
            utmp_file utmpname updwtmp getpt grantpt unlockpt ptsname \
            ptsname_r_chk

diff --git a/login/Versions b/login/Versions
index f4df7183d5eb5fe39b8c230389e7d682d3335b81..475fcf063f05080f8f8987a442348315cf4fb060 100644 (file)
--- a/login/Versions
+++ b/login/Versions
@@ -42,6 +42,7 @@ libc {
     posix_openpt;
   }
   GLIBC_2.4 {
+    __getlogin_r_chk;
     __ptsname_r_chk;
   }
 }

diff --git a/debug/getlogin_r_chk.c b/login/getlogin_r_chk.c
similarity index 100%
rename from debug/getlogin_r_chk.c
rename to login/getlogin_r_chk.c