Attachment 13775 Details for Bug 26070 – file.diff

[patch] file.diff

file.diff (text/plain), 1.23 KB, created by mb on 2001-03-25 14:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mb

Created: 2001-03-25 14:00:01 UTC

Size: 1.23 KB

patch

obsolete

>--- sbin/mount_nfs/mount_nfs.c	Mon Mar 19 13:50:01 2001
>+++ sbin/mount_nfs/mount_nfs.c	Fri Mar 23 19:20:22 2001
>@@ -585,6 +585,8 @@
> 	char host[NI_MAXHOST], serv[NI_MAXSERV];
> 	static struct netbuf nfs_nb;
> 	static struct sockaddr_storage nfs_ss;
>+	struct sockaddr_in *sin;
>+	struct sockaddr_in6 *sin6;
> 	struct netconfig *nconf;
> 	char *netid;
> 	struct timeval pertry, try;
>@@ -704,10 +706,23 @@
> 		retrycnt = orgcnt;
> 
> 		while (retrycnt > 0) {
>+			if (port_no != 0) {
>+				if (ai_nfs->ai_family == AF_INET6) {
>+					((struct sockaddr_in6 *)ai_nfs->
>+					    ai_addr)->sin6_port = htons(port_no);
>+					nfs_nb.len = sizeof(struct sockaddr_in6);
>+				} else {
>+					((struct sockaddr_in *)ai_nfs->
>+					    ai_addr)->sin_port = htons(port_no);
>+					nfs_nb.len = sizeof(struct sockaddr_in);
>+				}
>+				memset(&nfs_ss, 0, sizeof(nfs_ss));
>+				memcpy(&nfs_ss, ai_nfs->ai_addr, sizeof(ai_nfs->ai_addr));
>+			}
> 			nfs_nb.buf = &nfs_ss;
> 			nfs_nb.maxlen = sizeof nfs_ss;
>-			if (!rpcb_getaddr(RPCPROG_NFS, nfsvers, nconf,
>-			    &nfs_nb, hostp)){
>+			if (port_no == 0 && !rpcb_getaddr(RPCPROG_NFS,
>+			    nfsvers, nconf, &nfs_nb, hostp)) {
> 				if (rpc_createerr.cf_stat == RPC_SYSTEMERROR) {
> 					nfhret.stat = rpc_createerr.cf_error.re_errno;
> 					break;

Actions: View | Diff

Attachments on bug 26070: 13775