mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-21 20:40:05 +00:00
34a5a1460e
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.
381 lines
9.6 KiB
C
381 lines
9.6 KiB
C
/* Copyright (C) 1997-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1997.
|
|
|
|
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 <errno.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <libintl.h>
|
|
#include <rpc/rpc.h>
|
|
#include <rpc/pmap_clnt.h>
|
|
#include <string.h>
|
|
#include <memory.h>
|
|
#include <syslog.h>
|
|
#include <sys/poll.h>
|
|
#include <sys/socket.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|
|
#include <rpc/key_prot.h>
|
|
#include <rpcsvc/nis.h>
|
|
#include <rpcsvc/nis_callback.h>
|
|
#include <libc-lock.h>
|
|
|
|
#include "nis_xdr.h"
|
|
#include "nis_intern.h"
|
|
|
|
/* Sorry, we are not able to make this threadsafe. Stupid. But some
|
|
functions doesn't send us a nis_result obj, so we don't have a
|
|
cookie. Maybe we could use keys for threads ? Have to learn more
|
|
about pthreads -- kukuk@vt.uni-paderborn.de */
|
|
|
|
static nis_cb *data;
|
|
|
|
__libc_lock_define_initialized (static, callback)
|
|
|
|
|
|
#if 0
|
|
static char *
|
|
__nis_getpkey(const char *sname)
|
|
{
|
|
char buf[(strlen (sname) + 1) * 2 + 40];
|
|
char pkey[HEXKEYBYTES + 1];
|
|
char *cp, *domain;
|
|
nis_result *res;
|
|
unsigned int len = 0;
|
|
|
|
domain = strchr (sname, '.');
|
|
if (domain == NULL)
|
|
return NULL;
|
|
|
|
/* Remove prefixing dot */
|
|
++domain;
|
|
|
|
cp = stpcpy (buf, "[cname=");
|
|
cp = stpcpy (cp, sname);
|
|
cp = stpcpy (cp, ",auth_type=DES],cred.org_dir.");
|
|
cp = stpcpy (cp, domain);
|
|
|
|
res = nis_list (buf, USE_DGRAM|NO_AUTHINFO|FOLLOW_LINKS|FOLLOW_PATH,
|
|
NULL, NULL);
|
|
|
|
if (res == NULL)
|
|
return NULL;
|
|
|
|
if (NIS_RES_STATUS (res) != NIS_SUCCESS)
|
|
{
|
|
nis_freeresult (res);
|
|
return NULL;
|
|
}
|
|
|
|
len = ENTRY_LEN(NIS_RES_OBJECT(res), 3);
|
|
strncpy (pkey, ENTRY_VAL(NIS_RES_OBJECT(res), 3), len);
|
|
pkey[len] = '\0';
|
|
cp = strchr (pkey, ':');
|
|
if (cp != NULL)
|
|
*cp = '\0';
|
|
|
|
nis_freeresult (res);
|
|
|
|
return strdup (pkey);
|
|
}
|
|
#endif
|
|
|
|
static void
|
|
cb_prog_1 (struct svc_req *rqstp, SVCXPRT *transp)
|
|
{
|
|
union
|
|
{
|
|
cback_data cbproc_receive_1_arg;
|
|
nis_error cbproc_error_1_arg;
|
|
}
|
|
argument;
|
|
char *result;
|
|
xdrproc_t xdr_argument, xdr_result;
|
|
bool_t bool_result;
|
|
|
|
switch (rqstp->rq_proc)
|
|
{
|
|
case NULLPROC:
|
|
svc_sendreply (transp, (xdrproc_t) xdr_void, (char *) NULL);
|
|
return;
|
|
|
|
case CBPROC_RECEIVE:
|
|
{
|
|
unsigned int i;
|
|
|
|
xdr_argument = (xdrproc_t) xdr_cback_data;
|
|
xdr_result = (xdrproc_t) xdr_bool;
|
|
memset (&argument, 0, sizeof (argument));
|
|
if (!svc_getargs (transp, xdr_argument, (caddr_t) & argument))
|
|
{
|
|
svcerr_decode (transp);
|
|
return;
|
|
}
|
|
bool_result = FALSE;
|
|
for (i = 0; i < argument.cbproc_receive_1_arg.entries.entries_len; ++i)
|
|
{
|
|
#define cbproc_entry(a) argument.cbproc_receive_1_arg.entries.entries_val[a]
|
|
char name[strlen (cbproc_entry(i)->zo_name)
|
|
+ strlen (cbproc_entry(i)->zo_domain) + 3];
|
|
char *cp;
|
|
|
|
cp = stpcpy (name, cbproc_entry(i)->zo_name);
|
|
*cp++ = '.';
|
|
cp = stpcpy (cp, cbproc_entry(i)->zo_domain);
|
|
|
|
if ((data->callback) (name, cbproc_entry(i), data->userdata))
|
|
{
|
|
bool_result = TRUE;
|
|
data->nomore = 1;
|
|
data->result = NIS_SUCCESS;
|
|
break;
|
|
}
|
|
}
|
|
result = (char *) &bool_result;
|
|
}
|
|
break;
|
|
case CBPROC_FINISH:
|
|
xdr_argument = (xdrproc_t) xdr_void;
|
|
xdr_result = (xdrproc_t) xdr_void;
|
|
memset (&argument, 0, sizeof (argument));
|
|
if (!svc_getargs (transp, xdr_argument, (caddr_t) & argument))
|
|
{
|
|
svcerr_decode (transp);
|
|
return;
|
|
}
|
|
data->nomore = 1;
|
|
data->result = NIS_SUCCESS;
|
|
bool_result = TRUE; /* to make gcc happy, not necessary */
|
|
result = (char *) &bool_result;
|
|
break;
|
|
case CBPROC_ERROR:
|
|
xdr_argument = (xdrproc_t) _xdr_nis_error;
|
|
xdr_result = (xdrproc_t) xdr_void;
|
|
memset (&argument, 0, sizeof (argument));
|
|
if (!svc_getargs (transp, xdr_argument, (caddr_t) & argument))
|
|
{
|
|
svcerr_decode (transp);
|
|
return;
|
|
}
|
|
data->nomore = 1;
|
|
data->result = argument.cbproc_error_1_arg;
|
|
bool_result = TRUE; /* to make gcc happy, not necessary */
|
|
result = (char *) &bool_result;
|
|
break;
|
|
default:
|
|
svcerr_noproc (transp);
|
|
return;
|
|
}
|
|
if (result != NULL && !svc_sendreply (transp, xdr_result, result))
|
|
svcerr_systemerr (transp);
|
|
if (!svc_freeargs (transp, xdr_argument, (caddr_t) & argument))
|
|
{
|
|
fputs (_ ("unable to free arguments"), stderr);
|
|
exit (1);
|
|
}
|
|
return;
|
|
}
|
|
|
|
static nis_error
|
|
internal_nis_do_callback (struct dir_binding *bptr, netobj *cookie,
|
|
struct nis_cb *cb)
|
|
{
|
|
struct timeval TIMEOUT = {25, 0};
|
|
bool_t cb_is_running;
|
|
|
|
data = cb;
|
|
|
|
for (;;)
|
|
{
|
|
struct pollfd my_pollfd[svc_max_pollfd];
|
|
int i;
|
|
|
|
if (svc_max_pollfd == 0 && svc_pollfd == NULL)
|
|
return NIS_CBERROR;
|
|
|
|
for (i = 0; i < svc_max_pollfd; ++i)
|
|
{
|
|
my_pollfd[i].fd = svc_pollfd[i].fd;
|
|
my_pollfd[i].events = svc_pollfd[i].events;
|
|
my_pollfd[i].revents = 0;
|
|
}
|
|
|
|
switch (i = TEMP_FAILURE_RETRY (__poll (my_pollfd, svc_max_pollfd,
|
|
25*1000)))
|
|
{
|
|
case -1:
|
|
return NIS_CBERROR;
|
|
case 0:
|
|
/* See if callback 'thread' in the server is still alive. */
|
|
cb_is_running = FALSE;
|
|
if (clnt_call (bptr->clnt, NIS_CALLBACK, (xdrproc_t) xdr_netobj,
|
|
(caddr_t) cookie, (xdrproc_t) xdr_bool,
|
|
(caddr_t) &cb_is_running, TIMEOUT) != RPC_SUCCESS)
|
|
cb_is_running = FALSE;
|
|
|
|
if (cb_is_running == FALSE)
|
|
{
|
|
syslog (LOG_ERR, "NIS+: callback timed out");
|
|
return NIS_CBERROR;
|
|
}
|
|
break;
|
|
default:
|
|
svc_getreq_poll (my_pollfd, i);
|
|
if (data->nomore)
|
|
return data->result;
|
|
}
|
|
}
|
|
}
|
|
|
|
nis_error
|
|
__nis_do_callback (struct dir_binding *bptr, netobj *cookie,
|
|
struct nis_cb *cb)
|
|
{
|
|
nis_error result;
|
|
|
|
__libc_lock_lock (callback);
|
|
|
|
result = internal_nis_do_callback (bptr, cookie, cb);
|
|
|
|
__libc_lock_unlock (callback);
|
|
|
|
return result;
|
|
}
|
|
|
|
struct nis_cb *
|
|
__nis_create_callback (int (*callback) (const_nis_name, const nis_object *,
|
|
const void *),
|
|
const void *userdata, unsigned int flags)
|
|
{
|
|
struct nis_cb *cb;
|
|
int sock = RPC_ANYSOCK;
|
|
struct sockaddr_in sin;
|
|
socklen_t len = sizeof (struct sockaddr_in);
|
|
unsigned short port;
|
|
int nomsg = 0;
|
|
|
|
cb = (struct nis_cb *) calloc (1,
|
|
sizeof (struct nis_cb) + sizeof (nis_server));
|
|
if (__glibc_unlikely (cb == NULL))
|
|
goto failed;
|
|
cb->serv = (nis_server *) (cb + 1);
|
|
cb->serv->name = strdup (nis_local_principal ());
|
|
if (__glibc_unlikely (cb->serv->name == NULL))
|
|
goto failed;
|
|
cb->serv->ep.ep_val = (endpoint *) calloc (2, sizeof (endpoint));
|
|
if (__glibc_unlikely (cb->serv->ep.ep_val == NULL))
|
|
goto failed;
|
|
cb->serv->ep.ep_len = 1;
|
|
cb->serv->ep.ep_val[0].family = strdup ("inet");
|
|
if (__glibc_unlikely (cb->serv->ep.ep_val[0].family == NULL))
|
|
goto failed;
|
|
cb->callback = callback;
|
|
cb->userdata = userdata;
|
|
|
|
if ((flags & NO_AUTHINFO) || !key_secretkey_is_set ())
|
|
{
|
|
cb->serv->key_type = NIS_PK_NONE;
|
|
cb->serv->pkey.n_bytes = NULL;
|
|
cb->serv->pkey.n_len = 0;
|
|
}
|
|
else
|
|
{
|
|
#if 0
|
|
if ((cb->serv->pkey.n_bytes = __nis_getpkey (cb->serv->name)) == NULL)
|
|
{
|
|
cb->serv->pkey.n_len = 0;
|
|
cb->serv->key_type = NIS_PK_NONE;
|
|
}
|
|
else
|
|
{
|
|
cb->serv->key_type = NIS_PK_DH;
|
|
cb->serv->pkey.n_len = strlen(cb->serv->pkey.n_bytes);
|
|
}
|
|
#else
|
|
cb->serv->pkey.n_len =0;
|
|
cb->serv->pkey.n_bytes = NULL;
|
|
cb->serv->key_type = NIS_PK_NONE;
|
|
#endif
|
|
}
|
|
|
|
cb->serv->ep.ep_val[0].proto = strdup ((flags & USE_DGRAM) ? "udp" : "tcp");
|
|
if (__glibc_unlikely (cb->serv->ep.ep_val[0].proto == NULL))
|
|
goto failed;
|
|
cb->xprt = ((flags & USE_DGRAM)
|
|
? svcudp_bufcreate (sock, 100, 8192)
|
|
: svctcp_create (sock, 100, 8192));
|
|
if (cb->xprt == NULL)
|
|
{
|
|
nomsg = 1;
|
|
goto failed;
|
|
}
|
|
cb->sock = cb->xprt->xp_sock;
|
|
if (!svc_register (cb->xprt, CB_PROG, CB_VERS, cb_prog_1, 0))
|
|
{
|
|
xprt_unregister (cb->xprt);
|
|
svc_destroy (cb->xprt);
|
|
xdr_free ((xdrproc_t) _xdr_nis_server, (char *) cb->serv);
|
|
free (cb);
|
|
syslog (LOG_ERR, "NIS+: failed to register callback dispatcher");
|
|
return NULL;
|
|
}
|
|
|
|
if (getsockname (cb->sock, (struct sockaddr *) &sin, &len) == -1)
|
|
{
|
|
xprt_unregister (cb->xprt);
|
|
svc_destroy (cb->xprt);
|
|
xdr_free ((xdrproc_t) _xdr_nis_server, (char *) cb->serv);
|
|
free (cb);
|
|
syslog (LOG_ERR, "NIS+: failed to read local socket info");
|
|
return NULL;
|
|
}
|
|
port = ntohs (sin.sin_port);
|
|
get_myaddress (&sin);
|
|
|
|
if (asprintf (&cb->serv->ep.ep_val[0].uaddr, "%s.%d.%d",
|
|
inet_ntoa (sin.sin_addr), (port & 0xFF00) >> 8, port & 0x00FF)
|
|
< 0)
|
|
goto failed;
|
|
|
|
return cb;
|
|
|
|
failed:
|
|
if (cb)
|
|
{
|
|
if (cb->xprt)
|
|
svc_destroy (cb->xprt);
|
|
xdr_free ((xdrproc_t) _xdr_nis_server, (char *) cb->serv);
|
|
free (cb);
|
|
}
|
|
if (!nomsg)
|
|
syslog (LOG_ERR, "NIS+: out of memory allocating callback");
|
|
return NULL;
|
|
}
|
|
|
|
nis_error
|
|
__nis_destroy_callback (struct nis_cb *cb)
|
|
{
|
|
xprt_unregister (cb->xprt);
|
|
svc_destroy (cb->xprt);
|
|
close (cb->sock);
|
|
xdr_free ((xdrproc_t) _xdr_nis_server, (char *) cb->serv);
|
|
free (cb);
|
|
|
|
return NIS_SUCCESS;
|
|
}
|