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

(-)sys/kern/kern_jail.c (-4 / +6 lines)
Lines 1393-1403 kern_jail_set(struct thread *td, struct uio *optui Link Here
1393
		 * there is a duplicate on a jail with more than one
1393
		 * there is a duplicate on a jail with more than one
1394
		 * IP stop checking and return error.
1394
		 * IP stop checking and return error.
1395
		 */
1395
		 */
1396
		tppr = ppr;
1397
#ifdef VIMAGE
1396
#ifdef VIMAGE
1398
		for (; tppr != &prison0; tppr = tppr->pr_parent)
1397
		for (tppr = ppr; tppr != &prison0; tppr = tppr->pr_parent)
1399
			if (tppr->pr_flags & PR_VNET)
1398
			if (tppr->pr_flags & PR_VNET)
1400
				break;
1399
				break;
1400
#else
1401
		tppr = &prison0;
1401
#endif
1402
#endif
1402
		FOREACH_PRISON_DESCENDANT(tppr, tpr, descend) {
1403
		FOREACH_PRISON_DESCENDANT(tppr, tpr, descend) {
1403
			if (tpr == pr ||
1404
			if (tpr == pr ||
Lines 1460-1470 kern_jail_set(struct thread *td, struct uio *optui Link Here
1460
			}
1461
			}
1461
		}
1462
		}
1462
		/* Check for conflicting IP addresses. */
1463
		/* Check for conflicting IP addresses. */
1463
		tppr = ppr;
1464
#ifdef VIMAGE
1464
#ifdef VIMAGE
1465
		for (; tppr != &prison0; tppr = tppr->pr_parent)
1465
		for (tppr = ppr; tppr != &prison0; tppr = tppr->pr_parent)
1466
			if (tppr->pr_flags & PR_VNET)
1466
			if (tppr->pr_flags & PR_VNET)
1467
				break;
1467
				break;
1468
#else
1469
		tppr = &prison0;
1468
#endif
1470
#endif
1469
		FOREACH_PRISON_DESCENDANT(tppr, tpr, descend) {
1471
		FOREACH_PRISON_DESCENDANT(tppr, tpr, descend) {
1470
			if (tpr == pr ||
1472
			if (tpr == pr ||

Return to bug 231773