diff options
| author | Russ Allbery <eagle@eyrie.org> | 2014-07-16 13:46:50 -0700 |
|---|---|---|
| committer | Russ Allbery <eagle@eyrie.org> | 2014-07-16 13:46:50 -0700 |
| commit | 1796d631f0846ec98cd286bc4284898a7300ee78 (patch) | |
| tree | 6fd42de6dc858ef06c6d270410c32ec61f39e593 /docs/objects-and-schemes | |
| parent | f5194217566a6f4cdeffbae551153feb1412210d (diff) | |
| parent | 6409733ee3b7b1910dc1c166a392cc628834146c (diff) | |
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
Diffstat (limited to 'docs/objects-and-schemes')
| -rw-r--r-- | docs/objects-and-schemes | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/docs/objects-and-schemes b/docs/objects-and-schemes index 57c2f9f..97e6289 100644 --- a/docs/objects-and-schemes +++ b/docs/objects-and-schemes @@ -10,6 +10,18 @@ Introduction Object Types + duo + + Stores the configuration for a Duo Security integration. Duo is a + cloud provider of multifactor authentication services. A Duo + integration consists of some local configuration and a secret key that + permits verification of a second factor using the Duo cloud service. + Currently, only UNIX integrations are supported. In the future, this + object type will likely be split into several object types + corresponding to the supported types of Duo integrations. + + Implemented via Wallet::Object::Duo. + file Stores an arbitrary file and allows retrieval of that file. The file @@ -91,7 +103,7 @@ ACL Schemes License - Copyright 2012, 2013 + Copyright 2012, 2013, 2014 The Board of Trustees of the Leland Stanford Junior University Copying and distribution of this file, with or without modification, |