diff options
| author | neilbrown <neilbrown> | 2005-12-12 03:55:53 +0000 |
|---|---|---|
| committer | neilbrown <neilbrown> | 2005-12-12 03:55:53 +0000 |
| commit | e36b61ba46d34841a6ad99857c7cc43fc8c1ee89 (patch) | |
| tree | 47d51af71ef335071b5b78fdb0d6dc2eca84e365 | |
| parent | eddb23679087f5a9cc10752fe5f1dc535a0b3bf9 (diff) | |
| download | nfs-utils-e36b61ba46d34841a6ad99857c7cc43fc8c1ee89.tar.gz nfs-utils-e36b61ba46d34841a6ad99857c7cc43fc8c1ee89.tar.xz nfs-utils-e36b61ba46d34841a6ad99857c7cc43fc8c1ee89.zip | |
Fix rpc_init so it isn't confused by ssh
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | support/nfs/rpcmisc.c | 15 |
2 files changed, 16 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2005-12-12 Usha Ketineni <ketineni@us.ibm.com>, NeilBrown <neilb@suse.de> + *support/nfs/rpcmisc.c(rpc_init): is stdin is a socket, but + is already connected (as e.g. from ssh), don't assume we + were started by inetd. + 2005-11-03 Steve Dickson <SteveD@redhat.com> NeilBrown <neilb@suse.de> *utils/idmapd/idmaps.c: diff --git a/support/nfs/rpcmisc.c b/support/nfs/rpcmisc.c index ca63c81..1c02364 100644 --- a/support/nfs/rpcmisc.c +++ b/support/nfs/rpcmisc.c @@ -53,12 +53,19 @@ rpc_init(char *name, int prog, int vers, void (*dispatch)(), int defport) if (getsockname(0, (struct sockaddr *) &saddr, &asize) == 0 && saddr.sin_family == AF_INET) { int ssize = sizeof (int); - _rpcfdtype = 0; + int fdtype = 0; if (getsockopt(0, SOL_SOCKET, SO_TYPE, - (char *)&_rpcfdtype, &ssize) == -1) + (char *)&fdtype, &ssize) == -1) xlog(L_FATAL, "getsockopt failed: %s", strerror(errno)); - _rpcpmstart = 1; - } else { + /* inetd passes a UDP socket or a listening TCP socket. + * listen will fail on a connected TCP socket(passed by rsh). + */ + if (!(fdtype == SOCK_STREAM && listen(0,5) == -1)) { + _rpcfdtype = fdtype; + _rpcpmstart = 1; + } + } + if (!_rpcpmstart) { pmap_unset(prog, vers); sock = RPC_ANYSOCK; } |