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.
This commit is contained in:
parent
676599b36a
commit
ef6b619f73
|
@ -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>
|
2015-10-02 Florian Weimer <fweimer@redhat.com>
|
||||||
|
|
||||||
[BZ #18724]
|
[BZ #18724]
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
overwritten with a pointer the caller has to free if the function
|
overwritten with a pointer the caller has to free if the function
|
||||||
returns successfully. On failure, return NULL. */
|
returns successfully. On failure, return NULL. */
|
||||||
const char *
|
const char *
|
||||||
|
internal_function
|
||||||
__nss_rewrite_field (const char *value, char **to_be_freed)
|
__nss_rewrite_field (const char *value, char **to_be_freed)
|
||||||
{
|
{
|
||||||
*to_be_freed = NULL;
|
*to_be_freed = NULL;
|
||||||
|
|
|
@ -24,6 +24,7 @@ const char __nss_invalid_field_characters[] = NSS_INVALID_FIELD_CHARACTERS;
|
||||||
does not contain characters not permitted in NSS database
|
does not contain characters not permitted in NSS database
|
||||||
fields. */
|
fields. */
|
||||||
_Bool
|
_Bool
|
||||||
|
internal_function
|
||||||
__nss_valid_field (const char *value)
|
__nss_valid_field (const char *value)
|
||||||
{
|
{
|
||||||
return value == NULL
|
return value == NULL
|
||||||
|
|
|
@ -24,6 +24,7 @@ static const char invalid_characters[] = NSS_INVALID_FIELD_CHARACTERS ",";
|
||||||
/* Check that all list members match the field syntax requirements and
|
/* Check that all list members match the field syntax requirements and
|
||||||
do not contain the character ','. */
|
do not contain the character ','. */
|
||||||
_Bool
|
_Bool
|
||||||
|
internal_function
|
||||||
__nss_valid_list_field (char **list)
|
__nss_valid_list_field (char **list)
|
||||||
{
|
{
|
||||||
if (list == NULL)
|
if (list == NULL)
|
||||||
|
|
Loading…
Reference in New Issue