Merge tag 'upstream/1.1' into debian

Upstream version 1.1

1 files changed, 4 insertions, 14 deletions

diff --git a/perl/lib/Wallet/Admin.pm b/perl/lib/Wallet/Admin.pm
index 8481979..33e2a7d 100644
--- a/perl/lib/Wallet/Admin.pm
+++ b/perl/lib/Wallet/Admin.pm
@@ -98,20 +98,10 @@ sub initialize {
     $self->default_data;
 
     # Create a default admin ACL.
-    eval {
-        my $guard = $self->{schema}->txn_scope_guard;
-        $self->{schema}->resultset ('Acl')->populate ([
-            [ qw/ac_id ac_name/ ],
-            [ 1, 'ADMIN'        ],
-        ]);
-        $self->{schema}->resultset ('AclEntry')->populate ([
-            [ qw/ae_id ae_scheme ae_identifier/ ],
-            [ 1, 'krb5', $user                  ],
-        ]);
-        $guard->commit;
-    };
-    if ($@) {
-        $self->error ("cannot add ADMIN ACL: $@");
+    my $schema = $self->{schema};
+    my $acl = Wallet::ACL->create ('ADMIN', $schema, $user, 'localhost');
+    unless ($acl->add ('krb5', $user, $user, 'localhost')) {
+        $self->error ($acl->error);
         return;
     }
     return 1;