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

diff --git a/perl/lib/Wallet/Schema/Result/Flag.pm b/perl/lib/Wallet/Schema/Result/Flag.pm
new file mode 100644
index 0000000..e223ff8
--- /dev/null
+++ b/perl/lib/Wallet/Schema/Result/Flag.pm
@@ -0,0 +1,62 @@
+# Wallet schema for object flags.
+#
+# 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::Flag;
+
+use strict;
+use warnings;
+
+use base 'DBIx::Class::Core';
+
+=head1 NAME
+
+Wallet::Schema::Result::Flag - Wallet schema for object flags
+
+=head1 DESCRIPTION
+
+=cut
+
+__PACKAGE__->table("flags");
+
+=head1 ACCESSORS
+
+=head2 fl_type
+
+  data_type: 'varchar'
+  is_nullable: 0
+  size: 16
+
+=head2 fl_name
+
+  data_type: 'varchar'
+  is_nullable: 0
+  size: 255
+
+=head2 fl_flag
+
+  data_type: 'varchar'
+  is_nullable: 0
+  size: 32
+
+=cut
+
+__PACKAGE__->add_columns(
+  "fl_type" =>
+  { data_type => "varchar", is_nullable => 0, size => 16 },
+  "fl_name" =>
+  { data_type => "varchar", is_nullable => 0, size => 255 },
+  "fl_flag" => {
+      data_type => 'enum',
+      is_enum   => 1,
+      extra     => { list => [qw/locked unchanging/] },
+  },
+);
+__PACKAGE__->set_primary_key("fl_type", "fl_name", "fl_flag");
+
+
+1;