From b048ac9d6e0caa90f7e892f4f2c96c9003c47932 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Wed, 1 Jan 2014 17:32:08 +0000 Subject: [PATCH] key.c (key_pynew): Make `exptime' arg (a) optional, and (b) unsigned. Otherwise (a) it was pointless trying to set a default, and (b) you get an error when you try to set KEXP_FOREVER explicitly. Effectively it was impossible to make keys which never expire. --- key.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/key.c b/key.c index 7820f1d..c4ccfa9 100644 --- a/key.c +++ b/key.c @@ -1385,14 +1385,14 @@ static PyObject *key_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) PyObject *kfobj; uint32 id; char *type; - long exptime = KEXP_FOREVER; + unsigned long exptime = KEXP_FOREVER; static char *kwlist[] = { "keyfile", "id", "type", "exptime", 0 }; key *k; int err; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!O&sl:new", kwlist, + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!O&s|O&:new", kwlist, keyfile_pytype, &kfobj, convu32, &id, - &type, &exptime)) + &type, convulong, &exptime)) goto end; if ((err = key_new(KEYFILE_KF(kfobj), id, type, exptime, &k)) != 0) KEYERR(err); -- 2.11.0