key.c: Split before storing a subkey.

[catacomb-python] / key.c

diff --git a/key.c b/key.c
index 3cd1f1e28e12f9785b10a26813f472899b93a8fc..19a57923403ed7f272dc7a0885fb527f4bf080b6 100644 (file)
--- a/key.c
+++ b/key.c
@@ -7,7 +7,7 @@
  * (c) 2005 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of the Python interface to Catacomb.
  *
@@ -15,12 +15,12 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * Catacomb/Python is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with Catacomb/Python; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -287,7 +287,7 @@ static PyObject *meth__KeyData_readflags(PyObject *me, PyObject *arg)
     goto end;
   if ((err = key_readflags(p, &end, &f, &m)) != 0)
     KEYERR(err);
-  rc = Py_BuildValue("(NNs)", getu32(f), getu32(m), end);
+  rc = Py_BuildValue("(NNs)", getulong(f), getulong(m), end);
 end:
   return (rc);
 }
@@ -336,7 +336,7 @@ static void keydata_pydealloc(PyObject *me)
 static PyObject *kdmeth_matchp(PyObject *me, PyObject *arg)
 {
   key_filter f;
-  
+
   if (!PyArg_ParseTuple(arg, "O&:matchp", convfilter, &f))
     return (0);
   return (getbool(KEY_MATCH(KEYDATA_KD(me), &f)));
@@ -388,7 +388,7 @@ static PyObject *kdmeth_plock(PyObject *me, PyObject *arg)
   int err;
   PyObject *rc = 0;
   key_data *kd;
-  
+
   if (!PyArg_ParseTuple(arg, "s:plock", &tag))
     goto end;
   if ((err = key_plock(&kd, KEYDATA_KD(me), tag)) != 0)
@@ -404,7 +404,7 @@ static PyObject *kdmeth_lock(PyObject *me, PyObject *arg)
   int n;
   PyObject *rc = 0;
   key_data *kd;
-  
+
   if (!PyArg_ParseTuple(arg, "s#:lock", &p, &n))
     goto end;
   key_lock(&kd, KEYDATA_KD(me), p, n);
@@ -440,13 +440,13 @@ static PyObject *meth__KeyData_decode(PyObject *me, PyObject *arg)
     goto end;
   if ((kd = key_decode(p, n)) == 0)
     KEYERR(KERR_MALFORMED);
-  rc =  keydata_pywrap(kd);
+  rc = keydata_pywrap(kd);
 end:
   return (rc);
 }
 
 static PyObject *kdget_flags(PyObject *me, void *hunoz)
-  { return (getu32(KEYDATA_KD(me)->e)); }
+  { return (getulong(KEYDATA_KD(me)->e)); }
 
 static PyMethodDef keydata_pymethods[] = {
 #define METHNAME(func) kdmeth_##func
@@ -635,7 +635,7 @@ static PyObject *kdemeth_punlock(PyObject *me, PyObject *arg)
   int err;
   PyObject *rc = 0;
   key_data *kd;
-  
+
   if (!PyArg_ParseTuple(arg, "s:punlock", &tag))
     goto end;
   if ((err = key_punlock(&kd, KEYDATA_KD(me), tag)) != 0)
@@ -652,7 +652,7 @@ static PyObject *kdemeth_unlock(PyObject *me, PyObject *arg)
   int err;
   PyObject *rc = 0;
   key_data *kd;
-  
+
   if (!PyArg_ParseTuple(arg, "s#:unlock", &p, &n))
     goto end;
   if ((err = key_unlock(&kd, KEYDATA_KD(me), p, n)) != 0)
@@ -1097,6 +1097,7 @@ static int keydatastruct_pystore(PyObject *me,
 
   if ((tag = PyString_AsString(key)) == 0)
     goto end;
+  key_split(&KEYDATA_KD(me));
   if (value) {
     if (!KEYDATA_PYCHECK(value))
       TYERR("expected KeyData value");
@@ -1395,7 +1396,7 @@ static void key_pydealloc(PyObject *me)
 static PyObject *kmeth_delete(PyObject *me, PyObject *arg)
 {
   int err;
-  
+
   if (!PyArg_ParseTuple(arg, ":delete")) goto end;
   if ((err = key_delete(KEY_KF(me), KEY_K(me))) != 0) KEYERR(err);
   RETURN_ME;
@@ -1406,7 +1407,7 @@ end:
 static PyObject *kmeth_expire(PyObject *me, PyObject *arg)
 {
   int err;
-  
+
   if (!PyArg_ParseTuple(arg, ":expire")) goto end;
   if ((err = key_expire(KEY_KF(me), KEY_K(me))) != 0) KEYERR(err);
   RETURN_ME;
@@ -1418,7 +1419,7 @@ static PyObject *kmeth_used(PyObject *me, PyObject *arg)
 {
   long t;
   int err;
-  
+
   if (!PyArg_ParseTuple(arg, "l:used", &t)) goto end;
   if ((err = key_used(KEY_KF(me), KEY_K(me), t)) != 0) KEYERR(err);
   RETURN_ME;
@@ -1463,20 +1464,54 @@ static PyObject *kmeth_fingerprint(PyObject *me,
 }
 
 static PyObject *kget_id(PyObject *me, void *hunoz)
-  { return (getu32(KEY_K(me)->id)); }
+  { return (getulong(KEY_K(me)->id)); }
 static PyObject *kget_file(PyObject *me, void *hunoz)
   { RETURN_OBJ(KEY_KFOBJ(me)); }
 static PyObject *kget_type(PyObject *me, void *hunoz)
   { return (PyString_FromString(KEY_K(me)->type)); }
 static PyObject *kget_exptime(PyObject *me, void *hunoz)
-  { return (PyInt_FromLong(KEY_K(me)->exp)); }
+  { return (getulong(KEY_K(me)->exp)); }
 static PyObject *kget_deltime(PyObject *me, void *hunoz)
-  { return (PyInt_FromLong(KEY_K(me)->del)); }
+  { return (getulong(KEY_K(me)->del)); }
 static PyObject *kget_expiredp(PyObject *me, void *hunoz)
   { return (getbool(key_expired(KEY_K(me)))); }
 static PyObject *kget_attr(PyObject *me, void *hunoz)
   { return (keyattrs_make(me)); }
 
+static int kset_exptime(PyObject *me, PyObject *x, void *hunoz)
+{
+  key *k = KEY_K(me);
+  unsigned long et;
+
+  if (!convulong(x, &et))
+    goto end;
+  if (!(KEY_KF(me)->f & KF_WRITE))
+    KEYERR(KERR_READONLY);
+  k->exp = et;
+  KEY_KF(me)->f |= KF_MODIFIED;
+  return (0);
+end:
+  return (-1);
+}
+
+static int kset_deltime(PyObject *me, PyObject *x, void *hunoz)
+{
+  key *k = KEY_K(me);
+  unsigned long dt;
+
+  if (!convulong(x, &dt))
+    goto end;
+  if (dt == KEXP_FOREVER && k->exp != KEXP_FOREVER)
+    VALERR("key will eventually expire");
+  if (!(KEY_KF(me)->f & KF_WRITE))
+    KEYERR(KERR_READONLY);
+  k->del = dt;
+  KEY_KF(me)->f |= KF_MODIFIED;
+  return (0);
+end:
+  return (-1);
+}
+
 static PyObject *kget_data(PyObject *me, void *hunoz)
 {
   key_data *kd = KEY_K(me)->k;
@@ -1560,8 +1595,8 @@ static PyGetSetDef key_pygetset[] = {
   GET  (id,            "KEY.id -> ID")
   GETSET(tag,          "KEY.tag -> TAG")
   GET  (type,          "KEY.type -> TYPE")
-  GET  (exptime,       "KEY.exptime -> TIME")
-  GET  (deltime,       "KEY.deltime -> TIME")
+  GETSET(exptime,      "KEY.exptime -> TIME")
+  GETSET(deltime,      "KEY.deltime -> TIME")
   GET  (expiredp,      "KEY.expiredp -> BOOL")
   GET  (attr,          "KEY.attr -> ATTRIBUTES")
   GETSET(data,         "KEY.data -> KD")
@@ -1636,7 +1671,7 @@ static PyObject *keyiter_pynext(PyObject *me)
 
   if ((k = key_next(KEYITER_I(me))) == 0)
     return (0);
-  return (key_pywrap(KEYITER_KFOBJ(me), k));
+  return (getulong(k->id));
 }
 
 static void keyiter_pydealloc(PyObject *me)
@@ -1875,7 +1910,7 @@ static PyObject *keyfile_pylookup(PyObject *me, PyObject *key)
   }
 end:
   return (rc);
-}  
+}
 
 static PyObject *kfmeth_newkey(PyObject *me, PyObject *arg, PyObject *kw)
 {
@@ -1886,10 +1921,10 @@ static PyObject *kfmeth_newkey(PyObject *me, PyObject *arg, PyObject *kw)
   key *k;
   int err;
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&sl:new", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&s|l:newkey", kwlist,
                                   convu32, &id, &type, &exptime))
     goto end;
-  if ((err = key_new(KEYFILE_KF(me), id, type, exptime, &k)) == 0)
+  if ((err = key_new(KEYFILE_KF(me), id, type, exptime, &k)) != 0)
     KEYERR(err);
   return (key_pywrap(me, k));
 end: