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, 123 insertions, 0 deletions

diff --git a/perl/lib/Wallet/Schema/Result/AclHistory.pm b/perl/lib/Wallet/Schema/Result/AclHistory.pm
new file mode 100644
index 0000000..82e18a9
--- /dev/null
+++ b/perl/lib/Wallet/Schema/Result/AclHistory.pm
@@ -0,0 +1,123 @@
+# Wallet schema for ACL history.
+#
+# Written by Jon Robertson <jonrober@stanford.edu>
+# Copyright 2012, 2013, 2014
+#     The Board of Trustees of the Leland Stanford Junior University
+#
+# See LICENSE for licensing terms.
+
+package Wallet::Schema::Result::AclHistory;
+
+use strict;
+use warnings;
+
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->load_components("InflateColumn::DateTime");
+
+=for stopwords
+ACL
+
+=head1 NAME
+
+Wallet::Schema::Result::AclHistory - Wallet schema for ACL history
+
+=head1 DESCRIPTION
+
+=cut
+
+__PACKAGE__->table("acl_history");
+
+=head1 ACCESSORS
+
+=head2 ah_id
+
+  data_type: 'integer'
+  is_auto_increment: 1
+  is_nullable: 0
+
+=head2 ah_acl
+
+  data_type: 'integer'
+  is_nullable: 0
+
+=head2 ah_name
+
+  data_type: 'varchar'
+  is_nullable: 1
+  size: 255
+
+=head2 ah_action
+
+  data_type: 'varchar'
+  is_nullable: 0
+  size: 16
+
+=head2 ah_scheme
+
+  data_type: 'varchar'
+  is_nullable: 1
+  size: 32
+
+=head2 ah_identifier
+
+  data_type: 'varchar'
+  is_nullable: 1
+  size: 255
+
+=head2 ah_by
+
+  data_type: 'varchar'
+  is_nullable: 0
+  size: 255
+
+=head2 ah_from
+
+  data_type: 'varchar'
+  is_nullable: 0
+  size: 255
+
+=head2 ah_on
+
+  data_type: 'datetime'
+  datetime_undef_if_invalid: 1
+  is_nullable: 0
+
+=cut
+
+__PACKAGE__->add_columns(
+  "ah_id",
+  { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
+  "ah_acl",
+  { data_type => "integer", is_nullable => 0 },
+  "ah_name",
+  { data_type => "varchar", is_nullable => 1, size => 255 },
+  "ah_action",
+  { data_type => "varchar", is_nullable => 0, size => 16 },
+  "ah_scheme",
+  { data_type => "varchar", is_nullable => 1, size => 32 },
+  "ah_identifier",
+  { data_type => "varchar", is_nullable => 1, size => 255 },
+  "ah_by",
+  { data_type => "varchar", is_nullable => 0, size => 255 },
+  "ah_from",
+  { data_type => "varchar", is_nullable => 0, size => 255 },
+  "ah_on",
+  {
+    data_type => "datetime",
+    datetime_undef_if_invalid => 1,
+    is_nullable => 0,
+  },
+);
+__PACKAGE__->set_primary_key("ah_id");
+
+# Add an index on the ACL.
+sub sqlt_deploy_hook {
+    my ($self, $sqlt_table) = @_;
+    my $name = 'acl_history_idx_ah_acl';
+    $sqlt_table->add_index (name => $name, fields => [qw(ah_acl)]);
+    $name = 'acl_history_idx_ah_name';
+    $sqlt_table->add_index (name => $name, fields => [qw(ah_name)]);
+}
+
+1;