This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.22-316-gef6b619
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 2 Oct 2015 11:14:43 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.22-316-gef6b619
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via ef6b619f73e49b6d87c7530e6e9f8a59723b492d (commit)
from 676599b36a92f3c201c5682ee7a5caddd9f370a4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ef6b619f73e49b6d87c7530e6e9f8a59723b492d
commit ef6b619f73e49b6d87c7530e6e9f8a59723b492d
Author: Joseph Myers <joseph@codesourcery.com>
Date: Fri Oct 2 11:14:19 2015 +0000
Fix i386 build after put*ent hardening changes.
The recent put*ent hardening changes broke the build for i386. i386
defines internal_function to __attribute__ ((regparm (3), stdcall)),
which affects type compatibility, so requiring internal_function to be
used consistently on declarations and definitions. This patch adds
internal_function to the definitions of the new functions using it on
their declarations.
Tested for i386 that this fixes the build.
* nss/rewrite_field.c (__nss_rewrite_field): Use
internal_function.
* nss/valid_field.c (__nss_valid_field): Likewise.
* nss/valid_list_field.c (__nss_valid_list_field): Likewise.
diff --git a/ChangeLog b/ChangeLog
index 20953ee..51476e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-10-02 Joseph Myers <joseph@codesourcery.com>
+
+ * nss/rewrite_field.c (__nss_rewrite_field): Use
+ internal_function.
+ * nss/valid_field.c (__nss_valid_field): Likewise.
+ * nss/valid_list_field.c (__nss_valid_list_field): Likewise.
+
2015-10-02 Florian Weimer <fweimer@redhat.com>
[BZ #18724]
diff --git a/nss/rewrite_field.c b/nss/rewrite_field.c
index fb9d274..2535457 100644
--- a/nss/rewrite_field.c
+++ b/nss/rewrite_field.c
@@ -24,6 +24,7 @@
overwritten with a pointer the caller has to free if the function
returns successfully. On failure, return NULL. */
const char *
+internal_function
__nss_rewrite_field (const char *value, char **to_be_freed)
{
*to_be_freed = NULL;
diff --git a/nss/valid_field.c b/nss/valid_field.c
index 5fcddc5..061c121 100644
--- a/nss/valid_field.c
+++ b/nss/valid_field.c
@@ -24,6 +24,7 @@ const char __nss_invalid_field_characters[] = NSS_INVALID_FIELD_CHARACTERS;
does not contain characters not permitted in NSS database
fields. */
_Bool
+internal_function
__nss_valid_field (const char *value)
{
return value == NULL
diff --git a/nss/valid_list_field.c b/nss/valid_list_field.c
index 98ab93b..80ab12b 100644
--- a/nss/valid_list_field.c
+++ b/nss/valid_list_field.c
@@ -24,6 +24,7 @@ static const char invalid_characters[] = NSS_INVALID_FIELD_CHARACTERS ",";
/* Check that all list members match the field syntax requirements and
do not contain the character ','. */
_Bool
+internal_function
__nss_valid_list_field (char **list)
{
if (list == NULL)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
nss/rewrite_field.c | 1 +
nss/valid_field.c | 1 +
nss/valid_list_field.c | 1 +
4 files changed, 10 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources