← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/heimdal/jaunty

« back to all changes in this revision

Viewing changes to lib/hx509/hxtool-commands.in

  • Committer: Bazaar Package Importer
  • Author(s): Nick Ellery
  • Date: 2008-11-17 22:25:58 UTC
  • mfrom: (1.1.5 upstream) (2.1.2 lenny)
  • Revision ID: james.westby@ubuntu.com-20081117222558-jd1aj1jth6ycdb0x
Tags: 1.2.dfsg.1-2.1ubuntu1
https://launchpad.net/bugs/299345
* Merge from debian unstable, remaining changes (LP: #299345):
  - Change libdb4.2-dev to libdb4.6-dev in build-deps
  - Add netbase to heimdal-kdc depends.
  - Set CPPFLAGS=-DLDAP_DEPRECATED to fix build with OpenLDAP 2.4 on
    64-bit architectures.
* Remove dependency on update-inetd to heimdal-servers and heimdal-kdc,
  as packages should rely on the inet-superserver to provide the
  update-inetd command.
* Drop the addition of -1 to the version of comerr-dev in build depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/hx509/hxtool-commands.in
30
30
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
31
31
 * SUCH DAMAGE. 
32
32
 */
33
 
/* $Id: hxtool-commands.in 21343 2007-06-26 14:21:55Z lha $ */
 
33
/* $Id: hxtool-commands.in 22677 2008-03-13 17:35:49Z lha $ */
34
34
 
35
35
command = {
36
36
        name = "cms-create-sd"
135
135
                help = "unwrap in-data that's in a ContentInfo"
136
136
        }
137
137
        option = {
 
138
                long = "pem"
 
139
                type = "flag"
 
140
                help = "unwrap in-data from PEM armor"
 
141
        }
 
142
        option = {
138
143
                long = "signed-content"
139
144
                type = "string"
140
145
                help = "file containing content"
438
443
                help = "match on friendly name"
439
444
        }
440
445
        option = {
 
446
                long = "eku"
 
447
                type = "string"
 
448
                argument = "oid-string"
 
449
                help = "match on EKU"
 
450
        }
 
451
        option = {
 
452
                long = "expr"
 
453
                type = "string"
 
454
                argument = "expression"
 
455
                help = "match on expression"
 
456
        }
 
457
        option = {
441
458
                long = "keyEncipherment"
442
459
                type = "flag"
443
460
                help = "match keyEncipherment certificates"