Fixing authstore to use an array for ordering, rather than a hash, duh.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1059 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 6 insertions, 4 deletions

diff --git a/lib/puppet/server/authstore.rb b/lib/puppet/server/authstore.rb
index a0a3c13ec..70f518f7c 100755
--- a/lib/puppet/server/authstore.rb
+++ b/lib/puppet/server/authstore.rb
@@ -9,10 +9,11 @@ class Server
     class AuthorizationError < Puppet::Error; end
 
     class AuthStore
-        ORDER = {
-            :ip => [:ip],
-            :name => [:hostname, :domain]
-        }
+        # This has to be an array, not a hash, else it loses its ordering.
+        ORDER = [
+            [:ip, [:ip]],
+            [:name, [:hostname, :domain]]
+        ]
 
         Puppet::Util.logmethods(self, false)
 
@@ -49,6 +50,7 @@ class Server
                     value = name.split(".").reverse
                 end
 
+
                 array.each { |type|
                     [[@deny, false], [@allow, true]].each { |ary|
                         hash, retval = ary