Fold in some of dsilvers' autoconf changes.

[onak.git] / decodekey.c

diff --git a/decodekey.c b/decodekey.c
index 5818488b766a92a9ad98dc595277097ecc0695f0..723435ad8513335f0aea516f82ecd90c8775f99e 100644 (file)
--- a/decodekey.c
+++ b/decodekey.c
@@ -4,8 +4,6 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple

- *
- * $Id: decodekey.c,v 1.6 2004/05/27 03:24:01 noodles Exp $

  */
 
 #include <assert.h>
  */
 
 #include <assert.h>


@@ -271,7 +269,7 @@ uint64_t *keysubkeys(struct openpgp_publickey *key)
                        subkeys[count++] = get_packetid(cursubkey->packet);
                        cursubkey = cursubkey -> next;
                }
                        subkeys[count++] = get_packetid(cursubkey->packet);
                        cursubkey = cursubkey -> next;
                }

-               subkeys[count] = NULL;
+               subkeys[count] = 0;

        }
 
        return subkeys;
        }
 
        return subkeys;