diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | debug/Makefile | 5 | ||||
| -rw-r--r-- | debug/Versions | 2 | ||||
| -rw-r--r-- | login/Makefile | 3 | ||||
| -rw-r--r-- | login/Versions | 3 | ||||
| -rw-r--r-- | login/ptsname_r_chk.c (renamed from debug/ptsname_r_chk.c) | 0 |
6 files changed, 17 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index c5ec238849..b82e7783bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2013-05-06 Roland McGrath <roland@hack.frob.com> + * debug/ptsname_r_chk.c: Moved to ... + * login/ptsname_r_chk.c: ... here. + * debug/Makefile (routines): Move ptsname_r_chk to ... + * login/Makefile (routines): ... here. + * debug/Versions (libc: GLIBC_2.4): Move __ptsname_r_chk to ... + * login/Versions (libc: GLIBC_2.4): ... here. + * posix/getlogin.c: Moved to ... * login/getlogin.c: ... here. * posix/getlogin_r.c: Moved to ... diff --git a/debug/Makefile b/debug/Makefile index 55017d327c..682f14c7d3 100644 --- a/debug/Makefile +++ b/debug/Makefile @@ -22,6 +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. 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 \ @@ -30,7 +33,7 @@ routines = backtrace backtracesyms backtracesymsfd noophooks \ gets_chk chk_fail readonly-area fgets_chk fgets_u_chk \ read_chk pread_chk pread64_chk recv_chk recvfrom_chk \ readlink_chk readlinkat_chk getwd_chk getcwd_chk \ - realpath_chk ptsname_r_chk fread_chk fread_u_chk \ + realpath_chk fread_chk fread_u_chk \ wctomb_chk wcscpy_chk wmemcpy_chk wmemmove_chk wmempcpy_chk \ wcpcpy_chk wcsncpy_chk wcscat_chk wcsncat_chk wmemset_chk \ wcpncpy_chk \ diff --git a/debug/Versions b/debug/Versions index c1722fab20..e2b90ebed5 100644 --- a/debug/Versions +++ b/debug/Versions @@ -23,7 +23,7 @@ libc { __read_chk; __pread_chk; __pread64_chk; __readlink_chk; __getcwd_chk; __getwd_chk; __recv_chk; __recvfrom_chk; - __realpath_chk; __ptsname_r_chk; __wctomb_chk; + __realpath_chk; __wctomb_chk; __stpncpy_chk; __wcscpy_chk; __wmemcpy_chk; __wmemmove_chk; __wmempcpy_chk; __wcpcpy_chk; __wcsncpy_chk; __wcscat_chk; __wcsncat_chk; __wmemset_chk; __wcpncpy_chk; diff --git a/login/Makefile b/login/Makefile index 4b057ec927..fa5aa71381 100644 --- a/login/Makefile +++ b/login/Makefile @@ -25,7 +25,8 @@ headers := utmp.h bits/utmp.h lastlog.h pty.h routines := getlogin getlogin_r setlogin \ getutent getutent_r getutid getutline getutid_r getutline_r \ - utmp_file utmpname updwtmp getpt grantpt unlockpt ptsname + utmp_file utmpname updwtmp getpt grantpt unlockpt ptsname \ + ptsname_r_chk CFLAGS-grantpt.c = -DLIBEXECDIR='"$(libexecdir)"' diff --git a/login/Versions b/login/Versions index 0c9e75a7ef..f4df7183d5 100644 --- a/login/Versions +++ b/login/Versions @@ -41,6 +41,9 @@ libc { # p* posix_openpt; } + GLIBC_2.4 { + __ptsname_r_chk; + } } libutil { diff --git a/debug/ptsname_r_chk.c b/login/ptsname_r_chk.c index 7e039acb74..7e039acb74 100644 --- a/debug/ptsname_r_chk.c +++ b/login/ptsname_r_chk.c |