diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-09-02 06:47:20 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-09-02 06:47:20 +0000 |
| commit | 2b1d79ba03b24abb64db7450b16c1e643abc675e (patch) | |
| tree | 2793ef935b672ed898c77ee9bae3f38177dde8cd | |
| parent | 7be54aa04984e4ee68c7ec4672aef608ab12c9f6 (diff) | |
Delete 3 more stderr messages, right before returning a proper error.
Code from way in the past.
| -rw-r--r-- | lib/libc/rpc/auth_unix.c | 4 | ||||
| -rw-r--r-- | lib/libc/rpc/pmap_clnt.c | 3 | ||||
| -rw-r--r-- | lib/libc/rpc/pmap_getmaps.c | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/libc/rpc/auth_unix.c b/lib/libc/rpc/auth_unix.c index 6aaeceeb019..c0b2565c17a 100644 --- a/lib/libc/rpc/auth_unix.c +++ b/lib/libc/rpc/auth_unix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth_unix.c,v 1.23 2015/09/01 19:54:00 deraadt Exp $ */ +/* $OpenBSD: auth_unix.c,v 1.24 2015/09/02 06:47:19 deraadt Exp $ */ /* * Copyright (c) 2010, Oracle America, Inc. @@ -322,7 +322,7 @@ marshal_new_auth(AUTH *auth) xdrmem_create(xdrs, au->au_marshed, MAX_AUTH_BYTES, XDR_ENCODE); if ((! xdr_opaque_auth(xdrs, &(auth->ah_cred))) || (! xdr_opaque_auth(xdrs, &(auth->ah_verf)))) { - perror("auth_none.c - Fatal marshalling problem"); + /* XXX nothing we can do */ } else { au->au_mpos = XDR_GETPOS(xdrs); } diff --git a/lib/libc/rpc/pmap_clnt.c b/lib/libc/rpc/pmap_clnt.c index ca17a51504d..0abba0892e3 100644 --- a/lib/libc/rpc/pmap_clnt.c +++ b/lib/libc/rpc/pmap_clnt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_clnt.c,v 1.17 2014/11/11 04:51:49 guenther Exp $ */ +/* $OpenBSD: pmap_clnt.c,v 1.18 2015/09/02 06:47:19 deraadt Exp $ */ /* * Copyright (c) 2010, Oracle America, Inc. @@ -74,7 +74,6 @@ pmap_set(u_long program, u_long version, u_int protocol, int iport) if (CLNT_CALL(client, PMAPPROC_SET, xdr_pmap, &parms, xdr_bool, &rslt, tottimeout) != RPC_SUCCESS) { save_errno = errno; - clnt_perror(client, "Cannot register service"); rslt = FALSE; } else save_errno = errno; diff --git a/lib/libc/rpc/pmap_getmaps.c b/lib/libc/rpc/pmap_getmaps.c index fa570519af0..ad14eb36656 100644 --- a/lib/libc/rpc/pmap_getmaps.c +++ b/lib/libc/rpc/pmap_getmaps.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_getmaps.c,v 1.12 2014/11/11 04:51:49 guenther Exp $ */ +/* $OpenBSD: pmap_getmaps.c,v 1.13 2015/09/02 06:47:19 deraadt Exp $ */ /* * Copyright (c) 2010, Oracle America, Inc. @@ -70,7 +70,8 @@ pmap_getmaps(struct sockaddr_in *address) if (client != NULL) { if (CLNT_CALL(client, PMAPPROC_DUMP, xdr_void, NULL, xdr_pmaplist, &head, minutetimeout) != RPC_SUCCESS) { - clnt_perror(client, "pmap_getmaps rpc problem"); + CLNT_DESTROY(client); + return (NULL); } CLNT_DESTROY(client); } |