summaryrefslogtreecommitdiff
path: root/sunrpc
diff options
context:
space:
mode:
Diffstat (limited to 'sunrpc')
-rw-r--r--sunrpc/Makefile4
-rw-r--r--sunrpc/auth_des.c19
-rw-r--r--sunrpc/auth_unix.c9
-rw-r--r--sunrpc/clnt_udp.c11
-rw-r--r--sunrpc/create_xid.c10
-rw-r--r--sunrpc/des_impl.c2
-rw-r--r--sunrpc/getrpcbyname.c4
-rw-r--r--sunrpc/getrpcbyname_r.c4
-rw-r--r--sunrpc/getrpcbynumber.c4
-rw-r--r--sunrpc/getrpcbynumber_r.c4
-rw-r--r--sunrpc/getrpcent.c4
-rw-r--r--sunrpc/getrpcent_r.c4
-rw-r--r--sunrpc/getrpcport.c4
-rw-r--r--sunrpc/netname.c4
-rw-r--r--sunrpc/publickey.c4
-rw-r--r--sunrpc/rpc/auth_des.h4
-rw-r--r--sunrpc/rpc/svc.h4
-rw-r--r--sunrpc/rpc_gethostbyname.c4
-rw-r--r--sunrpc/rpcsvc/bootparam.h4
-rw-r--r--sunrpc/svc.c4
-rw-r--r--sunrpc/svc_tcp.c4
-rw-r--r--sunrpc/svc_udp.c4
-rw-r--r--sunrpc/svc_unix.c4
-rw-r--r--sunrpc/svcauth_des.c7
-rw-r--r--sunrpc/test-rpcent.c4
-rw-r--r--sunrpc/tst-svc_register.c6
-rw-r--r--sunrpc/tst-udp-error.c4
-rw-r--r--sunrpc/tst-udp-garbage.c4
-rw-r--r--sunrpc/tst-udp-nonblocking.c4
-rw-r--r--sunrpc/tst-udp-timeout.c4
-rw-r--r--sunrpc/tst-xdrmem.c4
-rw-r--r--sunrpc/tst-xdrmem2.c4
-rw-r--r--sunrpc/xdr.c7
-rw-r--r--sunrpc/xdr_intXX_t.c4
34 files changed, 99 insertions, 76 deletions
diff --git a/sunrpc/Makefile b/sunrpc/Makefile
index 85b0b3356a..cc57b3a43c 100644
--- a/sunrpc/Makefile
+++ b/sunrpc/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2019 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
@@ -13,7 +13,7 @@
# 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/>.
+# <https://www.gnu.org/licenses/>.
#
# Sub-makefile for sunrpc portion of the library.
diff --git a/sunrpc/auth_des.c b/sunrpc/auth_des.c
index 5b6f985bc2..d26820a701 100644
--- a/sunrpc/auth_des.c
+++ b/sunrpc/auth_des.c
@@ -41,6 +41,7 @@
#include <rpc/xdr.h>
#include <netinet/in.h> /* XXX: just to get htonl() and ntohl() */
#include <sys/socket.h>
+#include <time.h>
#include <shlib-compat.h>
#define MILLION 1000000L
@@ -246,15 +247,15 @@ authdes_marshal (AUTH *auth, XDR *xdrs)
int status;
int len;
register int32_t *ixdr;
- struct timeval tval;
+ struct timespec now;
/*
* Figure out the "time", accounting for any time difference
* with the server if necessary.
*/
- __gettimeofday (&tval, (struct timezone *) NULL);
- ad->ad_timestamp.tv_sec = tval.tv_sec + ad->ad_timediff.tv_sec;
- ad->ad_timestamp.tv_usec = tval.tv_usec + ad->ad_timediff.tv_usec;
+ __clock_gettime (CLOCK_REALTIME, &now);
+ ad->ad_timestamp.tv_sec = now.tv_sec + ad->ad_timediff.tv_sec;
+ ad->ad_timestamp.tv_usec = (now.tv_nsec / 1000) + ad->ad_timediff.tv_usec;
if (ad->ad_timestamp.tv_usec >= MILLION)
{
ad->ad_timestamp.tv_usec -= MILLION;
@@ -445,21 +446,23 @@ authdes_destroy (AUTH *auth)
static bool_t
synchronize (struct sockaddr *syncaddr, struct rpc_timeval *timep)
{
- struct timeval mytime;
+ struct timespec mytime;
struct rpc_timeval timeout;
+ long int myusec;
timeout.tv_sec = RTIME_TIMEOUT;
timeout.tv_usec = 0;
if (rtime ((struct sockaddr_in *) syncaddr, timep, &timeout) < 0)
return FALSE;
- __gettimeofday (&mytime, (struct timezone *) NULL);
+ __clock_gettime (CLOCK_REALTIME, &mytime);
timep->tv_sec -= mytime.tv_sec;
- if (mytime.tv_usec > timep->tv_usec)
+ myusec = mytime.tv_nsec / 1000;
+ if (myusec > timep->tv_usec)
{
timep->tv_sec -= 1;
timep->tv_usec += MILLION;
}
- timep->tv_usec -= mytime.tv_usec;
+ timep->tv_usec -= myusec;
return TRUE;
}
diff --git a/sunrpc/auth_unix.c b/sunrpc/auth_unix.c
index b035fdd870..ff0d2eb933 100644
--- a/sunrpc/auth_unix.c
+++ b/sunrpc/auth_unix.c
@@ -43,6 +43,7 @@
#include <stdio.h>
#include <string.h>
#include <unistd.h>
+#include <time.h>
#include <libintl.h>
#include <sys/param.h>
#include <wchar.h>
@@ -96,7 +97,7 @@ authunix_create (char *machname, uid_t uid, gid_t gid, int len,
{
struct authunix_parms aup;
char mymem[MAX_AUTH_BYTES];
- struct timeval now;
+ struct timespec now;
XDR xdrs;
AUTH *auth;
struct audata *au;
@@ -122,7 +123,7 @@ no_memory:
/*
* fill in param struct from the given params
*/
- (void) __gettimeofday (&now, (struct timezone *) 0);
+ __clock_gettime (CLOCK_REALTIME, &now);
aup.aup_time = now.tv_sec;
aup.aup_machname = machname;
aup.aup_uid = uid;
@@ -276,7 +277,7 @@ authunix_refresh (AUTH *auth)
{
struct audata *au = AUTH_PRIVATE (auth);
struct authunix_parms aup;
- struct timeval now;
+ struct timespec now;
XDR xdrs;
int stat;
@@ -297,7 +298,7 @@ authunix_refresh (AUTH *auth)
goto done;
/* update the time and serialize in place */
- (void) __gettimeofday (&now, (struct timezone *) 0);
+ __clock_gettime (CLOCK_REALTIME, &now);
aup.aup_time = now.tv_sec;
xdrs.x_op = XDR_ENCODE;
XDR_SETPOS (&xdrs, 0);
diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c
index c2436e3ebc..ee79b09b40 100644
--- a/sunrpc/clnt_udp.c
+++ b/sunrpc/clnt_udp.c
@@ -57,6 +57,7 @@
#include <kernel-features.h>
#include <inet/net-internal.h>
#include <shlib-compat.h>
+#include <libc-diag.h>
extern u_long _create_xid (void);
@@ -290,7 +291,17 @@ clntudp_call (/* client handle */
int anyup; /* any network interface up */
struct deadline_current_time current_time = __deadline_current_time ();
+ /* GCC 10 for MIPS reports total_deadline as possibly used
+ uninitialized; see
+ <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91691>. In fact it
+ is initialized conditionally and only ever used under the same
+ condition. The same warning is also disabled in
+ inet/net-internal.h because in some other configurations GCC
+ gives the warning in an inline function. */
+ DIAG_PUSH_NEEDS_COMMENT;
+ DIAG_IGNORE_NEEDS_COMMENT (10, "-Wmaybe-uninitialized");
struct deadline total_deadline; /* Determined once by overall timeout. */
+ DIAG_POP_NEEDS_COMMENT;
struct deadline response_deadline; /* Determined anew for each query. */
/* Choose the timeout value. For non-sending usage (xargs == NULL),
diff --git a/sunrpc/create_xid.c b/sunrpc/create_xid.c
index 63e586f504..c692c1eb92 100644
--- a/sunrpc/create_xid.c
+++ b/sunrpc/create_xid.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 1998-2018 Free Software Foundation, Inc.
+/* Copyright (c) 1998-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1998.
@@ -14,7 +14,7 @@
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/>. */
+ <https://www.gnu.org/licenses/>. */
#include <unistd.h>
#include <stdlib.h>
@@ -39,10 +39,10 @@ _create_xid (void)
pid_t pid = getpid ();
if (is_initialized != pid)
{
- struct timeval now;
+ struct timespec now;
- __gettimeofday (&now, (struct timezone *) 0);
- __srand48_r (now.tv_sec ^ now.tv_usec ^ pid,
+ __clock_gettime (CLOCK_REALTIME, &now);
+ __srand48_r (now.tv_sec ^ now.tv_nsec ^ pid,
&__rpc_lrand48_data);
is_initialized = pid;
}
diff --git a/sunrpc/des_impl.c b/sunrpc/des_impl.c
index d1d2edfbc8..dd5b9b6d19 100644
--- a/sunrpc/des_impl.c
+++ b/sunrpc/des_impl.c
@@ -3,7 +3,7 @@
/* This file is distributed under the terms of the GNU Lesser General */
/* Public License, version 2.1 or later - see the file COPYING.LIB for details.*/
/* If you did not receive a copy of the license with this program, please*/
-/* see <http://www.gnu.org/licenses/> to obtain a copy. */
+/* see <https://www.gnu.org/licenses/> to obtain a copy. */
#include <string.h>
#include <stdint.h>
#include "des.h"
diff --git a/sunrpc/getrpcbyname.c b/sunrpc/getrpcbyname.c
index df9baea21a..51658bb73c 100644
--- a/sunrpc/getrpcbyname.c
+++ b/sunrpc/getrpcbyname.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2018 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -14,7 +14,7 @@
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/>. */
+ <https://www.gnu.org/licenses/>. */
#include <rpc/netdb.h>
diff --git a/sunrpc/getrpcbyname_r.c b/sunrpc/getrpcbyname_r.c
index e0e1a370c3..e68c4d451f 100644
--- a/sunrpc/getrpcbyname_r.c
+++ b/sunrpc/getrpcbyname_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2018 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -14,7 +14,7 @@
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/>. */
+ <https://www.gnu.org/licenses/>. */
#include <rpc/netdb.h>
diff --git a/sunrpc/getrpcbynumber.c b/sunrpc/getrpcbynumber.c
index 048f8d361e..c449bf25e2 100644
--- a/sunrpc/getrpcbynumber.c
+++ b/sunrpc/getrpcbynumber.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2018 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -14,7 +14,7 @@
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/>. */
+ <https://www.gnu.org/licenses/>. */
#include <rpc/netdb.h>
diff --git a/sunrpc/getrpcbynumber_r.c b/sunrpc/getrpcbynumber_r.c
index 7b13b99f48..ec68228a19 100644
--- a/sunrpc/getrpcbynumber_r.c
+++ b/sunrpc/getrpcbynumber_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2018 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -14,7 +14,7 @@
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/>. */
+ <https://www.gnu.org/licenses/>. */
#include <rpc/netdb.h>
diff --git a/sunrpc/getrpcent.c b/sunrpc/getrpcent.c
index 7022e7e2e9..eac8ad0c78 100644
--- a/sunrpc/getrpcent.c
+++ b/sunrpc/getrpcent.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2018 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2019 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
@@ -13,7 +13,7 @@
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/>. */
+ <https://www.gnu.org/licenses/>. */
#include <rpc/netdb.h>
diff --git a/sunrpc/getrpcent_r.c b/sunrpc/getrpcent_r.c
index b7aa254baf..e2e286148c 100644
--- a/sunrpc/getrpcent_r.c
+++ b/sunrpc/getrpcent_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2018 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2019 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
@@ -13,7 +13,7 @@
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/>. */
+ <https://www.gnu.org/licenses/>. */
#include <netdb.h>
diff --git a/sunrpc/getrpcport.c b/sunrpc/getrpcport.c
index f87f6106c1..3ce7e5d2d8 100644
--- a/sunrpc/getrpcport.c
+++ b/sunrpc/getrpcport.c
@@ -1,5 +1,5 @@
/* Obtain the RPC port number for an RPC service on a host.
- Copyright (C) 2016-2018 Free Software Foundation, Inc.
+ Copyright (C) 2016-2019 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
@@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; see the file COPYING.LIB. If
- not, see <http://www.gnu.org/licenses/>. */
+ not, see <https://www.gnu.org/licenses/>. */
/*
* Copyright (c) 2010, Oracle America, Inc.
diff --git a/sunrpc/netname.c b/sunrpc/netname.c
index 4e3730cea0..b5bec98829 100644
--- a/sunrpc/netname.c
+++ b/sunrpc/netname.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997-2018 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
@@ -14,7 +14,7 @@
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/>. */
+ <https://www.gnu.org/licenses/>. */
#include <stdio.h>
#include <unistd.h>
diff --git a/sunrpc/publickey.c b/sunrpc/publickey.c
index 9c44760e04..168a09a1b7 100644
--- a/sunrpc/publickey.c
+++ b/sunrpc/publickey.c
@@ -1,5 +1,5 @@
/* Get public or secret key from key server.
- Copyright (C) 1996-2018 Free Software Foundation, Inc.
+ Copyright (C) 1996-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -15,7 +15,7 @@
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/>. */
+ <https://www.gnu.org/licenses/>. */
#include <errno.h>
#include <rpc/netdb.h>
diff --git a/sunrpc/rpc/auth_des.h b/sunrpc/rpc/auth_des.h
index 24fd4d1279..3b7eaf476c 100644
--- a/sunrpc/rpc/auth_des.h
+++ b/sunrpc/rpc/auth_des.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2018 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2019 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
@@ -13,7 +13,7 @@
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/>. */
+ <https://www.gnu.org/licenses/>. */
#ifndef _RPC_AUTH_DES_H
#define _RPC_AUTH_DES_H 1
diff --git a/sunrpc/rpc/svc.h b/sunrpc/rpc/svc.h
index 64fa4cf2e1..b7c17cf337 100644
--- a/sunrpc/rpc/svc.h
+++ b/sunrpc/rpc/svc.h
@@ -1,7 +1,7 @@
/*
* svc.h, Server-side remote procedure call interface.
*
- * Copyright (C) 2012-2018 Free Software Foundation, Inc.
+ * Copyright (C) 2012-2019 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
@@ -16,7 +16,7 @@
*
* 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/>.
+ * <https://www.gnu.org/licenses/>.
*
* Copyright (c) 2010, Oracle America, Inc.
*
diff --git a/sunrpc/rpc_gethostbyname.c b/sunrpc/rpc_gethostbyname.c
index 18504976d4..9cde6c6c66 100644
--- a/sunrpc/rpc_gethostbyname.c
+++ b/sunrpc/rpc_gethostbyname.c
@@ -1,5 +1,5 @@
/* IPv4-only variant of gethostbyname.
- Copyright (C) 2016-2018 Free Software Foundation, Inc.
+ Copyright (C) 2016-2019 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
@@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; see the file COPYING.LIB. If
- not, see <http://www.gnu.org/licenses/>. */
+ not, see <https://www.gnu.org/licenses/>. */
#include <errno.h>
#include <netdb.h>
diff --git a/sunrpc/rpcsvc/bootparam.h b/sunrpc/rpcsvc/bootparam.h
index d49aeb8494..671cfff89d 100644
--- a/sunrpc/rpcsvc/bootparam.h
+++ b/sunrpc/rpcsvc/bootparam.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2018 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2019 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
@@ -13,7 +13,7 @@
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/>. */
+ <https://www.gnu.org/licenses/>. */
#ifndef _RPCSVC_BOOTPARAM_H
#define _RPCSVC_BOOTPARAM_H
diff --git a/sunrpc/svc.c b/sunrpc/svc.c
index 90e84e2cd2..3d35b0234a 100644
--- a/sunrpc/svc.c
+++ b/sunrpc/svc.c
@@ -4,7 +4,7 @@
* There are two sets of procedures here. The xprt routines are
* for handling transport handles. The svc routines handle the
* list of service routines.
- * Copyright (C) 2002-2018 Free Software Foundation, Inc.
+ * Copyright (C) 2002-2019 Free Software Foundation, Inc.
* This file is part of the GNU C Library.
* Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
*
@@ -20,7 +20,7 @@
*
* 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/>.
+ * <https://www.gnu.org/licenses/>.
*
* Copyright (c) 2010, Oracle America, Inc.
*
diff --git a/sunrpc/svc_tcp.c b/sunrpc/svc_tcp.c
index 5ffa7ba6cf..6ebc28587d 100644
--- a/sunrpc/svc_tcp.c
+++ b/sunrpc/svc_tcp.c
@@ -1,7 +1,7 @@
/*
* svc_tcp.c, Server side for TCP/IP based RPC.
*
- * Copyright (C) 2012-2018 Free Software Foundation, Inc.
+ * Copyright (C) 2012-2019 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
@@ -16,7 +16,7 @@
*
* 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/>.
+ * <https://www.gnu.org/licenses/>.
*
* Copyright (c) 2010, Oracle America, Inc.
*
diff --git a/sunrpc/svc_udp.c b/sunrpc/svc_udp.c
index 50589871b0..8deda337bf 100644
--- a/sunrpc/svc_udp.c
+++ b/sunrpc/svc_udp.c
@@ -3,7 +3,7 @@
* Server side for UDP/IP based RPC. (Does some caching in the hopes of
* achieving execute-at-most-once semantics.)
*
- * Copyright (C) 2012-2018 Free Software Foundation, Inc.
+ * Copyright (C) 2012-2019 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
@@ -18,7 +18,7 @@
*
* 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/>.
+ * <https://www.gnu.org/licenses/>.
*
* Copyright (c) 2010, Oracle America, Inc.
*
diff --git a/sunrpc/svc_unix.c b/sunrpc/svc_unix.c
index c2c076aa87..b6477bf4e5 100644
--- a/sunrpc/svc_unix.c
+++ b/sunrpc/svc_unix.c
@@ -1,7 +1,7 @@
/*
* svc_unix.c, Server side for TCP/IP based RPC.
*
- * Copyright (C) 2012-2018 Free Software Foundation, Inc.
+ * Copyright (C) 2012-2019 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
@@ -16,7 +16,7 @@
*
* 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/>.
+ * <https://www.gnu.org/licenses/>.
*
* Copyright (c) 2010, Oracle America, Inc.
*
diff --git a/sunrpc/svcauth_des.c b/sunrpc/svcauth_des.c
index c5a512d6f8..7607abc818 100644
--- a/sunrpc/svcauth_des.c
+++ b/sunrpc/svcauth_des.c
@@ -44,6 +44,7 @@
#include <limits.h>
#include <string.h>
#include <stdint.h>
+#include <time.h>
#include <sys/param.h>
#include <netinet/in.h>
#include <rpc/rpc.h>
@@ -295,7 +296,11 @@ _svcauth_des (register struct svc_req *rqst, register struct rpc_msg *msg)
debug ("timestamp before last seen");
return AUTH_REJECTEDVERF; /* replay */
}
- __gettimeofday (&current, (struct timezone *) NULL);
+ {
+ struct timespec now;
+ __clock_gettime (CLOCK_REALTIME, &now);
+ TIMESPEC_TO_TIMEVAL (&current, &now);
+ }
current.tv_sec -= window; /* allow for expiration */
if (!BEFORE (&current, &timestamp))
{
diff --git a/sunrpc/test-rpcent.c b/sunrpc/test-rpcent.c
index 4bf09416f7..d4d6600300 100644
--- a/sunrpc/test-rpcent.c
+++ b/sunrpc/test-rpcent.c
@@ -1,5 +1,5 @@
/* Test getrpcent and friends.
- Copyright (C) 2015-2018 Free Software Foundation, Inc.
+ Copyright (C) 2015-2019 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
@@ -14,7 +14,7 @@
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/>. */
+ <https://www.gnu.org/licenses/>. */
/* This is taken from nss/test-netdb.c and is intended to follow that
test's model for everything. This test is separate only because
diff --git a/sunrpc/tst-svc_register.c b/sunrpc/tst-svc_register.c
index 23c1377ee5..dd0c8e23f4 100644
--- a/sunrpc/tst-svc_register.c
+++ b/sunrpc/tst-svc_register.c
@@ -1,5 +1,5 @@
/* Test svc_register/svc_unregister rpcbind interaction (bug 5010).
- Copyright (C) 2017-2018 Free Software Foundation, Inc.
+ Copyright (C) 2017-2019 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
@@ -14,7 +14,7 @@
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/>. */
+ <https://www.gnu.org/licenses/>. */
/* This test uses a stub rpcbind server (implemented in a child
process using rpcbind_dispatch/run_rpcbind) to check how RPC
@@ -54,7 +54,7 @@ server_dispatch (struct svc_req *request, SVCXPRT *transport)
}
/* The port on which rpcbind listens for incoming requests. */
-static inline const struct sockaddr_in
+static inline struct sockaddr_in
rpcbind_address (void)
{
return (struct sockaddr_in)
diff --git a/sunrpc/tst-udp-error.c b/sunrpc/tst-udp-error.c
index a968d81f29..7f38d62496 100644
--- a/sunrpc/tst-udp-error.c
+++ b/sunrpc/tst-udp-error.c
@@ -1,5 +1,5 @@
/* Check for use-after-free in clntudp_call (bug 21115).
- Copyright (C) 2017-2018 Free Software Foundation, Inc.
+ Copyright (C) 2017-2019 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
@@ -14,7 +14,7 @@
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/>. */
+ <https://www.gnu.org/licenses/>. */
#include <netinet/in.h>
#include <rpc/clnt.h>
diff --git a/sunrpc/tst-udp-garbage.c b/sunrpc/tst-udp-garbage.c
index 7da559d2d7..d356b931b9 100644
--- a/sunrpc/tst-udp-garbage.c
+++ b/sunrpc/tst-udp-garbage.c
@@ -1,5 +1,5 @@
/* Test that garbage packets do not affect timeout handling.
- Copyright (C) 2017-2018 Free Software Foundation, Inc.
+ Copyright (C) 2017-2019 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
@@ -14,7 +14,7 @@
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/>. */
+ <https://www.gnu.org/licenses/>. */
#include <netinet/in.h>
#include <rpc/clnt.h>
diff --git a/sunrpc/tst-udp-nonblocking.c b/sunrpc/tst-udp-nonblocking.c
index f08bcfe4a8..503e3e1434 100644
--- a/sunrpc/tst-udp-nonblocking.c
+++ b/sunrpc/tst-udp-nonblocking.c
@@ -1,5 +1,5 @@
/* Test non-blocking use of the UDP client.
- Copyright (C) 2017-2018 Free Software Foundation, Inc.
+ Copyright (C) 2017-2019 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
@@ -14,7 +14,7 @@
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/>. */
+ <https://www.gnu.org/licenses/>. */
#include <netinet/in.h>
#include <rpc/clnt.h>
diff --git a/sunrpc/tst-udp-timeout.c b/sunrpc/tst-udp-timeout.c
index 3c5b55d16c..24560cd567 100644
--- a/sunrpc/tst-udp-timeout.c
+++ b/sunrpc/tst-udp-timeout.c
@@ -1,5 +1,5 @@
/* Test timeout handling in the UDP client.
- Copyright (C) 2017-2018 Free Software Foundation, Inc.
+ Copyright (C) 2017-2019 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
@@ -14,7 +14,7 @@
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/>. */
+ <https://www.gnu.org/licenses/>. */
#include <netinet/in.h>
#include <rpc/clnt.h>
diff --git a/sunrpc/tst-xdrmem.c b/sunrpc/tst-xdrmem.c
index e22aec5016..234dbb81ff 100644
--- a/sunrpc/tst-xdrmem.c
+++ b/sunrpc/tst-xdrmem.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005-2018 Free Software Foundation, Inc.
+/* Copyright (C) 2005-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2005.
@@ -14,7 +14,7 @@
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/>. */
+ <https://www.gnu.org/licenses/>. */
#include <limits.h>
#include <stdio.h>
diff --git a/sunrpc/tst-xdrmem2.c b/sunrpc/tst-xdrmem2.c
index 1e45026b94..d78e3a6ca9 100644
--- a/sunrpc/tst-xdrmem2.c
+++ b/sunrpc/tst-xdrmem2.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2018 Free Software Foundation, Inc.
+/* Copyright (C) 2006-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2006.
@@ -14,7 +14,7 @@
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/>. */
+ <https://www.gnu.org/licenses/>. */
#include <limits.h>
#include <stdio.h>
diff --git a/sunrpc/xdr.c b/sunrpc/xdr.c
index 8b0b91995b..b5fb7455e2 100644
--- a/sunrpc/xdr.c
+++ b/sunrpc/xdr.c
@@ -113,6 +113,7 @@ xdr_int (XDR *xdrs, int *ip)
return FALSE;
}
*ip = (int) l;
+ /* Fall through. */
case XDR_FREE:
return TRUE;
}
@@ -152,6 +153,7 @@ xdr_u_int (XDR *xdrs, u_int *up)
return FALSE;
}
*up = (u_int) (u_long) l;
+ /* Fall through. */
case XDR_FREE:
return TRUE;
}
@@ -506,6 +508,7 @@ xdr_enum (XDR *xdrs, enum_t *ep)
return FALSE;
}
*ep = l;
+ /* Fall through. */
case XDR_FREE:
return TRUE;
@@ -628,7 +631,7 @@ xdr_bytes (XDR *xdrs, char **cpp, u_int *sizep, u_int maxsize)
(void) __fxprintf (NULL, "%s: %s", __func__, _("out of memory\n"));
return FALSE;
}
- /* fall into ... */
+ /* Fall through. */
case XDR_ENCODE:
return xdr_opaque (xdrs, sp, nodesize);
@@ -789,7 +792,7 @@ xdr_string (XDR *xdrs, char **cpp, u_int maxsize)
return FALSE;
}
sp[size] = 0;
- /* fall into ... */
+ /* Fall through. */
case XDR_ENCODE:
return xdr_opaque (xdrs, sp, size);
diff --git a/sunrpc/xdr_intXX_t.c b/sunrpc/xdr_intXX_t.c
index c1ad694740..e302e7dd45 100644
--- a/sunrpc/xdr_intXX_t.c
+++ b/sunrpc/xdr_intXX_t.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 1998-2018 Free Software Foundation, Inc.
+/* Copyright (c) 1998-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1998.
@@ -14,7 +14,7 @@
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/>. */
+ <https://www.gnu.org/licenses/>. */
#include <rpc/types.h>