/* -*-c-*-
*
- * $Id: key-file.c,v 1.1 1999/12/22 15:47:48 mdw Exp $
+ * $Id: key-file.c,v 1.2 2001/02/03 11:57:38 mdw Exp $
*
* System-dependent key filing operations
*
/*----- Revision history --------------------------------------------------*
*
* $Log: key-file.c,v $
+ * Revision 1.2 2001/02/03 11:57:38 mdw
+ * Allow creating keyfiles with no file attached.
+ *
* Revision 1.1 1999/12/22 15:47:48 mdw
* Major key-management revision.
*
if (!(f->f & KF_MODIFIED))
return (KWRITE_OK);
+ if (!f->fp)
+ return (KWRITE_FAIL);
/* --- Write a new key file out --- *
*
*
* Arguments: @key_file *f@ = pointer to file structure to initialize
* @const char *file@ = pointer to the file name
- * @int how@ = opening options (@KOPEN_*@).
+ * @unsigned how@ = opening options (@KOPEN_*@).
*
* Returns: Zero if it worked, nonzero otherwise.
*
* for the private use of @key_open@.
*/
-int key_lockfile(key_file *f, const char *file, int how)
+int key_lockfile(key_file *f, const char *file, unsigned how)
{
int of, lf;
const char *ff;
int fd;
+ /* --- Handle the magic no-file option --- */
+
+ if (how & KOPEN_NOFILE) {
+ f->fp = 0;
+ return (0);
+ }
+
/* --- Lots of things depend on whether we're writing --- */
- switch (how) {
+ switch (how & KOPEN_MASK) {
case KOPEN_READ:
of = O_RDONLY;
lf = LOCK_NONEXCL;