Fix mismerge in last commit: check that cred->cr_prison is NULL before dereferencing the prison pointer.
Fix mismerge in last commit: check that cred->cr_prison is NULL
before dereferencing the prison pointer.

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase