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

(-)sbin/umount/umount.c.patched (+6 lines)
Lines 407-412 Link Here
407
	}
407
	}
408
408
409
	if (!namematch(ai)) {
409
	if (!namematch(ai)) {
410
		freeaddrinfo(ai);
410
		free(orignfsdirname);
411
		free(orignfsdirname);
411
		return (1);
412
		return (1);
412
	}
413
	}
Lines 419-424 Link Here
419
		    sfs->f_fsid.val[1] != 0)
420
		    sfs->f_fsid.val[1] != 0)
420
			warn("unmount of %s failed", sfs->f_mntonname);
421
			warn("unmount of %s failed", sfs->f_mntonname);
421
		if (errno != ENOENT) {
422
		if (errno != ENOENT) {
423
			freeaddrinfo(ai);
422
			free(orignfsdirname);
424
			free(orignfsdirname);
423
			return (1);
425
			return (1);
424
		}
426
		}
Lines 427-432 Link Here
427
			warnx("retrying using path instead of file system ID");
429
			warnx("retrying using path instead of file system ID");
428
		if (unmount(sfs->f_mntonname, fflag) != 0) {
430
		if (unmount(sfs->f_mntonname, fflag) != 0) {
429
			warn("unmount of %s failed", sfs->f_mntonname);
431
			warn("unmount of %s failed", sfs->f_mntonname);
432
			freeaddrinfo(ai);
430
			free(orignfsdirname);
433
			free(orignfsdirname);
431
			return (1);
434
			return (1);
432
		}
435
		}
Lines 445-450 Link Here
445
		if (clp  == NULL) {
448
		if (clp  == NULL) {
446
			warnx("%s: %s", hostp,
449
			warnx("%s: %s", hostp,
447
			    clnt_spcreateerror("MOUNTPROG"));
450
			    clnt_spcreateerror("MOUNTPROG"));
451
			freeaddrinfo(ai);
448
			free(orignfsdirname);
452
			free(orignfsdirname);
449
			return (1);
453
			return (1);
450
		}
454
		}
Lines 456-461 Link Here
456
		if (clnt_stat != RPC_SUCCESS) {
460
		if (clnt_stat != RPC_SUCCESS) {
457
			warnx("%s: %s", hostp,
461
			warnx("%s: %s", hostp,
458
			    clnt_sperror(clp, "RPCMNT_UMOUNT"));
462
			    clnt_sperror(clp, "RPCMNT_UMOUNT"));
463
			freeaddrinfo(ai);
459
			free(orignfsdirname);
464
			free(orignfsdirname);
460
			return (1);
465
			return (1);
461
		}
466
		}
Lines 472-477 Link Here
472
		auth_destroy(clp->cl_auth);
477
		auth_destroy(clp->cl_auth);
473
		clnt_destroy(clp);
478
		clnt_destroy(clp);
474
	}
479
	}
480
	freeaddrinfo(ai);
475
	free(orignfsdirname);
481
	free(orignfsdirname);
476
	return (0);
482
	return (0);
477
}
483
}

Return to bug 229020