diff options
Diffstat (limited to 'sunrpc')
-rw-r--r-- | sunrpc/auth_des.c | 2 | ||||
-rw-r--r-- | sunrpc/bindrsvprt.c | 9 | ||||
-rw-r--r-- | sunrpc/rpc_clntout.c | 4 | ||||
-rw-r--r-- | sunrpc/rpc_cout.c | 4 | ||||
-rw-r--r-- | sunrpc/rpc_hout.c | 4 | ||||
-rw-r--r-- | sunrpc/rpc_main.c | 4 | ||||
-rw-r--r-- | sunrpc/rpc_parse.c | 4 | ||||
-rw-r--r-- | sunrpc/rpc_sample.c | 4 | ||||
-rw-r--r-- | sunrpc/rpc_scan.c | 4 | ||||
-rw-r--r-- | sunrpc/rpc_svcout.c | 4 | ||||
-rw-r--r-- | sunrpc/rpc_tblout.c | 4 | ||||
-rw-r--r-- | sunrpc/rpc_util.c | 4 |
12 files changed, 6 insertions, 45 deletions
diff --git a/sunrpc/auth_des.c b/sunrpc/auth_des.c index 7fe96ca765..dbd12e5aad 100644 --- a/sunrpc/auth_des.c +++ b/sunrpc/auth_des.c @@ -174,7 +174,7 @@ authdes_pk_create (const char *servername, netobj *pkey, u_int window, if (key_gendes (&auth->ah_key) < 0) { debug ("authdes_create: unable to gen conversation key"); - return NULL; + goto failed; } } else diff --git a/sunrpc/bindrsvprt.c b/sunrpc/bindrsvprt.c index f58d3b2a8b..023ae1723b 100644 --- a/sunrpc/bindrsvprt.c +++ b/sunrpc/bindrsvprt.c @@ -74,14 +74,13 @@ bindresvport (int sd, struct sockaddr_in *sin) int res = -1; int nports = ENDPORT - startport + 1; + int endport = ENDPORT; again: for (i = 0; i < nports; ++i) { sin->sin_port = htons (port++); - if (port > ENDPORT) - { - port = startport; - } + if (port > endport) + port = startport; res = __bind (sd, sin, sizeof (struct sockaddr_in)); if (res >= 0 || errno != EADDRINUSE) break; @@ -90,7 +89,9 @@ bindresvport (int sd, struct sockaddr_in *sin) if (i == nports && startport != LOWPORT) { startport = LOWPORT; + endport = STARTPORT - 1; nports = STARTPORT - LOWPORT; + port = LOWPORT + port % (STARTPORT - LOWPORT); goto again; } diff --git a/sunrpc/rpc_clntout.c b/sunrpc/rpc_clntout.c index 4e2832ff56..08d9601212 100644 --- a/sunrpc/rpc_clntout.c +++ b/sunrpc/rpc_clntout.c @@ -31,10 +31,6 @@ /* * From: @(#)rpc_clntout.c 1.11 89/02/22 (C) 1987 SMI */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char clntout_rcsid[] = - "$Id$"; -#endif /* * rpc_clntout.c, Client-stub outputter for the RPC protocol compiler diff --git a/sunrpc/rpc_cout.c b/sunrpc/rpc_cout.c index a803feb65a..dfc57fd277 100644 --- a/sunrpc/rpc_cout.c +++ b/sunrpc/rpc_cout.c @@ -31,10 +31,6 @@ /* * From: @(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char cout_rcsid[] = -"$Id$"; -#endif /* * rpc_cout.c, XDR routine outputter for the RPC protocol compiler diff --git a/sunrpc/rpc_hout.c b/sunrpc/rpc_hout.c index 38cb419527..270d149a6e 100644 --- a/sunrpc/rpc_hout.c +++ b/sunrpc/rpc_hout.c @@ -31,10 +31,6 @@ /* * From: @(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char hout_rcsid[] = - "$Id$"; -#endif /* * rpc_hout.c, Header file outputter for the RPC protocol compiler diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c index acc0132603..2679720a7f 100644 --- a/sunrpc/rpc_main.c +++ b/sunrpc/rpc_main.c @@ -31,10 +31,6 @@ /* * From @(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI; */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char main_rcsid[] = - "$Id$"; -#endif /* * rpc_main.c, Top level of the RPC protocol compiler. diff --git a/sunrpc/rpc_parse.c b/sunrpc/rpc_parse.c index 7115cbdd08..2a29878d6a 100644 --- a/sunrpc/rpc_parse.c +++ b/sunrpc/rpc_parse.c @@ -31,10 +31,6 @@ /* * From: @(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char parse_rcsid[] = - "$Id$"; -#endif /* * rpc_parse.c, Parser for the RPC protocol compiler diff --git a/sunrpc/rpc_sample.c b/sunrpc/rpc_sample.c index 50c3d5554b..00b58d5bc2 100644 --- a/sunrpc/rpc_sample.c +++ b/sunrpc/rpc_sample.c @@ -31,10 +31,6 @@ /* * From: @(#)rpc_sample.c 1.1 90/08/30 (C) 1987 SMI */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char sample_rcsid[] = - "$Id$"; -#endif /* * rpc_sample.c, Sample client-server code outputter for the RPC protocol compiler diff --git a/sunrpc/rpc_scan.c b/sunrpc/rpc_scan.c index d6211e9105..42ab2bae8b 100644 --- a/sunrpc/rpc_scan.c +++ b/sunrpc/rpc_scan.c @@ -31,10 +31,6 @@ /* * From: @(#)rpc_scan.c 1.11 89/02/22 (C) 1987 SMI */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char scan_rcsid[] = - "$Id$"; -#endif /* * rpc_scan.c, Scanner for the RPC protocol compiler diff --git a/sunrpc/rpc_svcout.c b/sunrpc/rpc_svcout.c index 9a807c4096..6774cc8c0f 100644 --- a/sunrpc/rpc_svcout.c +++ b/sunrpc/rpc_svcout.c @@ -31,10 +31,6 @@ /* * From: @(#)rpc_svcout.c 1.29 89/03/30 (C) 1987 SMI */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char svcout_rcsid[] = - "$Id$"; -#endif /* * rpc_svcout.c, Server-skeleton outputter for the RPC protocol compiler diff --git a/sunrpc/rpc_tblout.c b/sunrpc/rpc_tblout.c index bf4037fc37..8fd2b1267d 100644 --- a/sunrpc/rpc_tblout.c +++ b/sunrpc/rpc_tblout.c @@ -31,10 +31,6 @@ /* * From: @(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char tblout_rcsid[] = - "$Id$"; -#endif /* * rpc_tblout.c, Dispatch table outputter for the RPC protocol compiler diff --git a/sunrpc/rpc_util.c b/sunrpc/rpc_util.c index 31e1d3143c..b910401a31 100644 --- a/sunrpc/rpc_util.c +++ b/sunrpc/rpc_util.c @@ -31,10 +31,6 @@ /* * From: @(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char util_rcsid[] = - "$Id$"; -#endif /* * rpc_util.c, Utility routines for the RPC protocol compiler |