diff options
Diffstat (limited to 'sunrpc')
| -rw-r--r-- | sunrpc/publickey.c | 11 | ||||
| -rw-r--r-- | sunrpc/rpcinfo.c | 3 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sunrpc/publickey.c b/sunrpc/publickey.c index 9a314326b2..2519c3d743 100644 --- a/sunrpc/publickey.c +++ b/sunrpc/publickey.c @@ -1,5 +1,5 @@ /* Get public or secret key from key server. - Copyright (C) 1996 Free Software Foundation, Inc. + Copyright (C) 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -18,16 +18,17 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <errno.h> #include <rpc/netdb.h> #include "nsswitch.h" /* Type of the lookup function for the public key. */ -typedef int (*public_function) (const char *, char *); +typedef int (*public_function) (const char *, char *, int *); /* Type of the lookup function for the secret key. */ -typedef int (*secret_function) (const char *, char *, const char *); +typedef int (*secret_function) (const char *, char *, const char *, int *); /* The lookup function for the first entry of this service. */ extern int __nss_publickey_lookup (service_user **nip, const char *name, @@ -63,7 +64,7 @@ getpublickey (const char *name, char *key) while (! no_more) { - status = (*fct) (name, key); + status = (*fct) (name, key, __errno_location ()); no_more = __nss_next (&nip, "getpublickey", (void **) &fct, status, 0); } @@ -101,7 +102,7 @@ getsecretkey (const char *name, char *key, const char *passwd) while (! no_more) { - status = (*fct) (name, key, passwd); + status = (*fct) (name, key, passwd, __errno_location ()); no_more = __nss_next (&nip, "getsecretkey", (void **) &fct, status, 0); } diff --git a/sunrpc/rpcinfo.c b/sunrpc/rpcinfo.c index 7adb89332e..07d7a6acb7 100644 --- a/sunrpc/rpcinfo.c +++ b/sunrpc/rpcinfo.c @@ -560,7 +560,8 @@ pmapdump (argc, argv) (xdrproc_t) xdr_pmaplist, (caddr_t) &head, minutetimeout) != RPC_SUCCESS) { - fputs (_("rpcinfo: can't contact portmapper: "), stderr); + fputs (_("rpcinfo: can't contact portmapper"), stderr); + fputs (": ", stderr); clnt_perror (client, "rpcinfo"); exit (1); } |