[SCM] GNU shishi branch, master, updated. shishi-1-0-2-14-g754b091

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU shishi".

http://git.savannah.gnu.org/cgit/shishi.git/commit/?id=754b091599eceb7f770a8b007dd720b09e4edcb9

The branch, master has been updated
       via  754b091599eceb7f770a8b007dd720b09e4edcb9 (commit)
      from  817f540724c745e1441ce5931ff6066af7364e8c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 754b091599eceb7f770a8b007dd720b09e4edcb9
Author: Mats Erik Andersson <address@hidden>
Date:   Wed May 15 16:30:33 2013 +0200

    Parse timestamp in keytab conversion.

-----------------------------------------------------------------------

Summary of changes:
 lib/diskio.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/lib/diskio.c b/lib/diskio.c
index 49e6734..3d31d46 100644
--- a/lib/diskio.c
+++ b/lib/diskio.c
@@ -960,6 +960,14 @@ shishi_key_parse (Shishi * handle, FILE * fh, Shishi_key 
** key)
            {
              shishi_key_principal_set (lkey, line + strlen ("Principal: "));
            }
+         else if (strncmp (line, "Timestamp: ", strlen ("Timestamp: ")) == 0)
+           {
+             time_t timestamp;
+
+             timestamp = shishi_generalize_ctime (handle,
+                               line + strlen ("Timestamp: "));
+             shishi_key_timestamp_set (lkey, timestamp);
+           }
        }
     }
 
@@ -985,6 +993,7 @@ shishi_key_parse (Shishi * handle, FILE * fh, Shishi_key ** 
key)
  * Principal: host/latte.josefsson.org
  * Realm: JOSEFSSON.ORG
  * Key-Version-Number: 1
+ * Timestamp: 20130420150337Z
  *
  * P1QdeW/oSiag/bTyVEBAY2msiGSTmgLXlopuCKoppDs=
  * -----END SHISHI KEY-----
@@ -1013,6 +1022,9 @@ shishi_key_print (Shishi * handle, FILE * fh, const 
Shishi_key * key)
     fprintf (fh, "Realm: %s\n", shishi_key_realm (key));
   if (shishi_key_version (key) != UINT32_MAX)
     fprintf (fh, "Key-Version-Number: %d\n", shishi_key_version (key));
+  if (shishi_key_timestamp (key))
+    fprintf (fh, "Timestamp: %s\n",
+            shishi_generalize_time (handle, shishi_key_timestamp (key)));
   fprintf (fh, "\n");
 
   for (i = 0; i < strlen (b64key); i++)


hooks/post-receive
-- 
GNU shishi