From 563ecf1306e8b13fe3f6cceb552a77b5b039ff51 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 5 Jun 2008 08:00:59 +0000 Subject: [PATCH] Fixed style. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11227 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../systems/services/kerberos/class_krb_host_keys.inc | 5 +++++ .../admin/systems/services/kerberos/krb_host_keys.tpl | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gosa-plugins/mit-krb5/admin/systems/services/kerberos/class_krb_host_keys.inc b/gosa-plugins/mit-krb5/admin/systems/services/kerberos/class_krb_host_keys.inc index 5f5645329..a9c2846d0 100644 --- a/gosa-plugins/mit-krb5/admin/systems/services/kerberos/class_krb_host_keys.inc +++ b/gosa-plugins/mit-krb5/admin/systems/services/kerberos/class_krb_host_keys.inc @@ -107,17 +107,22 @@ class krb_host_keys extends plugin $principals = $this->pwd_handle->load_principals_for_server($mac); $princ = ""; + $present = FALSE; foreach($principals as $name){ if(preg_match("/\/".normalizePreg($this->namingAttr)."\@/i",$name)){ $princ .= "".preg_replace("/\/.*$/","",$name)." "; } + if(preg_match("/^".normalizePreg($this->prefix.$this->namingAttr)."\@/i",$name)){ + $present = TRUE; + } } $this->server_list[$mac]['CN'] = $cn; $this->server_list[$mac]['MAC'] = $mac; $this->server_list[$mac]['REALM'] = $realm; $this->server_list[$mac]['USED'] = $princ; + $this->server_list[$mac]['PRESENT'] = $present; $this->server_list[$mac]['PRINCIPALS'] = $principals; /* Set first realm as selected. diff --git a/gosa-plugins/mit-krb5/admin/systems/services/kerberos/krb_host_keys.tpl b/gosa-plugins/mit-krb5/admin/systems/services/kerberos/krb_host_keys.tpl index bed321b59..a9707c2e4 100644 --- a/gosa-plugins/mit-krb5/admin/systems/services/kerberos/krb_host_keys.tpl +++ b/gosa-plugins/mit-krb5/admin/systems/services/kerberos/krb_host_keys.tpl @@ -5,15 +5,14 @@ {foreach from=$server_list item=item key=key} - - + + + + + {/foreach}
{$item.REALM} - {if $item.USED != ""} + {$item.REALM} + {if $item.PRESENT} - {$item.USED} {else} @@ -22,6 +21,10 @@ {/if}
{t}Keys for this realm{/t}:{$item.USED}
{if $is_service_key} -- 2.30.2