2004-09-30 02:24:51 +00:00
|
|
|
/* Cache handling for host lookup.
|
2020-01-01 00:14:33 +00:00
|
|
|
Copyright (C) 2004-2020 Free Software Foundation, Inc.
|
2004-09-30 02:24:51 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
|
|
|
|
|
2005-12-07 05:49:17 +00:00
|
|
|
This program is free software; you can redistribute it and/or modify
|
2007-07-16 00:56:07 +00:00
|
|
|
it under the terms of the GNU General Public License as published
|
|
|
|
by the Free Software Foundation; version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
2004-09-30 02:24:51 +00:00
|
|
|
|
2005-12-07 05:49:17 +00:00
|
|
|
This program is distributed in the hope that it will be useful,
|
2004-09-30 02:24:51 +00:00
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2005-12-07 05:49:17 +00:00
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
2004-09-30 02:24:51 +00:00
|
|
|
|
2005-12-07 05:49:17 +00:00
|
|
|
You should have received a copy of the GNU General Public License
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
along with this program; if not, see <https://www.gnu.org/licenses/>. */
|
2004-09-30 02:24:51 +00:00
|
|
|
|
|
|
|
#include <assert.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <grp.h>
|
|
|
|
#include <libintl.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <time.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <sys/mman.h>
|
2015-04-08 18:51:34 +00:00
|
|
|
#include <scratch_buffer.h>
|
2017-09-12 17:21:48 +00:00
|
|
|
#include <config.h>
|
2005-11-19 17:22:39 +00:00
|
|
|
|
|
|
|
#include "dbg_log.h"
|
|
|
|
#include "nscd.h"
|
2004-09-30 02:24:51 +00:00
|
|
|
|
|
|
|
#include "../nss/nsswitch.h"
|
|
|
|
|
2017-09-12 17:21:48 +00:00
|
|
|
#ifdef LINK_OBSOLETE_NSL
|
|
|
|
# define DEFAULT_CONFIG "compat [NOTFOUND=return] files"
|
|
|
|
#else
|
|
|
|
# define DEFAULT_CONFIG "files"
|
|
|
|
#endif
|
2004-09-30 02:24:51 +00:00
|
|
|
|
|
|
|
/* Type of the lookup function. */
|
|
|
|
typedef enum nss_status (*initgroups_dyn_function) (const char *, gid_t,
|
|
|
|
long int *, long int *,
|
|
|
|
gid_t **, long int, int *);
|
|
|
|
|
|
|
|
|
|
|
|
static const initgr_response_header notfound =
|
|
|
|
{
|
|
|
|
.version = NSCD_VERSION,
|
|
|
|
.found = 0,
|
|
|
|
.ngrps = 0
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
#include "../grp/compat-initgroups.c"
|
|
|
|
|
|
|
|
|
2011-02-06 01:07:27 +00:00
|
|
|
static time_t
|
2004-09-30 02:24:51 +00:00
|
|
|
addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
|
2009-02-13 20:36:37 +00:00
|
|
|
void *key, uid_t uid, struct hashentry *const he,
|
2004-09-30 02:24:51 +00:00
|
|
|
struct datahead *dh)
|
|
|
|
{
|
|
|
|
/* Search for the entry matching the key. Please note that we don't
|
|
|
|
look again in the table whether the dataset is now available. We
|
|
|
|
simply insert it. It does not matter if it is in there twice. The
|
|
|
|
pruning function only will look at the timestamp. */
|
|
|
|
|
|
|
|
|
|
|
|
/* We allocate all data in one memory block: the iov vector,
|
|
|
|
the response header and the dataset itself. */
|
|
|
|
struct dataset
|
|
|
|
{
|
|
|
|
struct datahead head;
|
|
|
|
initgr_response_header resp;
|
|
|
|
char strdata[0];
|
|
|
|
} *dataset = NULL;
|
|
|
|
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_unlikely (debug_level > 0))
|
2004-09-30 02:24:51 +00:00
|
|
|
{
|
|
|
|
if (he == NULL)
|
|
|
|
dbg_log (_("Haven't found \"%s\" in group cache!"), (char *) key);
|
|
|
|
else
|
|
|
|
dbg_log (_("Reloading \"%s\" in group cache!"), (char *) key);
|
|
|
|
}
|
|
|
|
|
|
|
|
static service_user *group_database;
|
2013-01-24 11:32:09 +00:00
|
|
|
service_user *nip;
|
2004-09-30 02:24:51 +00:00
|
|
|
int no_more;
|
|
|
|
|
2013-01-24 11:32:09 +00:00
|
|
|
if (group_database == NULL)
|
2019-05-15 11:51:35 +00:00
|
|
|
no_more = __nss_database_lookup2 ("group", NULL, DEFAULT_CONFIG,
|
|
|
|
&group_database);
|
2013-01-24 11:32:09 +00:00
|
|
|
else
|
|
|
|
no_more = 0;
|
|
|
|
nip = group_database;
|
2004-09-30 02:24:51 +00:00
|
|
|
|
|
|
|
/* We always use sysconf even if NGROUPS_MAX is defined. That way, the
|
|
|
|
limit can be raised in the kernel configuration without having to
|
|
|
|
recompile libc. */
|
|
|
|
long int limit = __sysconf (_SC_NGROUPS_MAX);
|
|
|
|
|
|
|
|
long int size;
|
|
|
|
if (limit > 0)
|
|
|
|
/* We limit the size of the intially allocated array. */
|
|
|
|
size = MIN (limit, 64);
|
|
|
|
else
|
|
|
|
/* No fixed limit on groups. Pick a starting buffer size. */
|
|
|
|
size = 16;
|
|
|
|
|
|
|
|
long int start = 0;
|
|
|
|
bool all_tryagain = true;
|
2006-03-04 Jakub Jelinek <jakub@redhat.com>
Roland McGrath <roland@redhat.com>
* sysdeps/unix/sysv/linux/i386/lowlevellock.h
(LLL_STUB_UNWIND_INFO_START, LLL_STUB_UNWIND_INFO_END,
LLL_STUB_UNWIND_INFO_3, LLL_STUB_UNWIND_INFO_4): Define.
(lll_mutex_lock, lll_robust_mutex_lock, lll_mutex_cond_lock,
lll_robust_mutex_cond_lock, lll_mutex_timedlock,
lll_robust_mutex_timedlock, lll_mutex_unlock,
lll_robust_mutex_unlock, lll_lock, lll_unlock): Use them.
Add _L_*_ symbols around the subsection.
* sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Add unwind info.
* sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S: Likewise.
2006-03-03 Jakub Jelinek <jakub@redhat.com>
Roland McGrath <roland@redhat.com>
* sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
(LLL_STUB_UNWIND_INFO_START, LLL_STUB_UNWIND_INFO_END,
LLL_STUB_UNWIND_INFO_5, LLL_STUB_UNWIND_INFO_6): Define.
(lll_mutex_lock, lll_robust_mutex_lock, lll_mutex_cond_lock,
lll_robust_mutex_cond_lock, lll_mutex_timedlock,
lll_robust_mutex_timedlock, lll_mutex_unlock,
lll_robust_mutex_unlock, lll_lock, lll_unlock): Use them.
Add _L_*_ symbols around the subsection.
* sysdeps/unix/sysv/linux/x86_64/lowlevellock.S: Add unwind info.
* sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S: Likewise.
2006-09-05 14:49:19 +00:00
|
|
|
bool any_success = false;
|
2004-09-30 02:24:51 +00:00
|
|
|
|
2007-11-25 21:29:30 +00:00
|
|
|
/* This is temporary memory, we need not (and must not) call
|
2004-09-30 02:24:51 +00:00
|
|
|
mempool_alloc. */
|
|
|
|
// XXX This really should use alloca. need to change the backends.
|
|
|
|
gid_t *groups = (gid_t *) malloc (size * sizeof (gid_t));
|
2014-02-10 13:45:42 +00:00
|
|
|
if (__glibc_unlikely (groups == NULL))
|
2004-09-30 02:24:51 +00:00
|
|
|
/* No more memory. */
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* Nothing added yet. */
|
|
|
|
while (! no_more)
|
|
|
|
{
|
2004-10-05 15:36:41 +00:00
|
|
|
long int prev_start = start;
|
2004-09-30 02:24:51 +00:00
|
|
|
enum nss_status status;
|
|
|
|
initgroups_dyn_function fct;
|
|
|
|
fct = __nss_lookup_function (nip, "initgroups_dyn");
|
|
|
|
|
|
|
|
if (fct == NULL)
|
|
|
|
{
|
|
|
|
status = compat_call (nip, key, -1, &start, &size, &groups,
|
|
|
|
limit, &errno);
|
|
|
|
|
|
|
|
if (nss_next_action (nip, NSS_STATUS_UNAVAIL) != NSS_ACTION_CONTINUE)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
status = DL_CALL_FCT (fct, (key, -1, &start, &size, &groups,
|
|
|
|
limit, &errno));
|
|
|
|
|
2004-10-05 15:36:41 +00:00
|
|
|
/* Remove duplicates. */
|
|
|
|
long int cnt = prev_start;
|
|
|
|
while (cnt < start)
|
|
|
|
{
|
|
|
|
long int inner;
|
|
|
|
for (inner = 0; inner < prev_start; ++inner)
|
|
|
|
if (groups[inner] == groups[cnt])
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (inner < prev_start)
|
|
|
|
groups[cnt] = groups[--start];
|
|
|
|
else
|
|
|
|
++cnt;
|
|
|
|
}
|
|
|
|
|
2004-09-30 02:24:51 +00:00
|
|
|
if (status != NSS_STATUS_TRYAGAIN)
|
|
|
|
all_tryagain = false;
|
|
|
|
|
|
|
|
/* This is really only for debugging. */
|
|
|
|
if (NSS_STATUS_TRYAGAIN > status || status > NSS_STATUS_RETURN)
|
2018-09-01 01:04:32 +00:00
|
|
|
__libc_fatal ("Illegal status in internal_getgrouplist.\n");
|
2004-09-30 02:24:51 +00:00
|
|
|
|
2006-08-02 00:08:03 +00:00
|
|
|
any_success |= status == NSS_STATUS_SUCCESS;
|
|
|
|
|
2004-09-30 02:24:51 +00:00
|
|
|
if (status != NSS_STATUS_SUCCESS
|
|
|
|
&& nss_next_action (nip, status) == NSS_ACTION_RETURN)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (nip->next == NULL)
|
|
|
|
no_more = -1;
|
|
|
|
else
|
|
|
|
nip = nip->next;
|
|
|
|
}
|
|
|
|
|
2012-12-04 15:14:13 +00:00
|
|
|
bool all_written;
|
2004-09-30 02:24:51 +00:00
|
|
|
ssize_t total;
|
2011-02-06 01:07:27 +00:00
|
|
|
time_t timeout;
|
2004-09-30 02:24:51 +00:00
|
|
|
out:
|
2012-12-04 15:14:13 +00:00
|
|
|
all_written = true;
|
2011-02-06 01:07:27 +00:00
|
|
|
timeout = MAX_TIMEOUT_VALUE;
|
2006-08-02 00:08:03 +00:00
|
|
|
if (!any_success)
|
2004-09-30 02:24:51 +00:00
|
|
|
{
|
|
|
|
/* Nothing found. Create a negative result record. */
|
2012-12-04 15:14:13 +00:00
|
|
|
total = sizeof (notfound);
|
2004-09-30 02:24:51 +00:00
|
|
|
|
|
|
|
if (he != NULL && all_tryagain)
|
|
|
|
{
|
|
|
|
/* If we have an old record available but cannot find one now
|
|
|
|
because the service is not available we keep the old record
|
|
|
|
and make sure it does not get removed. */
|
|
|
|
if (reload_count != UINT_MAX && dh->nreloads == reload_count)
|
|
|
|
/* Do not reset the value if we never not reload the record. */
|
|
|
|
dh->nreloads = reload_count - 1;
|
2011-02-06 01:07:27 +00:00
|
|
|
|
|
|
|
/* Reload with the same time-to-live value. */
|
|
|
|
timeout = dh->timeout = time (NULL) + db->postimeout;
|
2004-09-30 02:24:51 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* We have no data. This means we send the standard reply for this
|
|
|
|
case. */
|
2012-12-04 15:14:13 +00:00
|
|
|
if (fd != -1
|
|
|
|
&& TEMP_FAILURE_RETRY (send (fd, ¬found, total,
|
|
|
|
MSG_NOSIGNAL)) != total)
|
|
|
|
all_written = false;
|
2004-09-30 02:24:51 +00:00
|
|
|
|
2012-01-21 03:39:54 +00:00
|
|
|
/* If we have a transient error or cannot permanently store
|
|
|
|
the result, so be it. */
|
|
|
|
if (all_tryagain || __builtin_expect (db->negtimeout == 0, 0))
|
2011-07-02 02:53:01 +00:00
|
|
|
{
|
|
|
|
/* Mark the old entry as obsolete. */
|
|
|
|
if (dh != NULL)
|
|
|
|
dh->usable = false;
|
|
|
|
}
|
2011-07-02 03:02:09 +00:00
|
|
|
else if ((dataset = mempool_alloc (db, (sizeof (struct dataset)
|
|
|
|
+ req->key_len), 1)) != NULL)
|
2004-09-30 02:24:51 +00:00
|
|
|
{
|
2014-04-30 06:27:09 +00:00
|
|
|
timeout = datahead_init_neg (&dataset->head,
|
|
|
|
(sizeof (struct dataset)
|
|
|
|
+ req->key_len), total,
|
|
|
|
db->negtimeout);
|
2004-09-30 02:24:51 +00:00
|
|
|
|
|
|
|
/* This is the reply. */
|
|
|
|
memcpy (&dataset->resp, ¬found, total);
|
|
|
|
|
|
|
|
/* Copy the key data. */
|
|
|
|
char *key_copy = memcpy (dataset->strdata, key, req->key_len);
|
|
|
|
|
|
|
|
/* If necessary, we also propagate the data to disk. */
|
|
|
|
if (db->persistent)
|
|
|
|
{
|
|
|
|
// XXX async OK?
|
|
|
|
uintptr_t pval = (uintptr_t) dataset & ~pagesize_m1;
|
|
|
|
msync ((void *) pval,
|
|
|
|
((uintptr_t) dataset & pagesize_m1)
|
|
|
|
+ sizeof (struct dataset) + req->key_len, MS_ASYNC);
|
|
|
|
}
|
|
|
|
|
2008-05-11 03:03:14 +00:00
|
|
|
(void) cache_add (req->type, key_copy, req->key_len,
|
2008-05-18 21:54:43 +00:00
|
|
|
&dataset->head, true, db, uid, he == NULL);
|
2004-09-30 02:24:51 +00:00
|
|
|
|
2009-07-17 14:49:16 +00:00
|
|
|
pthread_rwlock_unlock (&db->lock);
|
|
|
|
|
2004-09-30 02:24:51 +00:00
|
|
|
/* Mark the old entry as obsolete. */
|
|
|
|
if (dh != NULL)
|
|
|
|
dh->usable = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
|
2012-12-04 15:14:13 +00:00
|
|
|
total = offsetof (struct dataset, strdata) + start * sizeof (int32_t);
|
2004-09-30 02:24:51 +00:00
|
|
|
|
|
|
|
/* If we refill the cache, first assume the reconrd did not
|
|
|
|
change. Allocate memory on the cache since it is likely
|
|
|
|
discarded anyway. If it turns out to be necessary to have a
|
|
|
|
new record we can still allocate real memory. */
|
|
|
|
bool alloca_used = false;
|
|
|
|
dataset = NULL;
|
|
|
|
|
|
|
|
if (he == NULL)
|
2009-02-13 20:36:37 +00:00
|
|
|
dataset = (struct dataset *) mempool_alloc (db, total + req->key_len,
|
|
|
|
1);
|
2004-09-30 02:24:51 +00:00
|
|
|
|
|
|
|
if (dataset == NULL)
|
|
|
|
{
|
|
|
|
/* We cannot permanently add the result in the moment. But
|
|
|
|
we can provide the result as is. Store the data in some
|
|
|
|
temporary memory. */
|
|
|
|
dataset = (struct dataset *) alloca (total + req->key_len);
|
|
|
|
|
|
|
|
/* We cannot add this record to the permanent database. */
|
|
|
|
alloca_used = true;
|
|
|
|
}
|
|
|
|
|
2014-04-30 06:27:09 +00:00
|
|
|
timeout = datahead_init_pos (&dataset->head, total + req->key_len,
|
|
|
|
total - offsetof (struct dataset, resp),
|
|
|
|
he == NULL ? 0 : dh->nreloads + 1,
|
|
|
|
db->postimeout);
|
2004-09-30 02:24:51 +00:00
|
|
|
|
|
|
|
dataset->resp.version = NSCD_VERSION;
|
|
|
|
dataset->resp.found = 1;
|
|
|
|
dataset->resp.ngrps = start;
|
|
|
|
|
|
|
|
char *cp = dataset->strdata;
|
|
|
|
|
|
|
|
/* Copy the GID values. If the size of the types match this is
|
|
|
|
very simple. */
|
|
|
|
if (sizeof (gid_t) == sizeof (int32_t))
|
|
|
|
cp = mempcpy (cp, groups, start * sizeof (gid_t));
|
|
|
|
else
|
|
|
|
{
|
|
|
|
gid_t *gcp = (gid_t *) cp;
|
|
|
|
|
|
|
|
for (int i = 0; i < start; ++i)
|
|
|
|
*gcp++ = groups[i];
|
|
|
|
|
|
|
|
cp = (char *) gcp;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Finally the user name. */
|
|
|
|
memcpy (cp, key, req->key_len);
|
|
|
|
|
2008-06-12 16:16:38 +00:00
|
|
|
assert (cp == dataset->strdata + total - offsetof (struct dataset,
|
|
|
|
strdata));
|
|
|
|
|
2004-09-30 02:24:51 +00:00
|
|
|
/* Now we can determine whether on refill we have to create a new
|
|
|
|
record or not. */
|
|
|
|
if (he != NULL)
|
|
|
|
{
|
|
|
|
assert (fd == -1);
|
|
|
|
|
|
|
|
if (total + req->key_len == dh->allocsize
|
|
|
|
&& total - offsetof (struct dataset, resp) == dh->recsize
|
|
|
|
&& memcmp (&dataset->resp, dh->data,
|
|
|
|
dh->allocsize - offsetof (struct dataset, resp)) == 0)
|
|
|
|
{
|
|
|
|
/* The data has not changed. We will just bump the
|
|
|
|
timeout value. Note that the new record has been
|
|
|
|
allocated on the stack and need not be freed. */
|
|
|
|
dh->timeout = dataset->head.timeout;
|
|
|
|
++dh->nreloads;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* We have to create a new record. Just allocate
|
|
|
|
appropriate memory and copy it. */
|
|
|
|
struct dataset *newp
|
2008-04-19 16:42:41 +00:00
|
|
|
= (struct dataset *) mempool_alloc (db, total + req->key_len,
|
2009-02-13 20:36:37 +00:00
|
|
|
1);
|
2004-09-30 02:24:51 +00:00
|
|
|
if (newp != NULL)
|
|
|
|
{
|
|
|
|
/* Adjust pointer into the memory block. */
|
|
|
|
cp = (char *) newp + (cp - (char *) dataset);
|
|
|
|
|
|
|
|
dataset = memcpy (newp, dataset, total + req->key_len);
|
|
|
|
alloca_used = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Mark the old record as obsolete. */
|
|
|
|
dh->usable = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* We write the dataset before inserting it to the database
|
|
|
|
since while inserting this thread might block and so would
|
|
|
|
unnecessarily let the receiver wait. */
|
|
|
|
assert (fd != -1);
|
|
|
|
|
2018-05-16 13:51:15 +00:00
|
|
|
if (writeall (fd, &dataset->resp, dataset->head.recsize)
|
|
|
|
!= dataset->head.recsize)
|
|
|
|
all_written = false;
|
2004-09-30 02:24:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Add the record to the database. But only if it has not been
|
|
|
|
stored on the stack. */
|
|
|
|
if (! alloca_used)
|
|
|
|
{
|
|
|
|
/* If necessary, we also propagate the data to disk. */
|
|
|
|
if (db->persistent)
|
|
|
|
{
|
|
|
|
// XXX async OK?
|
|
|
|
uintptr_t pval = (uintptr_t) dataset & ~pagesize_m1;
|
|
|
|
msync ((void *) pval,
|
Break some lines before not after operators.
The GNU Coding Standards specify that line breaks in expressions
should go before an operator, not after one. This patch fixes various
code to do this. It only changes code that appears to be mostly
following GNU style anyway, not files and directories with
substantially different formatting. It is not exhaustive even for
files using GNU style (for example, changes to sysdeps files are
deferred for subsequent cleanups). Some files changed are shared with
gnulib, but most are specific to glibc. Changes were made manually,
with places to change found by grep (so some cases, e.g. where the
operator was followed by a comment at end of line, are particularly
liable to have been missed by grep, but I did include cases where the
operator was followed by backslash-newline).
This patch generally does not attempt to address other coding style
issues in the expressions changed (for example, missing spaces before
'(', or lack of parentheses to ensure indentation of continuation
lines properly reflects operator precedence).
Tested for x86_64, and with build-many-glibcs.py.
* benchtests/bench-memmem.c (simple_memmem): Break lines before
rather than after operators.
* benchtests/bench-skeleton.c (TIMESPEC_AFTER): Likewise.
* crypt/md5.c (md5_finish_ctx): Likewise.
* crypt/sha256.c (__sha256_finish_ctx): Likewise.
* crypt/sha512.c (__sha512_finish_ctx): Likewise.
* elf/cache.c (load_aux_cache): Likewise.
* elf/dl-load.c (open_verify): Likewise.
* elf/get-dynamic-info.h (elf_get_dynamic_info): Likewise.
* elf/readelflib.c (process_elf_file): Likewise.
* elf/rtld.c (dl_main): Likewise.
* elf/sprof.c (generate_call_graph): Likewise.
* hurd/ctty-input.c (_hurd_ctty_input): Likewise.
* hurd/ctty-output.c (_hurd_ctty_output): Likewise.
* hurd/dtable.c (reauth_dtable): Likewise.
* hurd/getdport.c (__getdport): Likewise.
* hurd/hurd/signal.h (_hurd_interrupted_rpc_timeout): Likewise.
* hurd/hurd/sigpreempt.h (HURD_PREEMPT_SIGNAL_P): Likewise.
* hurd/hurdfault.c (_hurdsig_fault_catch_exception_raise):
Likewise.
* hurd/hurdioctl.c (fioctl): Likewise.
* hurd/hurdselect.c (_hurd_select): Likewise.
* hurd/hurdsig.c (_hurdsig_abort_rpcs): Likewise.
(STOPSIGS): Likewise.
* hurd/hurdstartup.c (_hurd_startup): Likewise.
* hurd/intr-msg.c (_hurd_intr_rpc_mach_msg): Likewise.
* hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Likewise.
* hurd/msgportdemux.c (msgport_server): Likewise.
* hurd/setauth.c (_hurd_setauth): Likewise.
* include/features.h (__GLIBC_USE_DEPRECATED_SCANF): Likewise.
* libio/libioP.h [IO_DEBUG] (CHECK_FILE): Likewise.
* locale/programs/ld-ctype.c (set_class_defaults): Likewise.
* localedata/tests-mbwc/tst_swscanf.c (tst_swscanf): Likewise.
* login/tst-utmp.c (do_check): Likewise.
(simulate_login): Likewise.
* mach/lowlevellock.h (lll_lock): Likewise.
(lll_trylock): Likewise.
* math/test-fenv.c (ALL_EXC): Likewise.
* math/test-fenvinline.c (ALL_EXC): Likewise.
* misc/sys/cdefs.h (__attribute_deprecated_msg__): Likewise.
* nis/nis_call.c (__do_niscall3): Likewise.
* nis/nis_callback.c (cb_prog_1): Likewise.
* nis/nis_defaults.c (searchaccess): Likewise.
* nis/nis_findserv.c (__nis_findfastest_with_timeout): Likewise.
* nis/nis_ismember.c (internal_ismember): Likewise.
* nis/nis_local_names.c (nis_local_principal): Likewise.
* nis/nss_nis/nis-rpc.c (_nss_nis_getrpcbyname_r): Likewise.
* nis/nss_nisplus/nisplus-netgrp.c (_nss_nisplus_getnetgrent_r):
Likewise.
* nis/ypclnt.c (yp_match): Likewise.
(yp_first): Likewise.
(yp_next): Likewise.
(yp_master): Likewise.
(yp_order): Likewise.
* nscd/hstcache.c (cache_addhst): Likewise.
* nscd/initgrcache.c (addinitgroupsX): Likewise.
* nss/nss_compat/compat-pwd.c (copy_pwd_changes): Likewise.
(internal_getpwuid_r): Likewise.
* nss/nss_compat/compat-spwd.c (copy_spwd_changes): Likewise.
* posix/glob.h (__GLOB_FLAGS): Likewise.
* posix/regcomp.c (peek_token): Likewise.
(peek_token_bracket): Likewise.
(parse_expression): Likewise.
* posix/regexec.c (sift_states_iter_mb): Likewise.
(check_node_accept_bytes): Likewise.
* posix/tst-spawn3.c (do_test): Likewise.
* posix/wordexp-test.c (testit): Likewise.
* posix/wordexp.c (parse_tilde): Likewise.
(exec_comm): Likewise.
* posix/wordexp.h (__WRDE_FLAGS): Likewise.
* resource/vtimes.c (TIMEVAL_TO_VTIMES): Likewise.
* setjmp/sigjmp.c (__sigjmp_save): Likewise.
* stdio-common/printf_fp.c (__printf_fp_l): Likewise.
* stdio-common/tst-fileno.c (do_test): Likewise.
* stdio-common/vfprintf-internal.c (vfprintf): Likewise.
* stdlib/strfmon_l.c (__vstrfmon_l_internal): Likewise.
* stdlib/strtod_l.c (round_and_return): Likewise.
(____STRTOF_INTERNAL): Likewise.
* stdlib/tst-strfrom.h (TEST_STRFROM): Likewise.
* string/strcspn.c (STRCSPN): Likewise.
* string/test-memmem.c (simple_memmem): Likewise.
* termios/tcsetattr.c (tcsetattr): Likewise.
* time/alt_digit.c (_nl_parse_alt_digit): Likewise.
* time/asctime.c (asctime_internal): Likewise.
* time/strptime_l.c (__strptime_internal): Likewise.
* time/sys/time.h (timercmp): Likewise.
* time/tzfile.c (__tzfile_compute): Likewise.
2019-02-22 01:32:36 +00:00
|
|
|
((uintptr_t) dataset & pagesize_m1) + total
|
|
|
|
+ req->key_len, MS_ASYNC);
|
2004-09-30 02:24:51 +00:00
|
|
|
}
|
|
|
|
|
2008-05-11 03:03:14 +00:00
|
|
|
(void) cache_add (INITGROUPS, cp, req->key_len, &dataset->head, true,
|
2008-05-18 21:54:43 +00:00
|
|
|
db, uid, he == NULL);
|
2009-07-17 14:49:16 +00:00
|
|
|
|
|
|
|
pthread_rwlock_unlock (&db->lock);
|
2004-09-30 02:24:51 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
free (groups);
|
|
|
|
|
2012-12-04 15:14:13 +00:00
|
|
|
if (__builtin_expect (!all_written, 0) && debug_level > 0)
|
2004-09-30 02:24:51 +00:00
|
|
|
{
|
|
|
|
char buf[256];
|
|
|
|
dbg_log (_("short write in %s: %s"), __FUNCTION__,
|
|
|
|
strerror_r (errno, buf, sizeof (buf)));
|
|
|
|
}
|
2011-02-06 01:07:27 +00:00
|
|
|
|
|
|
|
return timeout;
|
2004-09-30 02:24:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
addinitgroups (struct database_dyn *db, int fd, request_header *req, void *key,
|
|
|
|
uid_t uid)
|
|
|
|
{
|
|
|
|
addinitgroupsX (db, fd, req, key, uid, NULL, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-02-06 01:07:27 +00:00
|
|
|
time_t
|
2004-09-30 02:24:51 +00:00
|
|
|
readdinitgroups (struct database_dyn *db, struct hashentry *he,
|
|
|
|
struct datahead *dh)
|
|
|
|
{
|
|
|
|
request_header req =
|
|
|
|
{
|
|
|
|
.type = INITGROUPS,
|
|
|
|
.key_len = he->len
|
|
|
|
};
|
|
|
|
|
2011-02-06 01:07:27 +00:00
|
|
|
return addinitgroupsX (db, -1, &req, db->data + he->key, he->owner, he, dh);
|
2004-09-30 02:24:51 +00:00
|
|
|
}
|