mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-23 13:30:06 +00:00
ef6b619f73
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.
53 lines
1.7 KiB
C
53 lines
1.7 KiB
C
/* Copyright (C) 2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <nss.h>
|
|
#include <string.h>
|
|
|
|
/* Rewrite VALUE to a valid field value in the NSS database. Invalid
|
|
characters are replaced with a single space character ' '. If
|
|
VALUE is NULL, the empty string is returned. *TO_BE_FREED is
|
|
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;
|
|
if (value == NULL)
|
|
return "";
|
|
|
|
/* Search for non-allowed characters. */
|
|
const char *p = strpbrk (value, __nss_invalid_field_characters);
|
|
if (p == NULL)
|
|
return value;
|
|
*to_be_freed = __strdup (value);
|
|
if (*to_be_freed == NULL)
|
|
return NULL;
|
|
|
|
/* Switch pointer to freshly-allocated buffer. */
|
|
char *bad = *to_be_freed + (p - value);
|
|
do
|
|
{
|
|
*bad = ' ';
|
|
bad = strpbrk (bad + 1, __nss_invalid_field_characters);
|
|
}
|
|
while (bad != NULL);
|
|
|
|
return *to_be_freed;
|
|
}
|