PERFORCE change 102837 for review

[Chris Jones]

http://perforce.freebsd.org/chv.cgi?CH=102837

Change 102837 by cdjones at cdjones-impulse on 2006/07/31 09:20:22

	Back out changes.

Affected files ...

.. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf.c#6 edit

Differences ...

==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf.c#6 (text+ko) ====

@@ -762,10 +762,11 @@
 	PROC_LOCK(imgp->proc);
 	if (data_size > lim_cur(imgp->proc, RLIMIT_DATA) ||
 	    text_size > maxtsiz ||
-	    total_size > lim_cur(imgp->proc, RLIMIT_VMEM) ||
+	    total_size > lim_cur(imgp->proc, RLIMIT_VMEM)) {
+/* ||
 	    (jailed(imgp->proc->p_ucred) && 
 	     total_size > (prison_memory_limit(imgp->proc->p_ucred) 
-			   - prison_memory(imgp->proc->p_ucred)))) {
+			   - prison_memory(imgp->proc->p_ucred)))) { */
 		PROC_UNLOCK(imgp->proc);
 		return (ENOMEM);
 	}