From 9def142f98a71e8186d2867dd5636711dbca5583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Wed, 18 Apr 2012 17:32:19 +0300
Subject: [PATCH] Fixed keytab generation when key number is over 10 and
 improved checking of principals in keytab.

---
 kerberos/templates/keytab.erb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/kerberos/templates/keytab.erb b/kerberos/templates/keytab.erb
index e15afbc..867ceca 100644
--- a/kerberos/templates/keytab.erb
+++ b/kerberos/templates/keytab.erb
@@ -20,16 +20,16 @@ def check_keytab(config, keytab, principals)
   entries = []
   IO.popen(sprintf('%s -k %s', config['klist'], keytab), mode='r') { |f|
     f.readlines.each do |l|
-      next unless l =~ /   \d+ .*/
+      next unless l =~ /[ ]+\d+ .*/
       entries << l.split()[1]
     end
   }
-  t = principals & entries.uniq
-  if t.size != principals.size
-    return false
-  else
-    return true
+  principals.each do |p|
+    if not entries.include?(p)
+      return false
+    end
   end
+  return true
 end