View | Details | Raw Unified | Return to bug 142251
Collapse All | Expand All

(-)file_not_specified_in_diff (-3 / +16 lines)
Line  Link Here
0
-- util-linux-2.12q/mount/nfsmount.c
0
++ util-linux-2.12q/mount/nfsmount.c
Lines 169-176 Link Here
169
	}
169
	}
170
	if (!p.pm_vers)
170
	if (!p.pm_vers)
171
		p.pm_vers = MOUNTVERS;
171
		p.pm_vers = MOUNTVERS;
172
	if (!p.pm_prot)
172
	if (!p.pm_prot) {
173
		p.pm_prot = IPPROTO_TCP;
173
		p.pm_prot = IPPROTO_TCP;
174
		if (!p.pm_port) {
175
			p.pm_port = pmap_getport(server_addr,
176
					 p.pm_prog, p.pm_vers, p.pm_prot);
177
		}
178
		/* Fall back to UDP if there's no TCP registration for mount */
179
		if (!p.pm_port) {
180
			fprintf(stderr, "mount server reported tcp not available, falling back to udp\n");
181
			p.pm_prot = IPPROTO_UDP;
182
			p.pm_port = pmap_getport(server_addr,
183
					 p.pm_prog, p.pm_vers, p.pm_prot);
184
		}
185
	}
174
#if 0
186
#if 0
175
	if (!p.pm_port) {
187
	if (!p.pm_port) {
176
		p.pm_port = pmap_getport(server_addr, p.pm_prog, p.pm_vers,
188
		p.pm_port = pmap_getport(server_addr, p.pm_prog, p.pm_vers,
Lines 584-590 Link Here
584
			pm_mnt = get_mountport(&mount_server_addr,
596
			pm_mnt = get_mountport(&mount_server_addr,
585
					       mountprog,
597
					       mountprog,
586
					       mountvers,
598
					       mountvers,
587
					       proto,
599
					       0, /* TCP or UDP: pick 
600
					             whatever is available */
588
					       mountport,
601
					       mountport,
589
					       nfs_mount_version);
602
					       nfs_mount_version);
590
603

Return to bug 142251