shishi/src shisa.c shisa.ggo

[shishi-commit]

CVSROOT:        /cvsroot/shishi
Module name:    shishi
Branch:         
Changes by:     Simon Josefsson <address@hidden>        03/11/30 22:01:19

Modified files:
        src            : shisa.c shisa.ggo 

Log message:
        Fix.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/src/shisa.c.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/src/shisa.ggo.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: shishi/src/shisa.c
diff -u shishi/src/shisa.c:1.10 shishi/src/shisa.c:1.11
--- shishi/src/shisa.c:1.10     Sun Nov 30 20:42:25 2003
+++ shishi/src/shisa.c  Sun Nov 30 22:01:19 2003
@@ -378,6 +378,14 @@
   if (rc != SHISHI_OK)
     error (1, 0, "Shishi initialize failed: %s", shishi_strerror (rc));
 
+  if (args_info.encryption_type_given)
+    {
+      rc = shishi_cfg_clientkdcetype_set (sh, args_info.encryption_type_arg);
+      if (rc != SHISHI_OK)
+       error (1, 0, "Could not set encryption type `%s': %s",
+              args_info.encryption_type_arg, shishi_strerror (rc));
+    }
+
   if (args_info.list_given || args_info.dump_given)
     rc = dumplist ();
   else if (args_info.add_given)
Index: shishi/src/shisa.ggo
diff -u shishi/src/shisa.ggo:1.4 shishi/src/shisa.ggo:1.5
--- shishi/src/shisa.ggo:1.4    Sun Nov 30 20:42:25 2003
+++ shishi/src/shisa.ggo        Sun Nov 30 22:01:19 2003
@@ -36,8 +36,9 @@
 option "disabled" - "Only dump or list disabled principals.\n" flag off
 
 section "Values (for --add and --modify)"
-option "encryption-type" E "Specify the encryption type of key." no
-option "password" - "Derive key from this password." no
+option "encryption-type" E "Specify the encryption type of key.  Valid values 
include 'aes' and '3des'." string no
+option "password" - "Derive key from this password." string no
+option "random" - "Use a random key." no
 
 section "Other options"
 option "configuration-file" c "Use specified configuration file." string 
typestr="FILE" no