Attachment #45961 for bug #74614

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




			}
			if ( retval!=0 )
				ERR("unable to determine filesystem type\n");
		} else {
			opts = proc_options(p.fstype, p.options);
			retval =
			    do_mount(p.device, p.mountpoint, p.fstype, p.flags,
				     opts);
			free(opts);
		}
	} else {
		opts = proc_options(p.fstype, p.options);
		retval =
		    do_mount(p.device, p.mountpoint, p.fstype, p.flags,
			     opts);
		free(opts);
	}
	} else
		retval =
		    do_mount(p.device, p.mountpoint, p.fstype, p.flags,
			     p.options);

	if (retval) {
		ERR("mount failure, %s\n", strerror(errno));
		exit(EXIT_FAILURE);

Return to bug 74614

Lines 424-442 Link Here

(-)submountd-0.9/submountd.c.orig (-7 / +8 lines)
424	}	424	}
425	if ( retval!=0 )	425	if ( retval!=0 )
426	ERR("unable to determine filesystem type\n");	426	ERR("unable to determine filesystem type\n");
		427	} else {
		428	opts = proc_options(p.fstype, p.options);
		429	retval =
		430	do_mount(p.device, p.mountpoint, p.fstype, p.flags,
		431	opts);
		432	free(opts);
427	}	433	}
428	else {	434	} else {
429	opts = proc_options(p.fstype, p.options);	435	opts = proc_options(p.fstype, p.options);
430	retval =	436	retval =
431	do_mount(p.device, p.mountpoint, p.fstype, p.flags,	437	do_mount(p.device, p.mountpoint, p.fstype, p.flags,
432	opts);	438	opts);
433	free(opts);	439	free(opts);
434	}	440	}
435	} else
436	retval =
437	do_mount(p.device, p.mountpoint, p.fstype, p.flags,
438	p.options);
439
440	if (retval) {	441	if (retval) {
441	ERR("mount failure, %s\n", strerror(errno));	442	ERR("mount failure, %s\n", strerror(errno));
442	exit(EXIT_FAILURE);	443	exit(EXIT_FAILURE);