Merge tag 'upstream/1.1' into debian

Upstream version 1.1

Conflicts:
	NEWS
	README
	client/keytab.c
	perl/lib/Wallet/ACL.pm
	perl/sql/Wallet-Schema-0.08-PostgreSQL.sql
	perl/t/general/admin.t
	perl/t/verifier/ldap-attr.t

Change-Id: I1a1dc09b97c9258e61f1c8877d0837193c8ae2c6

1 files changed, 74 insertions, 0 deletions

diff --git a/perl/lib/Wallet/Schema/Result/AclEntry.pm b/perl/lib/Wallet/Schema/Result/AclEntry.pm
new file mode 100644
index 0000000..a33a98c
--- /dev/null
+++ b/perl/lib/Wallet/Schema/Result/AclEntry.pm
@@ -0,0 +1,74 @@
+# Wallet schema for an entry in an ACL.
+#
+# Written by Jon Robertson <jonrober@stanford.edu>
+# Copyright 2012, 2013
+#     The Board of Trustees of the Leland Stanford Junior University
+#
+# See LICENSE for licensing terms.
+
+package Wallet::Schema::Result::AclEntry;
+
+use strict;
+use warnings;
+
+use base 'DBIx::Class::Core';
+
+=for stopwords
+ACL
+
+=head1 NAME
+
+Wallet::Schema::Result::AclEntry - Wallet schema for an entry in an ACL
+
+=head1 DESCRIPTION
+
+=cut
+
+__PACKAGE__->table("acl_entries");
+
+=head1 ACCESSORS
+
+=head2 ae_id
+
+  data_type: 'integer'
+  is_nullable: 0
+
+=head2 ae_scheme
+
+  data_type: 'varchar'
+  is_nullable: 0
+  size: 32
+
+=head2 ae_identifier
+
+  data_type: 'varchar'
+  is_nullable: 0
+  size: 255
+
+=cut
+
+__PACKAGE__->add_columns(
+  "ae_id",
+  { data_type => "integer", is_nullable => 0 },
+  "ae_scheme",
+  { data_type => "varchar", is_nullable => 0, size => 32 },
+  "ae_identifier",
+  { data_type => "varchar", is_nullable => 0, size => 255 },
+);
+__PACKAGE__->set_primary_key("ae_id", "ae_scheme", "ae_identifier");
+
+__PACKAGE__->belongs_to(
+                      'acls',
+                      'Wallet::Schema::Result::Acl',
+                      { 'foreign.ac_id' => 'self.ae_id' },
+                      { is_deferrable => 1, on_delete => 'CASCADE',
+                        on_update => 'CASCADE' },
+                     );
+
+__PACKAGE__->has_one(
+                     'acl_scheme',
+                     'Wallet::Schema::Result::AclScheme',
+                     { 'foreign.as_name' => 'self.ae_scheme' },
+                     { cascade_delete => 0 },
+                    );
+1;