D40342.id122641.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D40342.id122641.diff
View Options

	diff --git a/lib/libutil/login_cap.c b/lib/libutil/login_cap.c
	--- a/lib/libutil/login_cap.c
	+++ b/lib/libutil/login_cap.c
	@@ -655,10 +655,8 @@

	if ((r = cgetstr(lc->lc_cap, cap, &res)) == -1)
	return def;
	- else if (r < 0) {
	- errno = ERANGE;
	+ else if (r < 0)
	return error;
	- }

	/* "inf" and "infinity" are special cases */
	if (isinfinite(res))
	@@ -740,19 +738,18 @@
	/*
	* For BSDI compatibility, try for the tag=<val> first
	*/
	- if ((r = cgetstr(lc->lc_cap, cap, &res)) == -1) {
	+ r = cgetstr(lc->lc_cap, cap, &res);
	+ if (r == -1) {
	long lval;
	/* string capability not present, so try for tag#<val> as numeric */
	if ((r = cgetnum(lc->lc_cap, cap, &lval)) == -1)
	return def; /* Not there, so return default */
	- else if (r >= 0)
	+ else if (r < 0)
	+ return error;
	+ else
	return (rlim_t)lval;
	- }
	-
	- if (r < 0) {
	- errno = ERANGE;
	+ } else if (r < 0)
	return error;
	- }

	if (isinfinite(res))
	return RLIM_INFINITY;
	@@ -791,10 +788,8 @@

	if ((r = cgetstr(lc->lc_cap, cap, &res)) == -1)
	return def;
	- else if (r < 0) {
	- errno = ERANGE;
	+ else if (r < 0)
	return error;
	- }

	if (isinfinite(res))
	return RLIM_INFINITY;