From b5acbdb9036346482acbc32ded6dfb3774f38f8a Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Wed, 3 May 2006 15:40:43 +0000
Subject: jailid detection failed, when security.jail.set_hostname_allowed=1
 and another hostname was set

---
 ezjail-admin | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'ezjail-admin')

diff --git a/ezjail-admin b/ezjail-admin
index 3e665f4..5e30c9f 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -71,7 +71,8 @@ fetchjailinfo () {
   eval ezjail_ip=\"\$jail_${ezjail_safename}_ip\"
 
   ezjail_softlink=${ezjail_jaildir}/`basename -- ${ezjail_rootdir}`
-  ezjail_id=`jls | grep " ${ezjail_hostname} " | head -n 1 | awk '{print $1}'`
+  [ -f /var/run/jail_${ezjail_safename}.id ] && ezjail_id=`cat /var/run/jail_${ezjail_safename}.id` || return
+  jls | grep -q -E "^ +${ezjail_id} " || unset ezjail_id
 }
 
 # fill the base jail - this function is used by install and update
-- 
cgit v1.2.3