X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=support%2Fnfs%2Frpcmisc.c;h=c7bff40ea2fc71aaa00176d5e8940f09723599bc;hb=aaf1ebff9c894f341dfb7db5ced2c47a5d50e750;hp=ca63c8142975940557ba6ed9470e594d720f284a;hpb=8b064fcf464aaf3717d8940f97a7d3f8bf21de1a;p=nfs-utils.git

diff --git a/support/nfs/rpcmisc.c b/support/nfs/rpcmisc.c
index ca63c81..c7bff40 100644
--- a/support/nfs/rpcmisc.c
+++ b/support/nfs/rpcmisc.c
@@ -12,7 +12,9 @@
  * as is, with no warranty expressed or implied.
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
@@ -53,12 +55,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;
 	}