Attachment 147899 Details for Bug 194084 – IPv6 support for quota(1)

[patch] IPv6 support for quota(1)

quota_r272154.diff (text/plain), 1.88 KB, created by John Marshall on 2014-10-02 06:52:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Marshall

Created: 2014-10-02 06:52:28 UTC

Size: 1.88 KB

patch

obsolete

>Index: etc/inetd.conf
>===================================================================
>--- etc/inetd.conf	(revision 272154)
>+++ etc/inetd.conf	(working copy)
>@@ -68,6 +68,7 @@
> #walld/1	dgram rpc/udp wait root	/usr/libexec/rpc.rwalld	 rpc.rwalld
> #pcnfsd/1-2	dgram rpc/udp wait root	/usr/local/libexec/rpc.pcnfsd	 rpc.pcnfsd
> #rquotad/1	dgram rpc/udp wait root	/usr/libexec/rpc.rquotad rpc.rquotad
>+#rquotad/1	dgram rpc/udp6 wait root	/usr/libexec/rpc.rquotad rpc.rquotad
> #sprayd/1	dgram rpc/udp wait root	/usr/libexec/rpc.sprayd	 rpc.sprayd
> #
> # example entry for the optional pop3 server
>Index: usr.bin/quota/quota.c
>===================================================================
>--- usr.bin/quota/quota.c	(revision 272154)
>+++ usr.bin/quota/quota.c	(working copy)
>@@ -657,27 +657,21 @@
> callaurpc(char *host, int prognum, int versnum, int procnum,
>     xdrproc_t inproc, char *in, xdrproc_t outproc, char *out)
> {
>-	struct sockaddr_in server_addr;
> 	enum clnt_stat clnt_stat;
>-	struct hostent *hp;
> 	struct timeval timeout, tottimeout;
>  
>-	CLIENT *client = NULL;
>-	int sock = RPC_ANYSOCK;
>+	CLIENT *client;
>  
>-	if ((hp = gethostbyname(host)) == NULL)
>-		return ((int) RPC_UNKNOWNHOST);
>+	/* XXX - If clnt_call fails, we should try other addresses and AF_ */
>+	client = clnt_create(host, prognum, versnum, "udp");
>+	if (client == NULL)
>+		return ((int) rpc_createerr.cf_stat);
>+
> 	timeout.tv_usec = 0;
> 	timeout.tv_sec = 6;
>-	bcopy(hp->h_addr, &server_addr.sin_addr,
>-			MIN(hp->h_length,(int)sizeof(server_addr.sin_addr)));
>-	server_addr.sin_family = AF_INET;
>-	server_addr.sin_port =  0;
>+	(void) CLNT_CONTROL(client,
>+			CLSET_RETRY_TIMEOUT, (char *)(void *)&timeout);
> 
>-	if ((client = clntudp_create(&server_addr, prognum,
>-	    versnum, timeout, &sock)) == NULL)
>-		return ((int) rpc_createerr.cf_stat);
>-
> 	client->cl_auth = authunix_create_default();
> 	tottimeout.tv_sec = 25;
> 	tottimeout.tv_usec = 0;

Actions: View | Diff

Attachments on bug 194084: 147899