X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=support%2Fnfs%2Frpcmisc.c;h=fcc6433390daca106fc1582916b7b841898c17eb;hb=12e990f4b07172c693203ffd1e12d0518cacb9e6;hp=1c02364cecb153e6f33886b3b40499d97268d4ea;hpb=e36b61ba46d34841a6ad99857c7cc43fc8c1ee89;p=nfs-utils.git

diff --git a/support/nfs/rpcmisc.c b/support/nfs/rpcmisc.c
index 1c02364..fcc6433 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>
@@ -32,6 +34,10 @@
 #include <time.h>
 #include "nfslib.h"
 
+#if SIZEOF_SOCKLEN_T - 0 == 0
+#define socklen_t int
+#endif
+
 static void	closedown(int sig);
 int	makesock(int port, int proto);
 
@@ -41,18 +47,20 @@ int	_rpcfdtype = 0;
 int	_rpcsvcdirty = 0;
 
 void
-rpc_init(char *name, int prog, int vers, void (*dispatch)(), int defport)
+rpc_init(char *name, int prog, int vers,
+	 void (*dispatch)(struct svc_req *, register SVCXPRT *),
+	 int defport)
 {
 	struct sockaddr_in saddr;
 	SVCXPRT	*transp;
 	int	sock;
-	int	asize;
+	socklen_t asize;
 
 	asize = sizeof(saddr);
 	sock = 0;
 	if (getsockname(0, (struct sockaddr *) &saddr, &asize) == 0
 	    && saddr.sin_family == AF_INET) {
-		int ssize = sizeof (int);
+		socklen_t ssize = sizeof (int);
 		int fdtype = 0;
 		if (getsockopt(0, SOL_SOCKET, SO_TYPE,
 				(char *)&fdtype, &ssize) == -1)
@@ -178,8 +186,11 @@ int makesock(int port, int proto)
 	sin.sin_port = htons(port);
 
 	val = 1;
-	if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) < 0)
-		xlog(L_ERROR, "setsockopt failed: %s\n", strerror(errno));
+	if (proto == IPPROTO_TCP)
+		if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
+			       &val, sizeof(val)) < 0)
+			xlog(L_ERROR, "setsockopt failed: %s\n",
+			     strerror(errno));
 
 #if 0
 	/* I was told it didn't work with gigabit ethernet.
@@ -226,10 +237,12 @@ rpc_logcall(struct svc_req *rqstp, char *xname, char *arg)
 		break;
 	case AUTH_UNIX: {
 		struct authunix_parms *unix_cred;
+		time_t time;
 		struct tm *tm;
 
 		unix_cred = (struct authunix_parms *) rqstp->rq_clntcred;
-		tm = localtime(&unix_cred->aup_time);
+		time = unix_cred->aup_time;
+		tm = localtime(&time);
 		snprintf(sp, buflen, "UNIX %d/%d/%d %02d:%02d:%02d %s %d.%d",
 			tm->tm_year, tm->tm_mon + 1, tm->tm_mday,
 			tm->tm_hour, tm->tm_min, tm->tm_sec,