aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2002-08-15 00:43:40 +0000
committerKen Raeburn <raeburn@mit.edu>2002-08-15 00:43:40 +0000
commitb723a43ff10a7a4ca06305c919d0bdd6198b6b90 (patch)
treea9de55f8ae096d6d97fad2c2200be3f7e3341e43
parent292117c347360a38c6936f93d4db217aa2dcbac9 (diff)
downloadkrb5-b723a43ff10a7a4ca06305c919d0bdd6198b6b90.zip
krb5-b723a43ff10a7a4ca06305c919d0bdd6198b6b90.tar.gz
krb5-b723a43ff10a7a4ca06305c919d0bdd6198b6b90.tar.bz2
Combine file and stdio ccache implementations into one source file; selection
is now at compile time, rather than FILE: vs STDIO: prefix. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14715 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat
-rw-r--r--src/lib/krb5/ccache/ChangeLog20
-rw-r--r--src/lib/krb5/ccache/Makefile.in9
-rw-r--r--src/lib/krb5/ccache/cc_file.c777
-rw-r--r--src/lib/krb5/ccache/cc_stdio.c1995
-rw-r--r--src/lib/krb5/ccache/ccdefops.c14
5 files changed, 650 insertions, 2165 deletions
diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index 64a7da5..bdce1a6 100644
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -1,11 +1,19 @@
2002-08-14 Ken Raeburn <raeburn@mit.edu>
- * cc_stdio.c (krb5_fcc_next_cred): Use a krb5_error_code to hold
- the return value from krb5_fcc_interpret.
- (krb5_fcc_get_principal): Initialize return-value variable.
- (krb5_fcc_initialize): Likewise.
- (krb5_fcc_interpret): Change retval to a krb5_error_code. Reorder
- cases for consistency with cc_file.c.
+ * cc_file.c: Merge in cc_stdio.c, under preprocessor test for
+ USE_STDIO.
+ (USE_STDIO): Define it if HAVE_SYS_TYPES_H.
+ (krb5_change_cache, krb5_get_notification_message): Always
+ define.
+ (ALLOC): New macro, with overflow checking.
+ (krb5_fcc_read_principal, krb5_fcc_read_addrs,
+ krb5_fcc_read_authdata): Use it, and fix other overflow checks.
+ (my_fopen): Support non-Mac environments.
+ (krb5_fcc_open_file) [USE_STDIO]: Always use my_fopen.
+ * cc_stdio.c: Deleted.
+ * Makefile.in (STLIBOBJS, OBJS, SRCS): Updated.
+ * ccdefops.c (krb5_cc_dfl_ops) [!USE_CCAPI]: Always use
+ krb5_fcc_ops.
2002-08-09 Ken Raeburn <raeburn@mit.edu>
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index 0171a86..e9f2e05 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -25,7 +25,7 @@ STLIBOBJS= \
ccdefault.o \
ccdefops.o \
cc_retr.o \
- cc_file.o cc_stdio.o cc_memory.o \
+ cc_file.o cc_memory.o \
ccfns.o \
ser_cc.o
@@ -35,7 +35,6 @@ OBJS= $(OUTPRE)ccbase.$(OBJEXT) \
$(OUTPRE)ccdefops.$(OBJEXT) \
$(OUTPRE)cc_retr.$(OBJEXT) \
$(OUTPRE)cc_file.$(OBJEXT) \
- $(OUTPRE)cc_stdio.$(OBJEXT) \
$(OUTPRE)cc_memory.$(OBJEXT) \
$(OUTPRE)ccfns.$(OBJEXT) \
$(OUTPRE)ser_cc.$(OBJEXT)
@@ -46,7 +45,6 @@ SRCS= $(srcdir)/ccbase.c \
$(srcdir)/ccdefops.c \
$(srcdir)/cc_retr.c \
$(srcdir)/cc_file.c \
- $(srcdir)/cc_stdio.c \
$(srcdir)/cc_memory.c \
$(srcdir)/ccfns.c \
$(srcdir)/ser_cc.c
@@ -135,11 +133,6 @@ cc_file.so cc_file.po $(OUTPRE)cc_file.$(OBJEXT): cc_file.c $(SRCTOP)/include/k5
$(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/port-sockets.h \
$(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/krb5/kdb.h \
$(BUILDTOP)/include/profile.h
-cc_stdio.so cc_stdio.po $(OUTPRE)cc_stdio.$(OBJEXT): cc_stdio.c $(SRCTOP)/include/k5-int.h \
- $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
- $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/krb5/kdb.h \
- $(BUILDTOP)/include/profile.h
cc_memory.so cc_memory.po $(OUTPRE)cc_memory.$(OBJEXT): cc_memory.c $(SRCTOP)/include/k5-int.h \
$(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
$(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/port-sockets.h \
diff --git a/src/lib/krb5/ccache/cc_file.c b/src/lib/krb5/ccache/cc_file.c
index 0513107..653313d 100644
--- a/src/lib/krb5/ccache/cc_file.c
+++ b/src/lib/krb5/ccache/cc_file.c
@@ -4,6 +4,8 @@
* Copyright 1990,1991,1992,1993,1994,2000 by the Massachusetts Institute of Technology.
* All Rights Reserved.
*
+ * Original stdio support copyright 1995 by Cygnus Support.
+ *
* Export of this software from the United States of America may
* require a specific license from the United States Government.
* It is the responsibility of any person or organization contemplating
@@ -32,13 +34,26 @@ If OPENCLOSE is defined, ecah of the functions opens and closes the
file whenever it needs to access it. Otherwise, the file is opened
once in initialize and closed once is close.
+#ifndef USE_STDIO
This library depends on UNIX-like file descriptors, and UNIX-like
behavior from the functions: open, close, read, write, lseek.
+#else
+This library depends on ANSI C library routines for file handling. It
+may also have some implicit assumptions about UNIX, but we'll get
+those out as much as possible.
+
+If you are running a UNIX system, you probably want to use the
+UNIX-based "file" cache package instead of this.
+#endif
The quasi-BNF grammar for a credentials cache:
file ::=
- principal list-of-credentials
+#ifndef USE_STDIO
+ principal list-of-credentials
+#else
+ format-vno principal list-of-credentials
+#endif
credential ::=
client (principal)
@@ -60,29 +75,49 @@ data ::=
length (int32)
string of length bytes
+#ifdef USE_STDIO
+format-vno ::= <int16>
+
+#endif
etc.
*/
/* todo:
Make sure that each time a function returns KRB5_NOMEM, everything
allocated earlier in the function and stack tree is freed.
+#ifndef USE_STDIO
File locking
fcc_nseq.c and fcc_read don't check return values a lot.
+#else
+Overwrite cache file with nulls before removing it.
+#endif
+#ifdef USE_STDIO
+Check return values and sanity-check parameters more thoroughly. This
+code was derived from UNIX file I/O code, and the conversion of
+error-trapping may be incomplete. Probably lots of bugs dealing with
+end-of-file versus other errors.
+#endif
*/
#include "k5-int.h"
+#ifndef HAVE_SYS_TYPES_H
+#define USE_STDIO
+#endif
+
+#ifndef USE_STDIO
#define NEED_SOCKETS /* Only for ntohs, etc. */
#define NEED_LOWLEVEL_IO
+#endif
#include <stdio.h>
#include <errno.h>
+#ifndef USE_STDIO
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
-
#ifdef HAVE_NETINET_IN_H
#if !defined(_WIN32) && !defined(HAVE_MACSOCK_H)
@@ -93,6 +128,7 @@ fcc_nseq.c and fcc_read don't check return values a lot.
#else
# error find some way to use net-byte-order file version numbers.
#endif
+#endif /* USE_STDIO */
static krb5_error_code KRB5_CALLCONV krb5_fcc_close
(krb5_context, krb5_ccache id);
@@ -166,8 +202,8 @@ static krb5_error_code KRB5_CALLCONV krb5_fcc_set_flags
(krb5_context, krb5_ccache id, krb5_flags flags);
extern krb5_cc_ops krb5_cc_file_ops;
-krb5_error_code krb5_change_cache
- (void);
+
+krb5_error_code krb5_change_cache (void);
static krb5_error_code krb5_fcc_write
(krb5_context, krb5_ccache id, krb5_pointer buf, unsigned int len);
@@ -210,6 +246,7 @@ static krb5_error_code krb5_fcc_open_file
#define KRB5_FCC_MAXLEN 100
/*
+#ifndef USE_STDIO
* FCC version 2 contains type information for principals. FCC
* version 1 does not.
*
@@ -222,6 +259,12 @@ static krb5_error_code krb5_fcc_open_file
*
* The default credentials cache should be type 3 for now (see
* init_ctx.c).
+#else
+ * SCC version 2 contains type information for principals. SCC
+ * version 1 does not. The code will accept either, and depending on
+ * what KRB5_FCC_DEFAULT_FVNO is set to, it will create version 1 or
+ * version 2 SCC caches.
+#endif
*/
#define KRB5_FCC_FVNO_1 0x0501 /* krb v5, fcc v1 */
@@ -256,7 +299,12 @@ static krb5_error_code krb5_fcc_open_file
typedef struct _krb5_fcc_data {
char *filename;
+#ifndef USE_STDIO
int file;
+#else
+ FILE *file;
+ char stdio_buffer[BUFSIZ];
+#endif
krb5_flags flags;
int mode; /* needed for locking code */
int version; /* version number of the file */
@@ -264,7 +312,11 @@ typedef struct _krb5_fcc_data {
/* An off_t can be arbitrarily complex */
typedef struct _krb5_fcc_cursor {
- off_t pos;
+#ifndef USE_STDIO
+ off_t pos;
+#else
+ long pos;
+#endif
} krb5_fcc_cursor;
#define MAYBE_OPEN(CONTEXT, ID, MODE) \
@@ -279,11 +331,13 @@ typedef struct _krb5_fcc_cursor {
krb5_error_code maybe_close_ret = krb5_fcc_close_file (CONTEXT,ID); \
if (!(RET)) RET = maybe_close_ret; } }
+#ifndef USE_STDIO
#define MAYBE_CLOSE_IGNORE(CONTEXT, ID) \
-{ \
- if (OPENCLOSE (ID)) { \
- (void) krb5_fcc_close_file (CONTEXT,ID); } }
+{ \
+ if (OPENCLOSE (ID)) { \
+ (void) krb5_fcc_close_file (CONTEXT,ID); } }
+#endif
#define CHECK(ret) if (ret != KRB5_OK) goto errout;
/*
@@ -303,9 +357,16 @@ krb5_fcc_read(context, id, buf, len)
{
int ret;
+#ifndef USE_STDIO
ret = read(((krb5_fcc_data *) id->data)->file, (char *) buf, len);
if (ret == -1)
return krb5_fcc_interpret(context, errno);
+#else
+ errno = 0;
+ ret = fread((char *) buf, 1, len, ((krb5_fcc_data *) id->data)->file);
+ if ((ret == 0) && errno)
+ return krb5_fcc_interpret(context, errno);
+#endif
else if (ret != len)
return KRB5_CC_END;
else
@@ -329,6 +390,11 @@ krb5_fcc_read(context, id, buf, len)
* KRB5_CC_NOMEM
*/
+#define ALLOC(NUM,TYPE) \
+ (((NUM) <= (((size_t)0-1)/ sizeof(TYPE))) \
+ ? (TYPE *) malloc((NUM) * sizeof(TYPE)) \
+ : (errno = ENOMEM,(TYPE *) 0))
+
static krb5_error_code
krb5_fcc_read_principal(context, id, princ)
krb5_context context;
@@ -338,7 +404,7 @@ krb5_fcc_read_principal(context, id, princ)
krb5_fcc_data *data = (krb5_fcc_data *)id->data;
krb5_error_code kret;
register krb5_principal tmpprinc;
- krb5_int32 length, type, msize;
+ krb5_int32 length, type;
int i;
if (data->version == KRB5_FCC_FVNO_1) {
@@ -366,16 +432,13 @@ krb5_fcc_read_principal(context, id, princ)
if (tmpprinc == NULL)
return KRB5_CC_NOMEM;
if (length) {
- tmpprinc->data = 0;
- msize = length * sizeof(krb5_data);
- if ((msize & VALID_UINT_BITS) == msize) /* Not overflow size_t */
- tmpprinc->data = (krb5_data *) malloc((size_t) msize);
- if (tmpprinc->data == (krb5_data *) 0) {
- free((char *)tmpprinc);
- return KRB5_CC_NOMEM;
- }
+ tmpprinc->data = ALLOC (length, krb5_data);
+ if (tmpprinc->data == 0) {
+ free((char *)tmpprinc);
+ return KRB5_CC_NOMEM;
+ }
} else
- tmpprinc->data = 0;
+ tmpprinc->data = 0;
tmpprinc->magic = KV5M_PRINCIPAL;
tmpprinc->length = length;
tmpprinc->type = type;
@@ -407,7 +470,8 @@ krb5_fcc_read_addrs(context, id, addrs)
krb5_address ***addrs;
{
krb5_error_code kret;
- krb5_int32 length, msize;
+ krb5_int32 length;
+ size_t msize;
int i;
*addrs = 0;
@@ -419,10 +483,11 @@ krb5_fcc_read_addrs(context, id, addrs)
/* Make *addrs able to hold length pointers to krb5_address structs
* Add one extra for a null-terminated list
*/
- msize = length+1;
- if ((msize & VALID_UINT_BITS) != msize) /* Overflow size_t??? */
- return KRB5_CC_NOMEM;
- *addrs = (krb5_address **) calloc((size_t) msize, sizeof(krb5_address *));
+ msize = length;
+ msize += 1;
+ if (msize == 0 || msize - 1 != length || length < 0)
+ return KRB5_CC_NOMEM;
+ *addrs = ALLOC (msize, krb5_address *);
if (*addrs == NULL)
return KRB5_CC_NOMEM;
@@ -461,6 +526,7 @@ krb5_fcc_read_keyblock(context, id, keyblock)
keyblock->enctype = ui2;
CHECK(kret);
if (data->version == KRB5_FCC_FVNO_3) {
+ /* This works because the old etype is the same as the new enctype. */
kret = krb5_fcc_read_ui_2(context, id, &ui2);
/* keyblock->enctype = ui2; */
CHECK(kret);
@@ -470,11 +536,14 @@ krb5_fcc_read_keyblock(context, id, keyblock)
CHECK(kret);
if ((int32 & VALID_INT_BITS) != int32) /* Overflow size_t??? */
return KRB5_CC_NOMEM;
+#ifndef USE_STDIO
keyblock->length = (int) int32;
+#else
+ keyblock->length = int32;
+#endif
if ( keyblock->length == 0 )
return KRB5_OK;
- keyblock->contents = (unsigned char *) malloc(keyblock->length*
- sizeof(krb5_octet));
+ keyblock->contents = ALLOC (keyblock->length, krb5_octet);
if (keyblock->contents == NULL)
return KRB5_CC_NOMEM;
@@ -512,7 +581,11 @@ krb5_fcc_read_data(context, id, data)
return KRB5_OK;
}
+#ifndef USE_STDIO
data->data = (char *) malloc((unsigned) data->length+1);
+#else
+ data->data = (char *) malloc((unsigned int) data->length+1);
+#endif
if (data->data == NULL)
return KRB5_CC_NOMEM;
@@ -548,7 +621,11 @@ krb5_fcc_read_addr(context, id, addr)
CHECK(kret);
if ((int32 & VALID_INT_BITS) != int32) /* Overflow int??? */
return KRB5_CC_NOMEM;
+#ifndef USE_STDIO
addr->length = (int) int32;
+#else
+ addr->length = int32;
+#endif
if (addr->length == 0)
return KRB5_OK;
@@ -576,7 +653,9 @@ krb5_fcc_read_int32(context, id, i)
krb5_fcc_data *data = (krb5_fcc_data *)id->data;
krb5_error_code retval;
unsigned char buf[4];
+#ifndef USE_STDIO
krb5_int32 val;
+#endif
if ((data->version == KRB5_FCC_FVNO_1) ||
(data->version == KRB5_FCC_FVNO_2))
@@ -585,11 +664,15 @@ krb5_fcc_read_int32(context, id, i)
retval = krb5_fcc_read(context, id, buf, 4);
if (retval)
return retval;
+#ifndef USE_STDIO
val = buf[0];
val = (val << 8) | buf[1];
val = (val << 8) | buf[2];
val = (val << 8) | buf[3];
*i = val;
+#else
+ *i = (((((buf[0] << 8) + buf[1]) << 8 ) + buf[2]) << 8) + buf[3];
+#endif
return 0;
}
}
@@ -668,7 +751,8 @@ krb5_fcc_read_authdata(context, id, a)
krb5_authdata ***a;
{
krb5_error_code kret;
- krb5_int32 length, msize;
+ krb5_int32 length;
+ size_t msize;
int i;
*a = 0;
@@ -683,10 +767,11 @@ krb5_fcc_read_authdata(context, id, a)
/* Make *a able to hold length pointers to krb5_authdata structs
* Add one extra for a null-terminated list
*/
- msize = length+1;
- if ((msize & VALID_UINT_BITS) != msize) /* Overflow size_t??? */
- return KRB5_CC_NOMEM;
- *a = (krb5_authdata **) calloc((size_t) msize, sizeof(krb5_authdata *));
+ msize = length;
+ msize += 1;
+ if (msize == 0 || msize - 1 != length || length < 0)
+ return KRB5_CC_NOMEM;
+ *a = ALLOC (msize, krb5_authdata *);
if (*a == NULL)
return KRB5_CC_NOMEM;
@@ -727,7 +812,11 @@ krb5_fcc_read_authdatum(context, id, a)
CHECK(kret);
if ((int32 & VALID_INT_BITS) != int32) /* Overflow int??? */
return KRB5_CC_NOMEM;
+#ifndef USE_STDIO
a->length = (int) int32;
+#else
+ a->length = int32;
+#endif
if (a->length == 0 )
return KRB5_OK;
@@ -746,7 +835,6 @@ krb5_fcc_read_authdatum(context, id, a)
return kret;
}
-/* end of former file/fcc_read.c */
#undef CHECK
#define CHECK(ret) if (ret != KRB5_OK) return ret;
@@ -769,11 +857,20 @@ krb5_fcc_write(context, id, buf, len)
unsigned int len;
{
int ret;
+#ifndef USE_STDIO
ret = write(((krb5_fcc_data *)id->data)->file, (char *) buf, len);
if (ret < 0)
return krb5_fcc_interpret(context, errno);
if (ret != len)
- return KRB5_CC_WRITE;
+ return KRB5_CC_WRITE;
+#else
+ errno = 0;
+ ret = fwrite((char *) buf, 1, len, ((krb5_fcc_data *)id->data)->file);
+ if ((ret == 0) && errno)
+ return krb5_fcc_interpret(context, errno);
+ else if (ret != len)
+ return KRB5_CC_END;
+#endif
return KRB5_OK;
}
@@ -919,13 +1016,29 @@ krb5_fcc_store_int32(context, id, i)
(data->version == KRB5_FCC_FVNO_2))
return krb5_fcc_write(context, id, (char *) &i, sizeof(krb5_int32));
else {
- buf[3] = (unsigned char) (i & 0xFF);
+#ifndef USE_STDIO
+ buf[3] = (unsigned char) (i & 0xFF);
+#else
+ buf[3] = i & 0xFF;
+#endif
i >>= 8;
- buf[2] = (unsigned char) (i & 0xFF);
+#ifndef USE_STDIO
+ buf[2] = (unsigned char) (i & 0xFF);
+#else
+ buf[2] = i & 0xFF;
+#endif
i >>= 8;
- buf[1] = (unsigned char) (i & 0xFF);
+#ifndef USE_STDIO
+ buf[1] = (unsigned char) (i & 0xFF);
+#else
+ buf[1] = i & 0xFF;
+#endif
i >>= 8;
- buf[0] = (unsigned char) (i & 0xFF);
+#ifndef USE_STDIO
+ buf[0] = (unsigned char) (i & 0xFF);
+#else
+ buf[0] = i & 0xFF;
+#endif
return krb5_fcc_write(context, id, buf, 4);
}
@@ -944,13 +1057,29 @@ krb5_fcc_store_ui_4(context, id, i)
(data->version == KRB5_FCC_FVNO_2))
return krb5_fcc_write(context, id, (char *) &i, sizeof(krb5_int32));
else {
- buf[3] = (unsigned char) (i & 0xFF);
+#ifndef USE_STDIO
+ buf[3] = (unsigned char) (i & 0xFF);
+#else
+ buf[3] = i & 0xFF;
+#endif
i >>= 8;
- buf[2] = (unsigned char) (i & 0xFF);
+#ifndef USE_STDIO
+ buf[2] = (unsigned char) (i & 0xFF);
+#else
+ buf[2] = i & 0xFF;
+#endif
i >>= 8;
- buf[1] = (unsigned char) (i & 0xFF);
+#ifndef USE_STDIO
+ buf[1] = (unsigned char) (i & 0xFF);
+#else
+ buf[1] = i & 0xFF;
+#endif
i >>= 8;
- buf[0] = (unsigned char) (i & 0xFF);
+#ifndef USE_STDIO
+ buf[0] = (unsigned char) (i & 0xFF);
+#else
+ buf[0] = i & 0xFF;
+#endif
return krb5_fcc_write(context, id, buf, 4);
}
@@ -968,12 +1097,24 @@ krb5_fcc_store_ui_2(context, id, i)
if ((data->version == KRB5_FCC_FVNO_1) ||
(data->version == KRB5_FCC_FVNO_2)) {
- ibuf = (krb5_ui_2) i;
+#ifndef USE_STDIO
+ ibuf = (krb5_ui_2) i;
+#else
+ ibuf = i;
+#endif
return krb5_fcc_write(context, id, (char *) &ibuf, sizeof(krb5_ui_2));
} else {
- buf[1] = (unsigned char) (i & 0xFF);
+#ifndef USE_STDIO
+ buf[1] = (unsigned char) (i & 0xFF);
+#else
+ buf[1] = i & 0xFF;
+#endif
i >>= 8;
- buf[0] = (unsigned char) (i & 0xFF);
+#ifndef USE_STDIO
+ buf[0] = (unsigned char) (i & 0xFF);
+#else
+ buf[0] = i & 0xFF;
+#endif
return krb5_fcc_write(context, id, buf, 2);
}
@@ -987,7 +1128,11 @@ krb5_fcc_store_octet(context, id, i)
{
krb5_octet ibuf;
+#ifndef USE_STDIO
ibuf = (krb5_octet) i;
+#else
+ ibuf = i;
+#endif
return krb5_fcc_write(context, id, (char *) &ibuf, 1);
}
@@ -1055,6 +1200,48 @@ krb5_fcc_store_authdatum (context, id, a)
}
#undef CHECK
+#ifdef USE_STDIO
+static FILE *my_fopen(char *path, char *mode)
+{
+#ifdef macintosh
+/*
+ * Kludge for the Macintosh, since fopen doesn't set errno, but open
+ * does...
+ */
+ int fd, open_flags;
+ FILE *f;
+
+ f = fopen(path, mode);
+ if (f)
+ return f;
+ /*
+ * OK, fopen failed; let's try to figure out why....
+ */
+ if (strchr(mode, '+'))
+ open_flags = O_RDWR;
+ else if (strchr(mode, 'w') || strchr(mode, 'a'))
+ open_flags = O_WRONLY;
+ else
+ open_flags = O_RDONLY;
+ if (strchr(mode, 'a'))
+ open_flags |= O_APPEND;
+
+ fd = open(path, open_flags);
+ if (fd == -1)
+ return NULL;
+ /*
+ * fopen failed, but open succeeded? W*E*I*R*D.....
+ */
+ close(fd);
+ errno = KRB5_CC_IO;
+
+ return NULL;
+#else
+ return fopen(path, mode);
+#endif
+}
+#endif
+
static krb5_error_code
krb5_fcc_close_file (context, id)
krb5_context context;
@@ -1064,18 +1251,52 @@ krb5_fcc_close_file (context, id)
krb5_fcc_data *data = (krb5_fcc_data *)id->data;
krb5_error_code retval;
+#ifndef USE_STDIO
if (data->file == -1)
return KRB5_FCC_INTERNAL;
retval = krb5_unlock_file(context, data->file);
ret = close (data->file);
data->file = -1;
+#else
+ if (data->file == (FILE *) NULL)
+ return KRB5_FCC_INTERNAL;
+
+ /* Calling fflush on a read-only file is undefined. */
+ if (data->mode != FCC_OPEN_RDONLY)
+ ret = fflush (data->file);
+ else
+ ret = 0;
+ memset (data->stdio_buffer, 0, sizeof (data->stdio_buffer));
+ if (ret == EOF) {
+ int errsave = errno;
+ (void) krb5_unlock_file(context, fileno(data->file));
+ (void) fclose (data->file);
+ data->file = 0;
+ return krb5_fcc_interpret (context, errsave);
+ }
+ retval = krb5_unlock_file(context, fileno(data->file));
+ ret = fclose (data->file);
+ data->file = 0;
+#endif
if (retval)
return retval;
- else
+
+#ifndef USE_STDIO
return (ret == -1) ? krb5_fcc_interpret (context, errno) : 0;
+#else
+ return ret ? krb5_fcc_interpret (context, errno) : 0;
+#endif
}
+#ifdef USE_STDIO
+#if defined(ANSI_STDIO) || defined(_WIN32)
+#define BINARY_MODE "b"
+#else
+#define BINARY_MODE ""
+#endif
+#endif
+
static krb5_error_code
krb5_fcc_open_file (context, id, mode)
krb5_context context;
@@ -1084,67 +1305,128 @@ krb5_fcc_open_file (context, id, mode)
{
krb5_os_context os_ctx = (krb5_os_context)context->os_context;
krb5_fcc_data *data = (krb5_fcc_data *)id->data;
+#ifndef USE_STDIO
krb5_ui_2 fcc_fvno;
+#else
+ char fvno_bytes[2]; /* In nework byte order */
+#endif
krb5_ui_2 fcc_flen;
krb5_ui_2 fcc_tag;
krb5_ui_2 fcc_taglen;
+#ifndef USE_STDIO
int fd, open_flag;
+#else
+ FILE *f;
+ char *open_flag;
+#endif
int lock_flag;
krb5_error_code retval = 0;
+#ifndef USE_STDIO
if (data->file != -1) {
/* Don't know what state it's in; shut down and start anew. */
- (void) krb5_unlock_file(context, data->file);
- (void) close (data->file);
- data->file = -1;
+ (void) krb5_unlock_file(context, data->file);
+ (void) close (data->file);
+ data->file = -1;
+ }
+#else
+ if (data->file) {
+ /* Don't know what state it's in; shut down and start anew. */
+ (void) krb5_unlock_file(context, fileno(data->file));
+ (void) fclose (data->file);
+ data->file = 0;
}
- data->mode = mode;
+#endif
+
switch(mode) {
case FCC_OPEN_AND_ERASE:
unlink(data->filename);
- open_flag = O_CREAT|O_EXCL|O_TRUNC|O_RDWR;
+#ifndef USE_STDIO
+ open_flag = O_CREAT|O_EXCL|O_TRUNC|O_RDWR;
+#else
+ /* XXX should do an exclusive open here, but no way to do */
+ /* this under stdio */
+ open_flag = "w" BINARY_MODE "+";
+#endif
break;
case FCC_OPEN_RDWR:
- open_flag = O_RDWR;
+#ifndef USE_STDIO
+ open_flag = O_RDWR;
+#else
+ open_flag = "r" BINARY_MODE "+";
+#endif
break;
case FCC_OPEN_RDONLY:
default:
- open_flag = O_RDONLY;
+#ifndef USE_STDIO
+ open_flag = O_RDONLY;
+#else
+ open_flag = "r" BINARY_MODE;
+#endif
break;
}
+#ifndef USE_STDIO
fd = THREEPARAMOPEN (data->filename, open_flag | O_BINARY, 0600);
if (fd == -1)
return krb5_fcc_interpret (context, errno);
+#else
+ f = my_fopen (data->filename, open_flag);
+ if (!f)
+ return krb5_fcc_interpret (context, errno);
+#endif
+
+ data->mode = mode;
+#ifdef USE_STDIO
+#ifdef HAVE_SETVBUF
+ setvbuf(f, data->stdio_buffer, _IOFBF, sizeof (data->stdio_buffer));
+#else
+ setbuf (f, data->stdio_buffer);
+#endif
+#endif
if (data->mode == FCC_OPEN_RDONLY)
lock_flag = KRB5_LOCKMODE_SHARED;
else
lock_flag = KRB5_LOCKMODE_EXCLUSIVE;
-
+#ifndef USE_STDIO
if ((retval = krb5_lock_file(context, fd, lock_flag))) {
- (void) close(fd);
+ (void) close(fd);
return retval;
}
-
+#else
+ if ((retval = krb5_lock_file(context,fileno(f), lock_flag))){
+ (void) fclose(f);
+ return retval;
+ }
+#endif
+
if (mode == FCC_OPEN_AND_ERASE) {
/* write the version number */
- int cnt;
-
- fcc_fvno = htons(context->fcc_default_format);
- data->version = context->fcc_default_format;
- if ((cnt = write(fd, (char *)&fcc_fvno, sizeof(fcc_fvno))) !=
- sizeof(fcc_fvno)) {
- retval = ((cnt == -1) ? krb5_fcc_interpret(context, errno) :
- KRB5_CC_IO);
- goto done;
- }
+#ifndef USE_STDIO
+ int cnt;
+
+ fcc_fvno = htons(context->fcc_default_format);
+ data->version = context->fcc_default_format;
+ if ((cnt = write(fd, (char *)&fcc_fvno, sizeof(fcc_fvno))) !=
+ sizeof(fcc_fvno)) {
+ retval = ((cnt == -1) ? krb5_fcc_interpret(context, errno) :
+ KRB5_CC_IO);
+ goto done;
+ }
+#endif
- data->file = fd;
+#ifndef USE_STDIO
+ data->file = fd;
+#else
+ data->file = f;
+ data->version = context->scc_default_format;
+ retval = krb5_fcc_store_ui_2(context, id, data->version);
+ if (retval) goto done;
+#endif
if (data->version == KRB5_FCC_FVNO_4) {
- /* V4 of the credentials cache format allows for header tags */
-
+ /* V4 of the credentials cache format allows for header tags */
fcc_flen = 0;
if (os_ctx->os_flags & KRB5_OS_TOFFSET_VALID)
@@ -1173,22 +1455,31 @@ krb5_fcc_open_file (context, id, mode)
}
/* verify a valid version number is there */
- if (read(fd, (char *)&fcc_fvno, sizeof(fcc_fvno)) !=
- sizeof(fcc_fvno)) {
+#ifndef USE_STDIO
+ if (read(fd, (char *)&fcc_fvno, sizeof(fcc_fvno)) != sizeof(fcc_fvno)) {
retval = KRB5_CC_FORMAT;
goto done;
}
- data->version = ntohs(fcc_fvno);
- if ((data->version != KRB5_FCC_FVNO_4) &&
- (data->version != KRB5_FCC_FVNO_3) &&
- (data->version != KRB5_FCC_FVNO_2) &&
- (data->version != KRB5_FCC_FVNO_1))
- {
- retval = KRB5_CCACHE_BADVNO;
+#else
+ if (!fread((char *)fvno_bytes, sizeof(fvno_bytes), 1, f)) {
+ retval = KRB5_CC_FORMAT;
goto done;
}
+#endif
+ data->version = (fvno_bytes[0] << 8) + fvno_bytes[1];
+ if ((data->version != KRB5_FCC_FVNO_4) &&
+ (data->version != KRB5_FCC_FVNO_3) &&
+ (data->version != KRB5_FCC_FVNO_2) &&
+ (data->version != KRB5_FCC_FVNO_1)) {
+ retval = KRB5_CCACHE_BADVNO;
+ goto done;
+ }
- data->file = fd;
+#ifndef USE_STDIO
+ data->file = fd;
+#else
+ data->file = f;
+#endif
if (data->version == KRB5_FCC_FVNO_4) {
char buf[1024];
@@ -1248,9 +1539,17 @@ krb5_fcc_open_file (context, id, mode)
done:
if (retval) {
- data->file = -1;
- (void) krb5_unlock_file(context, fd);
- (void) close(fd);
+#ifndef USE_STDIO
+ data->file = -1;
+ (void) krb5_unlock_file(context, fd);
+ (void) close(fd);
+#else
+ if (f) {
+ data->file = 0;
+ (void) krb5_unlock_file(context, fileno(f));
+ (void) fclose(f);
+ }
+#endif
}
return retval;
}
@@ -1264,12 +1563,22 @@ krb5_fcc_skip_header(context, id)
krb5_error_code kret;
krb5_ui_2 fcc_flen;
+#ifndef USE_STDIO
lseek(data->file, (off_t) sizeof(krb5_ui_2), SEEK_SET);
+#else
+ if (fseek(data->file, sizeof(krb5_ui_2), SEEK_SET))
+ return errno;
+#endif
if (data->version == KRB5_FCC_FVNO_4) {
kret = krb5_fcc_read_ui_2(context, id, &fcc_flen);
if (kret) return kret;
- if(lseek(data->file, (off_t) fcc_flen, SEEK_CUR) < 0)
+#ifndef USE_STDIO
+ if(lseek(data->file, (off_t) fcc_flen, SEEK_CUR) < 0)
+ return errno;
+#else
+ if (fseek(data->file, fcc_flen, SEEK_CUR))
return errno;
+#endif
}
return KRB5_OK;
}
@@ -1310,24 +1619,34 @@ krb5_fcc_initialize(context, id, princ)
krb5_principal princ;
{
krb5_error_code kret = 0;
+#ifndef USE_STDIO
int reti = 0;
+#endif
+#ifndef USE_STDIO
MAYBE_OPEN(context, id, FCC_OPEN_AND_ERASE);
+#else
+ kret = krb5_fcc_open_file (context, id, FCC_OPEN_AND_ERASE);
+ if (kret < 0)
+ return krb5_fcc_interpret(context, errno);
+#endif
+#ifndef USE_STDIO
#if defined(HAVE_FCHMOD) || defined(HAVE_CHMOD)
{
#ifdef HAVE_FCHMOD
- reti = fchmod(((krb5_fcc_data *) id->data)->file, S_IREAD | S_IWRITE);
+ reti = fchmod(((krb5_fcc_data *) id->data)->file, S_IREAD | S_IWRITE);
#else
- reti = chmod(((krb5_fcc_data *) id->data)->filename, S_IREAD | S_IWRITE);
+ reti = chmod(((krb5_fcc_data *) id->data)->filename, S_IREAD | S_IWRITE);
#endif
- if (reti == -1) {
- kret = krb5_fcc_interpret(context, errno);
- MAYBE_CLOSE(context, id, kret);
- return kret;
- }
+ if (reti == -1) {
+ kret = krb5_fcc_interpret(context, errno);
+ MAYBE_CLOSE(context, id, kret);
+ return kret;
+ }
}
#endif
+#endif
kret = krb5_fcc_store_principal(context, id, princ);
MAYBE_CLOSE(context, id, kret);
@@ -1352,9 +1671,20 @@ krb5_fcc_close(context, id)
register int closeval = KRB5_OK;
register krb5_fcc_data *data = (krb5_fcc_data *) id->data;
+#ifndef USE_STDIO
if (data->file >= 0)
- krb5_fcc_close_file(context, id);
+ krb5_fcc_close_file(context, id);
+#else
+ if (!OPENCLOSE(id)) {
+ closeval = fclose (data->file);
+ data->file = 0;
+ if (closeval == -1) {
+ closeval = krb5_fcc_interpret(context, errno);
+ } else
+ closeval = KRB5_OK;
+ }
+#endif
krb5_xfree(data->filename);
krb5_xfree(data);
krb5_xfree(id);
@@ -1362,6 +1692,12 @@ krb5_fcc_close(context, id)
return closeval;
}
+#ifdef USE_STDIO
+#ifndef SEEK_SET
+#define SEEK_SET 0
+#endif
+#endif
+
/*
* Effects:
* Destroys the contents of id.
@@ -1374,6 +1710,7 @@ krb5_fcc_destroy(context, id)
krb5_context context;
krb5_ccache id;
{
+#ifndef USE_STDIO
struct stat buf;
unsigned long i, size;
unsigned int wlen;
@@ -1491,6 +1828,42 @@ krb5_fcc_destroy(context, id)
krb5_change_cache ();
return kret;
+#else
+ krb5_fcc_data *data = (krb5_fcc_data *) id->data;
+ register int ret;
+
+ if (!OPENCLOSE(id)) {
+ (void) fclose(data->file);
+ data->file = 0;
+ }
+
+ ret = remove (data->filename);
+ if (ret < 0) {
+ ret = krb5_fcc_interpret(context, errno);
+ if (OPENCLOSE(id)) {
+ (void) fclose(data->file);
+ data->file = 0;
+ }
+ goto cleanup;
+ }
+
+ /*
+ * Possible future extension: Read entire file to determine
+ * length, then write nulls all over it. This was the UNIX
+ * version...
+ */
+
+ if (ret)
+ ret = krb5_fcc_interpret(context, errno);
+
+ cleanup:
+ krb5_xfree(data->filename);
+ krb5_xfree(data);
+ krb5_xfree(id);
+
+ krb5_change_cache ();
+ return ret;
+#endif
}
extern krb5_cc_ops krb5_fcc_ops;
@@ -1527,7 +1900,7 @@ krb5_fcc_resolve (context, id, residual)
return KRB5_CC_NOMEM;
lid->ops = &krb5_fcc_ops;
-
+
lid->data = (krb5_pointer) malloc(sizeof(krb5_fcc_data));
if (lid->data == NULL) {
krb5_xfree(lid);
@@ -1545,7 +1918,11 @@ krb5_fcc_resolve (context, id, residual)
/* default to open/close on every trn */
((krb5_fcc_data *) lid->data)->flags = KRB5_TC_OPENCLOSE;
+#ifndef USE_STDIO
((krb5_fcc_data *) lid->data)->file = -1;
+#else
+ ((krb5_fcc_data *) lid->data)->file = 0;
+#endif
/* Set up the filename */
strcpy(((krb5_fcc_data *) lid->data)->filename, residual);
@@ -1580,25 +1957,35 @@ krb5_fcc_start_seq_get(context, id, cursor)
krb5_fcc_cursor *fcursor;
krb5_error_code kret = KRB5_OK;
krb5_fcc_data *data = (krb5_fcc_data *)id->data;
-
+
fcursor = (krb5_fcc_cursor *) malloc(sizeof(krb5_fcc_cursor));
if (fcursor == NULL)
return KRB5_CC_NOMEM;
+#ifndef USE_STDIO
if (OPENCLOSE(id)) {
- kret = krb5_fcc_open_file(context, id, FCC_OPEN_RDONLY);
- if (kret) {
- krb5_xfree(fcursor);
- return kret;
- }
+ kret = krb5_fcc_open_file(context, id, FCC_OPEN_RDONLY);
+ if (kret) {
+ krb5_xfree(fcursor);
+ return kret;
+ }
}
+#endif
/* Make sure we start reading right after the primary principal */
+#ifdef USE_STDIO
+ MAYBE_OPEN (context, id, FCC_OPEN_RDONLY);
+
+#endif
kret = krb5_fcc_skip_header(context, id);
if (kret) goto done;
kret = krb5_fcc_skip_principal(context, id);
if (kret) goto done;
+#ifndef USE_STDIO
fcursor->pos = lseek(data->file, (off_t) 0, SEEK_CUR);
+#else
+ fcursor->pos = ftell(data->file);
+#endif
*cursor = (krb5_cc_cursor) fcursor;
done:
@@ -1606,6 +1993,7 @@ done:
return kret;
}
+
/*
* Requires:
* cursor is a krb5_cc_cursor originally obtained from
@@ -1634,23 +2022,47 @@ krb5_fcc_next_cred(context, id, cursor, creds)
krb5_creds *creds;
{
#define TCHECK(ret) if (ret != KRB5_OK) goto lose;
+#ifdef USE_STDIO
+ int ret;
+#endif
krb5_error_code kret;
krb5_fcc_cursor *fcursor;
krb5_int32 int32;
krb5_octet octet;
+#ifndef USE_STDIO
memset((char *)creds, 0, sizeof(*creds));
+#else
+#define Z(field) creds->field = 0
+ Z (client);
+ Z (server);
+ Z (keyblock.contents);
+ Z (authdata);
+ Z (ticket.data);
+ Z (second_ticket.data);
+ Z (addresses);
+#undef Z
+#endif
MAYBE_OPEN(context, id, FCC_OPEN_RDONLY);
fcursor = (krb5_fcc_cursor *) *cursor;
+#ifndef USE_STDIO
kret = lseek(((krb5_fcc_data *) id->data)->file, fcursor->pos, SEEK_SET);
if (kret < 0) {
kret = krb5_fcc_interpret(context, errno);
MAYBE_CLOSE(context, id, kret);
return kret;
}
+#else
+ ret = fseek(((krb5_fcc_data *) id->data)->file, fcursor->pos, 0);
+ if (ret < 0) {
+ kret = krb5_fcc_interpret(context, errno);
+ MAYBE_CLOSE(context, id, kret);
+ return kret;
+ }
+#endif
kret = krb5_fcc_read_principal(context, id, &creds->client);
TCHECK(kret);
@@ -1675,15 +2087,24 @@ krb5_fcc_next_cred(context, id, cursor, creds)
kret = krb5_fcc_read_data(context, id, &creds->second_ticket);
TCHECK(kret);
+#ifndef USE_STDIO
fcursor->pos = lseek(((krb5_fcc_data *) id->data)->file, (off_t) 0,
- SEEK_CUR);
+ SEEK_CUR);
+#else
+ fcursor->pos = ftell(((krb5_fcc_data *) id->data)->file);
+#endif
cursor = (krb5_cc_cursor *) fcursor;
lose:
- MAYBE_CLOSE(context, id, kret); /* won't overwrite kret
- if already set */
+#ifndef USE_STDIO
+ MAYBE_CLOSE(context, id, kret); /* won't overwrite kret
+ if already set */
+#endif
if (kret != KRB5_OK)
krb5_free_cred_contents(context, creds);
+#ifdef USE_STDIO
+ MAYBE_CLOSE (context, id, kret);
+#endif
return kret;
}
@@ -1707,14 +2128,15 @@ krb5_fcc_end_seq_get(context, id, cursor)
krb5_cc_cursor *cursor;
{
/* don't close; it may be left open by the caller,
- and if not, fcc_start_seq_get and/or fcc_next_cred will do the
- MAYBE_CLOSE.
+ and if not, fcc_start_seq_get and/or fcc_next_cred will do the
+ MAYBE_CLOSE.
MAYBE_CLOSE(context, id, kret); */
krb5_xfree((krb5_fcc_cursor *) *cursor);
return 0;
}
+
/*
* Effects:
* Creates a new file cred cache whose name is guaranteed to be
@@ -1735,7 +2157,11 @@ krb5_fcc_generate_new (context, id)
krb5_ccache *id;
{
krb5_ccache lid;
+#ifndef USE_STDIO
int ret;
+#else
+ FILE *f;
+#endif
krb5_error_code retcode = 0;
char scratch[sizeof(TKT_ROOT)+6+1]; /* +6 for the scratch part, +1 for
NUL */
@@ -1757,11 +2183,6 @@ krb5_fcc_generate_new (context, id)
return KRB5_CC_NOMEM;
}
- /*
- * The file is initially closed at the end of this call...
- */
- ((krb5_fcc_data *) lid->data)->file = -1;
-
((krb5_fcc_data *) lid->data)->filename = (char *)
malloc(strlen(scratch) + 1);
if (((krb5_fcc_data *) lid->data)->filename == NULL) {
@@ -1770,64 +2191,114 @@ krb5_fcc_generate_new (context, id)
return KRB5_CC_NOMEM;
}
+#ifndef USE_STDIO
+ /*
+ * The file is initially closed at the end of this call...
+ */
((krb5_fcc_data *) lid->data)->flags = 0;
+ ((krb5_fcc_data *) lid->data)->file = -1;
+#else
+ /* default to open/close on every trn - otherwise cc_destroy
+ gets confused as to state
+ */
+ ((krb5_fcc_data *) lid->data)->flags = KRB5_TC_OPENCLOSE;
+ ((krb5_fcc_data *) lid->data)->file = 0;
+#endif
/* Set up the filename */
strcpy(((krb5_fcc_data *) lid->data)->filename, scratch);
+#ifndef USE_STDIO
/* Make sure the file name is reserved */
ret = THREEPARAMOPEN(((krb5_fcc_data *) lid->data)->filename,
- O_CREAT | O_EXCL | O_WRONLY | O_BINARY, 0);
+ O_CREAT | O_EXCL | O_WRONLY | O_BINARY, 0);
if (ret == -1) {
retcode = krb5_fcc_interpret(context, errno);
goto err_out;
} else {
- krb5_int16 fcc_fvno = htons(context->fcc_default_format);
- krb5_int16 fcc_flen = 0;
- int errsave, cnt;
+ krb5_int16 fcc_fvno = htons(context->fcc_default_format);
+ krb5_int16 fcc_flen = 0;
+ int errsave, cnt;
- /* Ignore user's umask, set mode = 0600 */
+ /* Ignore user's umask, set mode = 0600 */
#ifndef HAVE_FCHMOD
#ifdef HAVE_CHMOD
- chmod(((krb5_fcc_data *) lid->data)->filename, S_IRUSR | S_IWUSR);
+ chmod(((krb5_fcc_data *) lid->data)->filename, S_IRUSR | S_IWUSR);
#endif
#else
- fchmod(ret, S_IRUSR | S_IWUSR);
-#endif
- if ((cnt = write(ret, (char *)&fcc_fvno, sizeof(fcc_fvno)))
- != sizeof(fcc_fvno)) {
- errsave = errno;
- (void) close(ret);
- (void) unlink(((krb5_fcc_data *) lid->data)->filename);
- retcode = (cnt == -1) ? krb5_fcc_interpret(context, errsave) : KRB5_CC_IO;
+ fchmod(ret, S_IRUSR | S_IWUSR);
+#endif
+ if ((cnt = write(ret, (char *)&fcc_fvno, sizeof(fcc_fvno)))
+ != sizeof(fcc_fvno)) {
+ errsave = errno;
+ (void) close(ret);
+ (void) unlink(((krb5_fcc_data *) lid->data)->filename);
+ retcode = (cnt == -1) ? krb5_fcc_interpret(context, errsave) : KRB5_CC_IO;
goto err_out;
}
/* For version 4 we save a length for the rest of the header */
- if (context->fcc_default_format == KRB5_FCC_FVNO_4) {
- if ((cnt = write(ret, (char *)&fcc_flen, sizeof(fcc_flen)))
- != sizeof(fcc_flen)) {
- errsave = errno;
- (void) close(ret);
- (void) unlink(((krb5_fcc_data *) lid->data)->filename);
- retcode = (cnt == -1) ? krb5_fcc_interpret(context, errsave) : KRB5_CC_IO;
+ if (context->fcc_default_format == KRB5_FCC_FVNO_4) {
+ if ((cnt = write(ret, (char *)&fcc_flen, sizeof(fcc_flen)))
+ != sizeof(fcc_flen)) {
+ errsave = errno;
+ (void) close(ret);
+ (void) unlink(((krb5_fcc_data *) lid->data)->filename);
+ retcode = (cnt == -1) ? krb5_fcc_interpret(context, errsave) : KRB5_CC_IO;
goto err_out;
}
}
- if (close(ret) == -1) {
- errsave = errno;
- (void) unlink(((krb5_fcc_data *) lid->data)->filename);
- retcode = krb5_fcc_interpret(context, errsave);
+ if (close(ret) == -1) {
+ errsave = errno;
+ (void) unlink(((krb5_fcc_data *) lid->data)->filename);
+ retcode = krb5_fcc_interpret(context, errsave);
goto err_out;
}
-
*id = lid;
+ /* default to open/close on every trn - otherwise destroy
+ will get as to state confused */
+ ((krb5_fcc_data *) lid->data)->flags = KRB5_TC_OPENCLOSE;
+ krb5_change_cache ();
+ return KRB5_OK;
+ }
+#else
+ /* Make sure the file name is useable */
+ f = fopen (((krb5_fcc_data *) lid->data)->filename, "w" BINARY_MODE "+");
+ if (!f) {
+ retcode = krb5_fcc_interpret(context, errno);
+ goto err_out;
+ } else {
+ unsigned char fcc_fvno[2];
- /* default to open/close on every trn - otherwise destroy
- will get as to state confused */
- ((krb5_fcc_data *) lid->data)->flags = KRB5_TC_OPENCLOSE;
- krb5_change_cache ();
+ fcc_fvno[0] = (unsigned char) ((context->scc_default_format >> 8) & 0xFF);
+ fcc_fvno[1] = (unsigned char) (context->scc_default_format & 0xFF);
+
+ if (!fwrite((char *)fcc_fvno, sizeof(fcc_fvno), 1, f)) {
+ retcode = krb5_fcc_interpret(context, errno);
+ (void) fclose(f);
+ (void) remove(((krb5_fcc_data *) lid->data)->filename);
+ goto err_out;
+ }
+ /* For version 4 we save a length for the rest of the header */
+ if (context->scc_default_format == KRB5_FCC_FVNO_4) {
+ unsigned char fcc_flen[2];
+ fcc_flen[0] = 0;
+ fcc_flen[1] = 0;
+ if (!fwrite((char *)fcc_flen, sizeof(fcc_flen), 1, f)) {
+ retcode = krb5_fcc_interpret(context, errno);
+ (void) fclose(f);
+ (void) remove(((krb5_fcc_data *) lid->data)->filename);
+ goto err_out;
+ }
+ }
+ if (fclose(f) == EOF) {
+ retcode = krb5_fcc_interpret(context, errno);
+ (void) remove(((krb5_fcc_data *) lid->data)->filename);
+ goto err_out;
+ }
+ *id = lid;
return KRB5_OK;
}
+#endif
err_out:
krb5_xfree(((krb5_fcc_data *) lid->data)->filename);
@@ -1918,12 +2389,19 @@ krb5_fcc_store(context, id, creds)
#define TCHECK(ret) if (ret != KRB5_OK) goto lose;
krb5_error_code ret;
+ /* Make sure we are writing to the end of the file */
MAYBE_OPEN(context, id, FCC_OPEN_RDWR);
+#ifndef USE_STDIO
/* Make sure we are writing to the end of the file */
ret = lseek(((krb5_fcc_data *) id->data)->file, (off_t) 0, SEEK_END);
+#else
+ ret = fseek(((krb5_fcc_data *) id->data)->file, 0, 2);
+#endif
if (ret < 0) {
- MAYBE_CLOSE_IGNORE(context, id);
+#ifndef USE_STDIO
+ MAYBE_CLOSE_IGNORE(context, id);
+#endif
return krb5_fcc_interpret(context, errno);
}
@@ -1973,19 +2451,31 @@ krb5_fcc_set_flags(context, id, flags)
krb5_ccache id;
krb5_flags flags;
{
+ krb5_error_code ret = KRB5_OK;
+
/* XXX This should check for illegal combinations, if any.. */
if (flags & KRB5_TC_OPENCLOSE) {
/* asking to turn on OPENCLOSE mode */
if (!OPENCLOSE(id))
- (void) krb5_fcc_close_file (context, id);
+#ifndef USE_STDIO
+ (void) krb5_fcc_close_file (context, id);
+#else
+ ret = krb5_fcc_close_file (context, id);
+#endif
} else {
/* asking to turn off OPENCLOSE mode, meaning it must be
left open. We open if it's not yet open */
- MAYBE_OPEN(context, id, FCC_OPEN_RDONLY);
+#ifndef USE_STDIO
+ MAYBE_OPEN(context, id, FCC_OPEN_RDONLY);
+#else
+ if (OPENCLOSE(id)) {
+ ret = krb5_fcc_open_file (context, id, FCC_OPEN_RDWR);
+ }
+#endif
}
((krb5_fcc_data *) id->data)->flags = flags;
- return KRB5_OK;
+ return ret;
}
@@ -2001,10 +2491,12 @@ krb5_fcc_interpret(context, errnum)
break;
case EPERM:
case EACCES:
- case EISDIR:
+#ifdef EISDIR
+ case EISDIR: /* Mac doesn't have EISDIR */
+#endif
case ENOTDIR:
#ifdef ELOOP
- case ELOOP: /* XXX */
+ case ELOOP: /* Bad symlink is like no file. */
#endif
#ifdef ETXTBSY
case ETXTBSY:
@@ -2038,7 +2530,6 @@ krb5_fcc_interpret(context, errnum)
}
return retval;
}
-#define NEED_WINDOWS
krb5_cc_ops krb5_fcc_ops = {
0,
diff --git a/src/lib/krb5/ccache/cc_stdio.c b/src/lib/krb5/ccache/cc_stdio.c
deleted file mode 100644
index 3553171..0000000
--- a/src/lib/krb5/ccache/cc_stdio.c
+++ /dev/null
@@ -1,1995 +0,0 @@
-/*
- * lib/krb5/ccache/cc_stdio.c
- *
- * Copyright 1990,1991,2000 by the Massachusetts Institute of Technology.
- * All Rights Reserved.
- *
- * Copyright 1995 by Cygnus Support.
- *
- * Export of this software from the United States of America may
- * require a specific license from the United States Government.
- * It is the responsibility of any person or organization contemplating
- * export to obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission. Furthermore if you modify this software you must label
- * your software as modified software and not distribute it in such a
- * fashion that it might be confused with the original M.I.T. software.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose. It is provided "as is" without express
- * or implied warranty.
- *
- *
- * implementation of file-based credentials cache, using stdio
- */
-/*
-If OPENCLOSE is defined, ecah of the functions opens and closes the
-file whenever it needs to access it. Otherwise, the file is opened
-once in initialize and closed once is close.
-
-This library depends on ANSI C library routines for file handling. It
-may also have some implicit assumptions about UNIX, but we'll get
-those out as much as possible.
-
-If you are running a UNIX system, you probably want to use the
-UNIX-based "file" cache package instead of this.
-
-The quasi-BNF grammar for a credentials cache:
-
-file ::=
- format-vno principal list-of-credentials
-
-credential ::=
- client (principal)
- server (principal)
- keyblock (keyblock)
- times (ticket_times)
- is_skey (boolean)
- ticket_flags (flags)
- ticket (data)
- second_ticket (data)
-
-principal ::=
- number of components (int32)
- component 1 (data)
- component 2 (data)
- ...
-
-data ::=
- length (int32)
- string of length bytes
-
-format-vno ::= <int16>
-
-etc.
- */
-/*todo:
-Make sure that each time a function returns KRB5_NOMEM, everything
-allocated earlier in the function and stack tree is freed.
-
-Overwrite cache file with nulls before removing it.
-
-Check return values and sanity-check parameters more thoroughly. This
-code was derived from UNIX file I/O code, and the conversion of
-error-trapping may be incomplete. Probably lots of bugs dealing with
-end-of-file versus other errors.
- */
-#include "k5-int.h"
-
-static krb5_error_code KRB5_CALLCONV krb5_fcc_close
- (krb5_context, krb5_ccache id);
-
-static krb5_error_code KRB5_CALLCONV krb5_fcc_destroy
- (krb5_context, krb5_ccache id);
-
-static krb5_error_code KRB5_CALLCONV krb5_fcc_end_seq_get
- (krb5_context, krb5_ccache id, krb5_cc_cursor *cursor);
-
-static krb5_error_code KRB5_CALLCONV krb5_fcc_generate_new
- (krb5_context, krb5_ccache *id);
-
-static const char * KRB5_CALLCONV krb5_fcc_get_name
- (krb5_context, krb5_ccache id);
-
-static krb5_error_code KRB5_CALLCONV krb5_fcc_get_principal
- (krb5_context, krb5_ccache id, krb5_principal *princ);
-
-static krb5_error_code KRB5_CALLCONV krb5_fcc_initialize
- (krb5_context, krb5_ccache id, krb5_principal princ);
-
-static krb5_error_code KRB5_CALLCONV krb5_fcc_next_cred
- (krb5_context, krb5_ccache id, krb5_cc_cursor *cursor,
- krb5_creds *creds);
-
-static krb5_error_code krb5_fcc_read
- (krb5_context, krb5_ccache id, krb5_pointer buf, unsigned int len);
-static krb5_error_code krb5_fcc_read_principal
- (krb5_context, krb5_ccache id, krb5_principal *princ);
-static krb5_error_code krb5_fcc_read_keyblock
- (krb5_context, krb5_ccache id, krb5_keyblock *keyblock);
-static krb5_error_code krb5_fcc_read_data
- (krb5_context, krb5_ccache id, krb5_data *data);
-static krb5_error_code krb5_fcc_read_int32
- (krb5_context, krb5_ccache id, krb5_int32 *i);
-static krb5_error_code krb5_fcc_read_ui_2
- (krb5_context, krb5_ccache id, krb5_ui_2 *i);
-static krb5_error_code krb5_fcc_read_octet
- (krb5_context, krb5_ccache id, krb5_octet *i);
-static krb5_error_code krb5_fcc_read_times
- (krb5_context, krb5_ccache id, krb5_ticket_times *t);
-static krb5_error_code krb5_fcc_read_addrs
- (krb5_context, krb5_ccache, krb5_address ***);
-static krb5_error_code krb5_fcc_read_addr
- (krb5_context, krb5_ccache, krb5_address *);
-static krb5_error_code krb5_fcc_read_authdata
- (krb5_context, krb5_ccache, krb5_authdata***);
-static krb5_error_code krb5_fcc_read_authdatum
- (krb5_context, krb5_ccache, krb5_authdata*);
-
-static krb5_error_code KRB5_CALLCONV krb5_fcc_resolve
- (krb5_context, krb5_ccache *id, const char *residual);
-
-static krb5_error_code KRB5_CALLCONV krb5_fcc_retrieve
- (krb5_context, krb5_ccache id, krb5_flags whichfields,
- krb5_creds *mcreds, krb5_creds *creds);
-
-static krb5_error_code KRB5_CALLCONV krb5_fcc_start_seq_get
- (krb5_context, krb5_ccache id, krb5_cc_cursor *cursor);
-
-static krb5_error_code KRB5_CALLCONV krb5_fcc_store
- (krb5_context, krb5_ccache id, krb5_creds *creds);
-
-static krb5_error_code krb5_fcc_skip_header
- (krb5_context, krb5_ccache);
-static krb5_error_code krb5_fcc_skip_principal
- (krb5_context, krb5_ccache id);
-
-static krb5_error_code KRB5_CALLCONV krb5_fcc_set_flags
- (krb5_context, krb5_ccache id, krb5_flags flags);
-
-extern krb5_cc_ops krb5_scc_ops;
-
-static krb5_error_code krb5_fcc_write
- (krb5_context, krb5_ccache id, krb5_pointer buf, unsigned int len);
-static krb5_error_code krb5_fcc_store_principal
- (krb5_context, krb5_ccache id, krb5_principal princ);
-static krb5_error_code krb5_fcc_store_keyblock
- (krb5_context, krb5_ccache id, krb5_keyblock *keyblock);
-static krb5_error_code krb5_fcc_store_data
- (krb5_context, krb5_ccache id, krb5_data *data);
-static krb5_error_code krb5_fcc_store_int32
- (krb5_context, krb5_ccache id, krb5_int32 i);
-static krb5_error_code krb5_fcc_store_ui_4
- (krb5_context, krb5_ccache id, krb5_ui_4 i);
-static krb5_error_code krb5_fcc_store_ui_2
- (krb5_context, krb5_ccache id, krb5_int32 i);
-static krb5_error_code krb5_fcc_store_octet
- (krb5_context, krb5_ccache id, krb5_int32 i);
-static krb5_error_code krb5_fcc_store_times
- (krb5_context, krb5_ccache id, krb5_ticket_times *t);
-static krb5_error_code krb5_fcc_store_addrs
- (krb5_context, krb5_ccache, krb5_address **);
-static krb5_error_code krb5_fcc_store_addr
- (krb5_context, krb5_ccache, krb5_address *);
-static krb5_error_code krb5_fcc_store_authdata
- (krb5_context, krb5_ccache, krb5_authdata **);
-static krb5_error_code krb5_fcc_store_authdatum
- (krb5_context, krb5_ccache, krb5_authdata *);
-
-static krb5_error_code krb5_fcc_interpret
- (krb5_context, int);
-
-static krb5_error_code krb5_fcc_close_file
- (krb5_context, krb5_ccache);
-static krb5_error_code krb5_fcc_open_file
- (krb5_context, krb5_ccache, int);
-
-#include <stdio.h>
-
-#define KRB5_OK 0
-
-#define KRB5_FCC_MAXLEN 100
-
-/*
- * SCC version 2 contains type information for principals. SCC
- * version 1 does not. The code will accept either, and depending on
- * what KRB5_FCC_DEFAULT_FVNO is set to, it will create version 1 or
- * version 2 SCC caches.
- *
- */
-
-#define KRB5_FCC_FVNO_1 0x0501 /* krb v5, fcc v1 */
-#define KRB5_FCC_FVNO_2 0x0502 /* krb v5, fcc v2 */
-#define KRB5_FCC_FVNO_3 0x0503 /* krb v5, fcc v3 */
-#define KRB5_FCC_FVNO_4 0x0504 /* krb v5, fcc v4 */
-
-#define FCC_OPEN_AND_ERASE 1
-#define FCC_OPEN_RDWR 2
-#define FCC_OPEN_RDONLY 3
-
-/* Credential file header tags.
- * The header tags are constructed as:
- * krb5_ui_2 tag
- * krb5_ui_2 len
- * krb5_octet data[len]
- * This format allows for older versions of the fcc processing code to skip
- * past unrecognized tag formats.
- */
-#define FCC_TAG_DELTATIME 1
-
-#ifndef TKT_ROOT
-#define TKT_ROOT "/tmp/tkt"
-#endif
-
-/* macros to make checking flags easier */
-#define OPENCLOSE(id) (((krb5_fcc_data *)id->data)->flags & KRB5_TC_OPENCLOSE)
-
-typedef struct _krb5_fcc_data {
- char *filename;
- FILE *file;
- char stdio_buffer[BUFSIZ];
- krb5_flags flags;
- int mode; /* needed for locking code */
- int version; /* version number of the file */
-} krb5_fcc_data;
-
-/* An off_t can be arbitrarily complex */
-typedef struct _krb5_fcc_cursor {
- long pos;
-} krb5_fcc_cursor;
-
-#define MAYBE_OPEN(CONTEXT, ID, MODE) \
-{ \
- if (OPENCLOSE (ID)) { \
- krb5_error_code maybe_open_ret = krb5_fcc_open_file (CONTEXT, ID,MODE); \
- if (maybe_open_ret) return maybe_open_ret; } }
-
-#define MAYBE_CLOSE(CONTEXT, ID, RET) \
-{ \
- if (OPENCLOSE (ID)) { \
- krb5_error_code maybe_close_ret = krb5_fcc_close_file (CONTEXT, ID); \
- if (!(RET)) RET = maybe_close_ret; } }
-
-#define CHECK(ret) if (ret != KRB5_OK) goto errout;
-
-/*
- * Effects:
- * Reads len bytes from the cache id, storing them in buf.
- *
- * Errors:
- * KRB5_CC_END - there were not len bytes available
- * system errors (read)
- */
-static krb5_error_code
-krb5_fcc_read(context, id, buf, len)
- krb5_context context;
- krb5_ccache id;
- krb5_pointer buf;
- unsigned int len;
-{
- int ret;
-
- errno = 0;
- ret = fread((char *) buf, 1, len, ((krb5_fcc_data *) id->data)->file);
- if ((ret == 0) && errno)
- return krb5_fcc_interpret(context, errno);
- else if (ret != len)
- return KRB5_CC_END;
- else
- return KRB5_OK;
-}
-
-/*
- * FOR ALL OF THE FOLLOWING FUNCTIONS:
- *
- * Requires:
- * id is open and set to read at the appropriate place in the file
- *
- * Effects:
- * Fills in the second argument with data of the appropriate type from
- * the file. In some cases, the functions have to allocate space for
- * variable length fields; therefore, krb5_destroy_<type> must be
- * called for each filled in structure.
- *
- * Errors:
- * system errors (read errors)
- * KRB5_CC_NOMEM
- */
-
-static krb5_error_code
-krb5_fcc_read_principal(context, id, princ)
- krb5_context context;
- krb5_ccache id;
- krb5_principal *princ;
-{
- krb5_fcc_data *data = (krb5_fcc_data *)id->data;
- krb5_error_code kret;
- register krb5_principal tmpprinc;
- krb5_int32 length, type;
- int i;
-
- if (data->version == KRB5_FCC_FVNO_1) {
- type = KRB5_NT_UNKNOWN;
- } else {
- /* Read principal type */
- kret = krb5_fcc_read_int32(context, id, &type);
- if (kret != KRB5_OK)
- return kret;
- }
-
- /* Read the number of components */
- kret = krb5_fcc_read_int32(context, id, &length);
- if (kret != KRB5_OK)
- return kret;
-
- /*
- * DCE includes the principal's realm in the count; the new format
- * does not.
- */
- if (data->version == KRB5_FCC_FVNO_1)
- length--;
-
- tmpprinc = (krb5_principal) malloc(sizeof(krb5_principal_data));
- if (tmpprinc == NULL)
- return KRB5_CC_NOMEM;
- if (length) {
- tmpprinc->data = (krb5_data *) malloc(length * sizeof(krb5_data));
- if (tmpprinc->data == 0) {
- free((char *)tmpprinc);
- return KRB5_CC_NOMEM;
- }
- } else
- tmpprinc->data = 0;
- tmpprinc->magic = KV5M_PRINCIPAL;
- tmpprinc->length = length;
- tmpprinc->type = type;
-
- kret = krb5_fcc_read_data(context, id, krb5_princ_realm(context, tmpprinc));
-
- i = 0;
- CHECK(kret);
-
- for (i=0; i < length; i++) {
- kret = krb5_fcc_read_data(context, id, krb5_princ_component(context, tmpprinc, i));
- CHECK(kret);
- }
- *princ = tmpprinc;
- return KRB5_OK;
-
- errout:
- while(--i >= 0)
- free(krb5_princ_component(context, tmpprinc, i)->data);
- free((char *)tmpprinc->data);
- free((char *)tmpprinc);
- return kret;
-}
-
-static krb5_error_code
-krb5_fcc_read_addrs(context, id, addrs)
- krb5_context context;
- krb5_ccache id;
- krb5_address ***addrs;
-{
- krb5_error_code kret;
- krb5_int32 length;
- int i;
-
- *addrs = 0;
-
- /* Read the number of components */
- kret = krb5_fcc_read_int32(context, id, &length);
- CHECK(kret);
-
- /* Make *addrs able to hold length pointers to krb5_address structs
- * Add one extra for a null-terminated list
- */
- *addrs = (krb5_address **) calloc((unsigned) length+1,
- sizeof(krb5_address *));
- if (*addrs == NULL)
- return KRB5_CC_NOMEM;
-
- for (i=0; i < length; i++) {
- (*addrs)[i] = (krb5_address *) malloc(sizeof(krb5_address));
- if ((*addrs)[i] == NULL) {
- krb5_free_addresses(context, *addrs);
- return KRB5_CC_NOMEM;
- }
- kret = krb5_fcc_read_addr(context, id, (*addrs)[i]);
- CHECK(kret);
- }
-
- return KRB5_OK;
- errout:
- if (*addrs)
- krb5_free_addresses(context, *addrs);
- return kret;
-}
-
-static krb5_error_code
-krb5_fcc_read_keyblock(context, id, keyblock)
- krb5_context context;
- krb5_ccache id;
- krb5_keyblock *keyblock;
-{
- krb5_fcc_data *data = (krb5_fcc_data *)id->data;
- krb5_error_code kret;
- krb5_ui_2 ui2;
- krb5_int32 int32;
-
- keyblock->magic = KV5M_KEYBLOCK;
- keyblock->contents = 0;
-
- kret = krb5_fcc_read_ui_2(context, id, &ui2);
- keyblock->enctype = ui2;
- CHECK(kret);
- if (data->version == KRB5_FCC_FVNO_3) {
- /* This works because the old etype is the same as the new enctype. */
- kret = krb5_fcc_read_ui_2(context, id, &ui2);
- /* keyblock->enctype = ui2; */
- CHECK(kret);
- }
-
- kret = krb5_fcc_read_int32(context, id, &int32);
- CHECK(kret);
- if ((int32 & VALID_INT_BITS) != int32) /* Overflow size_t??? */
- return KRB5_CC_NOMEM;
- keyblock->length = int32;
- if ( keyblock->length == 0 )
- return KRB5_OK;
- keyblock->contents = (unsigned char *) malloc(keyblock->length*
- sizeof(krb5_octet));
- if (keyblock->contents == NULL)
- return KRB5_CC_NOMEM;
-
- kret = krb5_fcc_read(context, id, keyblock->contents, keyblock->length);
- if (kret)
- goto errout;
-
- return KRB5_OK;
- errout:
- if (keyblock->contents)
- krb5_xfree(keyblock->contents);
- return kret;
-}
-
-static krb5_error_code
-krb5_fcc_read_data(context, id, data)
- krb5_context context;
- krb5_ccache id;
- krb5_data *data;
-{
- krb5_error_code kret;
- krb5_int32 len;
-
- data->magic = KV5M_DATA;
- data->data = 0;
-
- kret = krb5_fcc_read_int32(context, id, &len);
- CHECK(kret);
- if ((len & VALID_INT_BITS) != len)
- return KRB5_CC_NOMEM;
- data->length = (int) len;
-
- if (data->length == 0) {
- data->data = 0;
- return KRB5_OK;
- }
-
- data->data = (char *) malloc((unsigned int) data->length+1);
- if (data->data == NULL)
- return KRB5_CC_NOMEM;
-
- kret = krb5_fcc_read(context, id, data->data, (unsigned) data->length);
- CHECK(kret);
-
- data->data[data->length] = 0; /* Null terminate, just in case.... */
- return KRB5_OK;
- errout:
- if (data->data)
- krb5_xfree(data->data);
- return kret;
-}
-
-static krb5_error_code
-krb5_fcc_read_addr(context, id, addr)
- krb5_context context;
- krb5_ccache id;
- krb5_address *addr;
-{
- krb5_error_code kret;
- krb5_ui_2 ui2;
- krb5_int32 int32;
-
- addr->magic = KV5M_ADDRESS;
- addr->contents = 0;
-
- kret = krb5_fcc_read_ui_2(context, id, &ui2);
- CHECK(kret);
- addr->addrtype = ui2;
-
- kret = krb5_fcc_read_int32(context, id, &int32);
- CHECK(kret);
- if ((int32 & VALID_INT_BITS) != int32) /* Overflow int??? */
- return KRB5_CC_NOMEM;
- addr->length = int32;
-
- if (addr->length == 0)
- return KRB5_OK;
-
- addr->contents = (krb5_octet *) malloc(addr->length);
- if (addr->contents == NULL)
- return KRB5_CC_NOMEM;
-
- kret = krb5_fcc_read(context, id, addr->contents, addr->length);
- CHECK(kret);
-
- return KRB5_OK;
- errout:
- if (addr->contents)
- krb5_xfree(addr->contents);
- return kret;
-}
-
-static krb5_error_code
-krb5_fcc_read_int32(context, id, i)
- krb5_context context;
- krb5_ccache id;
- krb5_int32 *i;
-{
- krb5_fcc_data *data = (krb5_fcc_data *)id->data;
- krb5_error_code retval;
- unsigned char buf[4];
-
- if ((data->version == KRB5_FCC_FVNO_1) ||
- (data->version == KRB5_FCC_FVNO_2))
- return krb5_fcc_read(context, id, (krb5_pointer) i, sizeof(krb5_int32));
- else {
- retval = krb5_fcc_read(context, id, buf, 4);
- if (retval)
- return retval;
- *i = (((((buf[0] << 8) + buf[1]) << 8 ) + buf[2]) << 8) + buf[3];
- return 0;
- }
-}
-
-static krb5_error_code
-krb5_fcc_read_ui_2(context, id, i)
- krb5_context context;
- krb5_ccache id;
- krb5_ui_2 *i;
-{
- krb5_fcc_data *data = (krb5_fcc_data *)id->data;
- krb5_error_code retval;
- unsigned char buf[2];
-
- if ((data->version == KRB5_FCC_FVNO_1) ||
- (data->version == KRB5_FCC_FVNO_2))
- return krb5_fcc_read(context, id, (krb5_pointer) i, sizeof(krb5_ui_2));
- else {
- retval = krb5_fcc_read(context, id, buf, 2);
- if (retval)
- return retval;
- *i = (buf[0] << 8) + buf[1];
- return 0;
- }
-}
-
-static krb5_error_code
-krb5_fcc_read_octet(context, id, i)
- krb5_context context;
- krb5_ccache id;
- krb5_octet *i;
-{
- return krb5_fcc_read(context, id, (krb5_pointer) i, 1);
-}
-
-
-static krb5_error_code
-krb5_fcc_read_times(context, id, t)
- krb5_context context;
- krb5_ccache id;
- krb5_ticket_times *t;
-{
- krb5_fcc_data *data = (krb5_fcc_data *)id->data;
- krb5_error_code retval;
- krb5_int32 i;
-
- if ((data->version == KRB5_FCC_FVNO_1) ||
- (data->version == KRB5_FCC_FVNO_2))
- return krb5_fcc_read(context, id, (krb5_pointer) t, sizeof(krb5_ticket_times));
- else {
- retval = krb5_fcc_read_int32(context, id, &i);
- CHECK(retval);
- t->authtime = i;
-
- retval = krb5_fcc_read_int32(context, id, &i);
- CHECK(retval);
- t->starttime = i;
-
- retval = krb5_fcc_read_int32(context, id, &i);
- CHECK(retval);
- t->endtime = i;
-
- retval = krb5_fcc_read_int32(context, id, &i);
- CHECK(retval);
- t->renew_till = i;
- }
- return 0;
-errout:
- return retval;
-}
-
-static krb5_error_code
-krb5_fcc_read_authdata(context, id, a)
- krb5_context context;
- krb5_ccache id;
- krb5_authdata ***a;
-{
- krb5_error_code kret;
- krb5_int32 length;
- int i;
-
- *a = 0;
-
- /* Read the number of components */
- kret = krb5_fcc_read_int32(context, id, &length);
- CHECK(kret);
-
- if (length == 0)
- return KRB5_OK;
-
- /* Make *a able to hold length pointers to krb5_authdata structs
- * Add one extra for a null-terminated list
- */
- *a = (krb5_authdata **) calloc((unsigned) length+1,
- sizeof(krb5_authdata *));
- if (*a == NULL)
- return KRB5_CC_NOMEM;
-
- for (i=0; i < length; i++) {
- (*a)[i] = (krb5_authdata *) malloc(sizeof(krb5_authdata));
- if ((*a)[i] == NULL) {
- krb5_free_authdata(context, *a);
- return KRB5_CC_NOMEM;
- }
- kret = krb5_fcc_read_authdatum(context, id, (*a)[i]);
- CHECK(kret);
- }
-
- return KRB5_OK;
- errout:
- if (*a)
- krb5_free_authdata(context, *a);
- return kret;
-}
-
-static krb5_error_code
-krb5_fcc_read_authdatum(context, id, a)
- krb5_context context;
- krb5_ccache id;
- krb5_authdata *a;
-{
- krb5_error_code kret;
- krb5_int32 int32;
- krb5_ui_2 ui2;
-
- a->magic = KV5M_AUTHDATA;
- a->contents = NULL;
-
- kret = krb5_fcc_read_ui_2(context, id, &ui2);
- CHECK(kret);
- a->ad_type = (krb5_authdatatype)ui2;
- kret = krb5_fcc_read_int32(context, id, &int32);
- CHECK(kret);
- if ((int32 & VALID_INT_BITS) != int32) /* Overflow int??? */
- return KRB5_CC_NOMEM;
- a->length = int32;
-
- if (a->length == 0 )
- return KRB5_OK;
-
- a->contents = (krb5_octet *) malloc(a->length);
- if (a->contents == NULL)
- return KRB5_CC_NOMEM;
-
- kret = krb5_fcc_read(context, id, a->contents, a->length);
- CHECK(kret);
-
- return KRB5_OK;
- errout:
- if (a->contents)
- krb5_xfree(a->contents);
- return kret;
-
-}
-#undef CHECK
-
-#define CHECK(ret) if (ret != KRB5_OK) return ret;
-
-/*
- * Requires:
- * id is open
- *
- * Effects:
- * Writes len bytes from buf into the file cred cache id.
- *
- * Errors:
- * system errors
- */
-static krb5_error_code
-krb5_fcc_write(context, id, buf, len)
- krb5_context context;
- krb5_ccache id;
- krb5_pointer buf;
- unsigned int len;
-{
- int ret;
- errno = 0;
- ret = fwrite((char *) buf, 1, len, ((krb5_fcc_data *)id->data)->file);
- if ((ret == 0) && errno)
- return krb5_fcc_interpret (context, errno);
- else if (ret != len)
- return KRB5_CC_END;
- return KRB5_OK;
-}
-
-/*
- * FOR ALL OF THE FOLLOWING FUNCTIONS:
- *
- * Requires:
- * ((krb5_fcc_data *) id->data)->file is open and at the right position.
- *
- * Effects:
- * Stores an encoded version of the second argument in the
- * cache file.
- *
- * Errors:
- * system errors
- */
-
-static krb5_error_code
-krb5_fcc_store_principal(context, id, princ)
- krb5_context context;
- krb5_ccache id;
- krb5_principal princ;
-{
- krb5_fcc_data *data = (krb5_fcc_data *)id->data;
- krb5_error_code ret;
- krb5_int32 i, length, tmp, type;
-
- type = krb5_princ_type(context, princ);
- tmp = length = krb5_princ_size(context, princ);
-
- if (data->version == KRB5_FCC_FVNO_1) {
- /*
- * DCE-compatible format means that the length count
- * includes the realm. (It also doesn't include the
- * principal type information.)
- */
- tmp++;
- } else {
- ret = krb5_fcc_store_int32(context, id, type);
- CHECK(ret);
- }
-
- ret = krb5_fcc_store_int32(context, id, tmp);
- CHECK(ret);
-
- ret = krb5_fcc_store_data(context, id, krb5_princ_realm(context, princ));
- CHECK(ret);
-
- for (i=0; i < length; i++) {
- ret = krb5_fcc_store_data(context, id, krb5_princ_component(context, princ, i));
- CHECK(ret);
- }
-
- return KRB5_OK;
-}
-
-static krb5_error_code
-krb5_fcc_store_addrs(context, id, addrs)
- krb5_context context;
- krb5_ccache id;
- krb5_address ** addrs;
-{
- krb5_error_code ret;
- krb5_address **temp;
- krb5_int32 i, length = 0;
-
- /* Count the number of components */
- if (addrs) {
- temp = addrs;
- while (*temp++)
- length += 1;
- }
-
- ret = krb5_fcc_store_int32(context, id, length);
- CHECK(ret);
- for (i=0; i < length; i++) {
- ret = krb5_fcc_store_addr(context, id, addrs[i]);
- CHECK(ret);
- }
-
- return KRB5_OK;
-}
-
-static krb5_error_code
-krb5_fcc_store_keyblock(context, id, keyblock)
- krb5_context context;
- krb5_ccache id;
- krb5_keyblock *keyblock;
-{
- krb5_fcc_data *data = (krb5_fcc_data *)id->data;
- krb5_error_code ret;
-
- ret = krb5_fcc_store_ui_2(context, id, keyblock->enctype);
- CHECK(ret);
- if (data->version == KRB5_FCC_FVNO_3) {
- ret = krb5_fcc_store_ui_2(context, id, keyblock->enctype);
- CHECK(ret);
- }
- ret = krb5_fcc_store_ui_4(context, id, keyblock->length);
- CHECK(ret);
- return krb5_fcc_write(context, id, (char *) keyblock->contents, keyblock->length);
-}
-
-static krb5_error_code
-krb5_fcc_store_addr(context, id, addr)
- krb5_context context;
- krb5_ccache id;
- krb5_address *addr;
-{
- krb5_error_code ret;
-
- ret = krb5_fcc_store_ui_2(context, id, addr->addrtype);
- CHECK(ret);
- ret = krb5_fcc_store_ui_4(context, id, addr->length);
- CHECK(ret);
- return krb5_fcc_write(context, id, (char *) addr->contents, addr->length);
-}
-
-
-static krb5_error_code
-krb5_fcc_store_data(context, id, data)
- krb5_context context;
- krb5_ccache id;
- krb5_data *data;
-{
- krb5_error_code ret;
-
- ret = krb5_fcc_store_ui_4(context, id, data->length);
- CHECK(ret);
- return krb5_fcc_write(context, id, data->data, data->length);
-}
-
-static krb5_error_code
-krb5_fcc_store_int32(context, id, i)
- krb5_context context;
- krb5_ccache id;
- krb5_int32 i;
-{
- krb5_fcc_data *data = (krb5_fcc_data *)id->data;
- unsigned char buf[4];
-
- if ((data->version == KRB5_FCC_FVNO_1) ||
- (data->version == KRB5_FCC_FVNO_2))
- return krb5_fcc_write(context, id, (char *) &i, sizeof(krb5_int32));
- else {
- buf[3] = i & 0xFF;
- i >>= 8;
- buf[2] = i & 0xFF;
- i >>= 8;
- buf[1] = i & 0xFF;
- i >>= 8;
- buf[0] = i & 0xFF;
-
- return krb5_fcc_write(context, id, buf, 4);
- }
-}
-
-static krb5_error_code
-krb5_fcc_store_ui_4(context, id, i)
- krb5_context context;
- krb5_ccache id;
- krb5_ui_4 i;
-{
- krb5_fcc_data *data = (krb5_fcc_data *)id->data;
- unsigned char buf[4];
-
- if ((data->version == KRB5_FCC_FVNO_1) ||
- (data->version == KRB5_FCC_FVNO_2))
- return krb5_fcc_write(context, id, (char *) &i, sizeof(krb5_int32));
- else {
- buf[3] = i & 0xFF;
- i >>= 8;
- buf[2] = i & 0xFF;
- i >>= 8;
- buf[1] = i & 0xFF;
- i >>= 8;
- buf[0] = i & 0xFF;
-
- return krb5_fcc_write(context, id, buf, 4);
- }
-}
-
-static krb5_error_code
-krb5_fcc_store_ui_2(context, id, i)
- krb5_context context;
- krb5_ccache id;
- krb5_int32 i;
-{
- krb5_fcc_data *data = (krb5_fcc_data *)id->data;
- krb5_ui_2 ibuf;
- unsigned char buf[2];
-
- if ((data->version == KRB5_FCC_FVNO_1) ||
- (data->version == KRB5_FCC_FVNO_2)) {
- ibuf = i;
- return krb5_fcc_write(context, id, (char *) &ibuf, sizeof(krb5_ui_2));
- } else {
- buf[1] = i & 0xFF;
- i >>= 8;
- buf[0] = i & 0xFF;
-
- return krb5_fcc_write(context, id, buf, 2);
- }
-}
-
-static krb5_error_code
-krb5_fcc_store_octet(context, id, i)
- krb5_context context;
- krb5_ccache id;
- krb5_int32 i;
-{
- krb5_octet ibuf;
-
- ibuf = i;
- return krb5_fcc_write(context, id, (char *) &ibuf, 1);
-}
-
-static krb5_error_code
-krb5_fcc_store_times(context, id, t)
- krb5_context context;
- krb5_ccache id;
- krb5_ticket_times *t;
-{
- krb5_fcc_data *data = (krb5_fcc_data *)id->data;
- krb5_error_code retval;
-
- if ((data->version == KRB5_FCC_FVNO_1) ||
- (data->version == KRB5_FCC_FVNO_2))
- return krb5_fcc_write(context, id, (char *) t, sizeof(krb5_ticket_times));
- else {
- retval = krb5_fcc_store_int32(context, id, t->authtime);
- CHECK(retval);
- retval = krb5_fcc_store_int32(context, id, t->starttime);
- CHECK(retval);
- retval = krb5_fcc_store_int32(context, id, t->endtime);
- CHECK(retval);
- retval = krb5_fcc_store_int32(context, id, t->renew_till);
- CHECK(retval);
- return 0;
- }
-}
-
-static krb5_error_code
-krb5_fcc_store_authdata(context, id, a)
- krb5_context context;
- krb5_ccache id;
- krb5_authdata **a;
-{
- krb5_error_code ret;
- krb5_authdata **temp;
- krb5_int32 i, length=0;
-
- if (a != NULL) {
- for (temp=a; *temp; temp++)
- length++;
- }
-
- ret = krb5_fcc_store_int32(context, id, length);
- CHECK(ret);
- for (i=0; i<length; i++) {
- ret = krb5_fcc_store_authdatum (context, id, a[i]);
- CHECK(ret);
- }
- return KRB5_OK;
-}
-
-static krb5_error_code
-krb5_fcc_store_authdatum (context, id, a)
- krb5_context context;
- krb5_ccache id;
- krb5_authdata *a;
-{
- krb5_error_code ret;
- ret = krb5_fcc_store_ui_2(context, id, a->ad_type);
- CHECK(ret);
- ret = krb5_fcc_store_ui_4(context, id, a->length);
- CHECK(ret);
- return krb5_fcc_write(context, id, (krb5_pointer) a->contents, a->length);
-}
-
-#ifdef macintosh
-/*
- * Kludge for the Macintosh, since fopen doesn't set errno, but open
- * does...
- */
-static FILE *my_fopen(char *path, char *mode)
-{
- int fd, open_flags;
- FILE *f;
-
- f = fopen(path, mode);
- if (f)
- return f;
- /*
- * OK, fopen failed; let's try to figure out why....
- */
- if (strchr(mode, '+'))
- open_flags = O_RDWR;
- else if (strchr(mode, 'w') || strchr(mode, 'a'))
- open_flags = O_WRONLY;
- else
- open_flags = O_RDONLY;
- if (strchr(mode, 'a'))
- open_flags |= O_APPEND;
-
- fd = open(path, open_flags);
- if (fd == -1)
- return NULL;
- /*
- * fopen failed, but open succeeded? W*E*I*R*D.....
- */
- close(fd);
- errno = KRB5_CC_IO;
-
- return NULL;
-}
-#endif
-
-static krb5_error_code
-krb5_fcc_close_file (context, id)
- krb5_context context;
- krb5_ccache id;
-{
- int ret;
- krb5_fcc_data *data = (krb5_fcc_data *) id->data;
- krb5_error_code retval;
-
- if (data->file == (FILE *) NULL)
- return KRB5_FCC_INTERNAL;
-
- /* Calling fflush on a read-only file is undefined. */
- if (data->mode != FCC_OPEN_RDONLY)
- ret = fflush (data->file);
- else
- ret = 0;
- memset (data->stdio_buffer, 0, sizeof (data->stdio_buffer));
- if (ret == EOF) {
- int errsave = errno;
- (void) krb5_unlock_file(context, fileno(data->file));
- (void) fclose (data->file);
- data->file = 0;
- return krb5_fcc_interpret (context, errsave);
- }
- retval = krb5_unlock_file(context, fileno(data->file));
- ret = fclose (data->file);
- data->file = 0;
- if (retval)
- return retval;
- else
- return ret ? krb5_fcc_interpret (context, errno) : 0;
-}
-
-#if defined(ANSI_STDIO) || defined(_WIN32)
-#define BINARY_MODE "b"
-#else
-#define BINARY_MODE ""
-#endif
-
-static krb5_error_code
-krb5_fcc_open_file (context, id, mode)
- krb5_context context;
- krb5_ccache id;
- int mode;
-{
- krb5_os_context os_ctx = (krb5_os_context) context->os_context;
- krb5_fcc_data *data = (krb5_fcc_data *) id->data;
- char fvno_bytes[2]; /* In nework byte order */
- krb5_ui_2 fcc_flen;
- krb5_ui_2 fcc_tag;
- krb5_ui_2 fcc_taglen;
- FILE *f;
- char *open_flag;
- int lock_flag;
- krb5_error_code retval = 0;
-
- if (data->file) {
- /* Don't know what state it's in; shut down and start anew. */
- (void) krb5_unlock_file(context, fileno(data->file));
- (void) fclose (data->file);
- data->file = 0;
- }
- switch(mode) {
- case FCC_OPEN_AND_ERASE:
- unlink(data->filename);
- /* XXX should do an exclusive open here, but no way to do */
- /* this under stdio */
- open_flag = "w" BINARY_MODE "+";
- break;
- case FCC_OPEN_RDWR:
- open_flag = "r" BINARY_MODE "+";
- break;
- case FCC_OPEN_RDONLY:
- default:
- open_flag = "r" BINARY_MODE;
- break;
- }
-
-#ifdef macintosh
- f = my_fopen (data->filename, open_flag);
-#else
- f = fopen (data->filename, open_flag);
-#endif
- if (!f)
- return krb5_fcc_interpret (context, errno);
- data->mode = mode;
-#ifdef HAVE_SETVBUF
- setvbuf(f, data->stdio_buffer, _IOFBF, sizeof (data->stdio_buffer));
-#else
- setbuf (f, data->stdio_buffer);
-#endif
- if (data->mode == FCC_OPEN_RDONLY)
- lock_flag = KRB5_LOCKMODE_SHARED;
- else
- lock_flag = KRB5_LOCKMODE_EXCLUSIVE;
- if ((retval = krb5_lock_file(context,fileno(f), lock_flag))){
- (void) fclose(f);
- return retval;
- }
- if (mode == FCC_OPEN_AND_ERASE) {
- /* write the version number */
-
- data->file = f;
- data->version = context->scc_default_format;
- retval = krb5_fcc_store_ui_2(context, id, data->version);
- if (retval) goto done;
-
- if (data->version == KRB5_FCC_FVNO_4) {
- fcc_flen = 0;
-
- if (os_ctx->os_flags & KRB5_OS_TOFFSET_VALID)
- fcc_flen += (2*sizeof(krb5_ui_2) + 2*sizeof(krb5_int32));
-
- /* Write header length */
- retval = krb5_fcc_store_ui_2(context, id, (krb5_int32)fcc_flen);
- if (retval) goto done;
-
- if (os_ctx->os_flags & KRB5_OS_TOFFSET_VALID) {
- /* Write time offset tag */
- fcc_tag = FCC_TAG_DELTATIME;
- fcc_taglen = 2*sizeof(krb5_int32);
-
- retval = krb5_fcc_store_ui_2(context,id,(krb5_int32)fcc_tag);
- if (retval) goto done;
- retval = krb5_fcc_store_ui_2(context,id,(krb5_int32)fcc_taglen);
- if (retval) goto done;
- retval = krb5_fcc_store_int32(context,id,os_ctx->time_offset);
- if (retval) goto done;
- retval = krb5_fcc_store_int32(context,id,os_ctx->usec_offset);
- if (retval) goto done;
- }
- }
- goto done;
- }
-
- /* verify a valid version number is there */
- if (!fread((char *)fvno_bytes, sizeof(fvno_bytes), 1, f))
- {
- retval = KRB5_CC_FORMAT;
- goto done;
- }
- data->version = (fvno_bytes[0] << 8) + fvno_bytes[1];
- if ((data->version != KRB5_FCC_FVNO_4) &&
- (data->version != KRB5_FCC_FVNO_3) &&
- (data->version != KRB5_FCC_FVNO_2) &&
- (data->version != KRB5_FCC_FVNO_1))
- {
- retval = KRB5_CCACHE_BADVNO;
- goto done;
- }
-
- data->file = f;
-
- if (data->version == KRB5_FCC_FVNO_4) {
- char buf[1024];
-
- if (krb5_fcc_read_ui_2(context, id, &fcc_flen) ||
- (fcc_flen > sizeof(buf)))
- {
- retval = KRB5_CC_FORMAT;
- goto done;
- }
-
- while (fcc_flen) {
- if ((fcc_flen < (2*sizeof(krb5_ui_2))) ||
- krb5_fcc_read_ui_2(context, id, &fcc_tag) ||
- krb5_fcc_read_ui_2(context, id, &fcc_taglen) ||
- (fcc_taglen > (fcc_flen - 2*sizeof(krb5_ui_2))))
- {
- retval = KRB5_CC_FORMAT;
- goto done;
- }
-
- switch (fcc_tag) {
- case FCC_TAG_DELTATIME:
- if (fcc_taglen != 2*sizeof(krb5_int32)) {
- retval = KRB5_CC_FORMAT;
- goto done;
- }
- if (!(context->library_options & KRB5_LIBOPT_SYNC_KDCTIME) ||
- (os_ctx->os_flags & KRB5_OS_TOFFSET_VALID))
- {
- if (krb5_fcc_read(context, id, buf, fcc_taglen)) {
- retval = KRB5_CC_FORMAT;
- goto done;
- }
- break;
- }
- if (krb5_fcc_read_int32(context, id, &os_ctx->time_offset) ||
- krb5_fcc_read_int32(context, id, &os_ctx->usec_offset))
- {
- retval = KRB5_CC_FORMAT;
- goto done;
- }
- os_ctx->os_flags =
- ((os_ctx->os_flags & ~KRB5_OS_TOFFSET_TIME) |
- KRB5_OS_TOFFSET_VALID);
- break;
- default:
- if (fcc_taglen && krb5_fcc_read(context,id,buf,fcc_taglen)) {
- retval = KRB5_CC_FORMAT;
- goto done;
- }
- break;
- }
- fcc_flen -= (2*sizeof(krb5_ui_2) + fcc_taglen);
- }
- }
-
-done:
- if (retval) {
- if (f) {
- data->file = 0;
- (void) krb5_unlock_file(context, fileno(f));
- (void) fclose(f);
- }
- }
- return retval;
-}
-
-static krb5_error_code
-krb5_fcc_skip_header(context, id)
- krb5_context context;
- krb5_ccache id;
-{
- krb5_fcc_data *data = (krb5_fcc_data *) id->data;
- krb5_error_code kret;
- krb5_ui_2 fcc_flen;
-
- if (fseek(data->file, sizeof(krb5_ui_2), SEEK_SET))
- return errno;
- if (data->version == KRB5_FCC_FVNO_4) {
- kret = krb5_fcc_read_ui_2(context, id, &fcc_flen);
- if (kret) return kret;
- if (fseek(data->file, fcc_flen, SEEK_CUR))
- return errno;
- }
- return KRB5_OK;
-}
-
-static krb5_error_code
-krb5_fcc_skip_principal(context, id)
- krb5_context context;
- krb5_ccache id;
-{
- krb5_error_code kret;
- krb5_principal princ;
-
- kret = krb5_fcc_read_principal(context, id, &princ);
- if (kret != KRB5_OK)
- return kret;
-
- krb5_free_principal(context, princ);
- return KRB5_OK;
-}
-
-
-/*
- * Modifies:
- * id
- *
- * Effects:
- * Creates/refreshes the file cred cache id. If the cache exists, its
- * contents are destroyed.
- *
- * Errors:
- * system errors
- * permission errors
- */
-static krb5_error_code KRB5_CALLCONV
-krb5_fcc_initialize(context, id, princ)
- krb5_context context;
- krb5_ccache id;
- krb5_principal princ;
-{
- krb5_error_code kret = 0;
-
- kret = krb5_fcc_open_file (context, id, FCC_OPEN_AND_ERASE);
- if (kret < 0)
- return krb5_fcc_interpret(context, errno);
-
- kret = krb5_fcc_store_principal(context, id, princ);
-
- MAYBE_CLOSE (context, id, kret);
- return kret;
-}
-
-
-/*
- * Modifies:
- * id
- *
- * Effects:
- * Closes the file cache, invalidates the id, and frees any resources
- * associated with the cache.
- */
-static krb5_error_code KRB5_CALLCONV
-krb5_fcc_close(context, id)
- krb5_context context;
- krb5_ccache id;
-{
- register int closeval = KRB5_OK;
- register krb5_fcc_data *data = (krb5_fcc_data *) id->data;
-
- if (!OPENCLOSE(id)) {
- closeval = fclose (data->file);
- data->file = 0;
- if (closeval == -1) {
- closeval = krb5_fcc_interpret(context, errno);
- } else
- closeval = KRB5_OK;
- }
- krb5_xfree (data->filename);
- krb5_xfree (data);
- krb5_xfree (id);
-
- return closeval;
-}
-
-#ifndef SEEK_SET
-#define SEEK_SET 0
-#endif
-
-/*
- * Effects:
- * Destroys the contents of id.
- *
- * Errors:
- * system errors
- */
-static krb5_error_code KRB5_CALLCONV
-krb5_fcc_destroy(context, id)
- krb5_context context;
- krb5_ccache id;
-{
- krb5_fcc_data *data = (krb5_fcc_data *) id->data;
- register int ret;
-
- if (!OPENCLOSE(id)) {
- (void) fclose(data->file);
- data->file = 0;
- }
-
- ret = remove (data->filename);
- if (ret < 0) {
- ret = krb5_fcc_interpret(context, errno);
- if (OPENCLOSE(id)) {
- (void) fclose(data->file);
- data->file = 0;
- }
- goto cleanup;
- }
-
- /*
- * Possible future extension: Read entire file to determine
- * length, then write nulls all over it. This was the UNIX
- * version...
- */
-
- if (ret)
- ret = krb5_fcc_interpret(context, errno);
-
- cleanup:
- krb5_xfree(data->filename);
- krb5_xfree(data);
- krb5_xfree(id);
-
- return ret;
-}
-
-/*
- * Requires:
- * residual is a legal path name, and a null-terminated string
- *
- * Modifies:
- * id
- *
- * Effects:
- * creates a file-based cred cache that will reside in the file
- * residual. The cache is not opened, but the filename is reserved.
- *
- * Returns:
- * A filled in krb5_ccache structure "id".
- *
- * Errors:
- * KRB5_CC_NOMEM - there was insufficient memory to allocate the
- * krb5_ccache. id is undefined.
- * permission errors
- */
-static krb5_error_code KRB5_CALLCONV
-krb5_fcc_resolve (context, id, residual)
- krb5_context context;
- krb5_ccache *id;
- const char *residual;
-{
- krb5_ccache lid;
-
- lid = (krb5_ccache) malloc(sizeof(struct _krb5_ccache));
- if (lid == NULL)
- return KRB5_CC_NOMEM;
-
- lid->ops = &krb5_scc_ops;
-
- lid->data = (krb5_pointer) malloc(sizeof(krb5_fcc_data));
- if (lid->data == NULL) {
- krb5_xfree(lid);
- return KRB5_CC_NOMEM;
- }
-
- ((krb5_fcc_data *) lid->data)->filename = (char *)
- malloc(strlen(residual) + 1);
-
- if (((krb5_fcc_data *) lid->data)->filename == NULL) {
- krb5_xfree(((krb5_fcc_data *) lid->data));
- krb5_xfree(lid);
- return KRB5_CC_NOMEM;
- }
-
- /* default to open/close on every trn */
- ((krb5_fcc_data *) lid->data)->flags = KRB5_TC_OPENCLOSE;
- ((krb5_fcc_data *) lid->data)->file = 0;
-
- /* Set up the filename */
- strcpy(((krb5_fcc_data *) lid->data)->filename, residual);
-
- lid->magic = KV5M_CCACHE;
-
- /* other routines will get errors on open, and callers must expect them,
- if cache is non-existent/unusable */
- *id = lid;
- return KRB5_OK;
-}
-
-/*
- * Effects:
- * Prepares for a sequential search of the credentials cache.
- * Returns and krb5_cc_cursor to be used with krb5_fcc_next_cred and
- * krb5_fcc_end_seq_get.
- *
- * If the cache is modified between the time of this call and the time
- * of the final krb5_fcc_end_seq_get, the results are undefined.
- *
- * Errors:
- * KRB5_CC_NOMEM
- * system errors
- */
-static krb5_error_code KRB5_CALLCONV
-krb5_fcc_start_seq_get(context, id, cursor)
- krb5_context context;
- krb5_ccache id;
- krb5_cc_cursor *cursor;
-{
- krb5_fcc_cursor *fcursor;
- int kret = 0;
-
- fcursor = (krb5_fcc_cursor *) malloc(sizeof(krb5_fcc_cursor));
- if (fcursor == NULL)
- return KRB5_CC_NOMEM;
-
- /* Make sure we start reading right after the primary principal */
- MAYBE_OPEN (context, id, FCC_OPEN_RDONLY);
-
- kret = krb5_fcc_skip_header(context, id);
- if (kret) goto done;
- kret = krb5_fcc_skip_principal(context, id);
- if (kret) goto done;
-
- fcursor->pos = ftell(((krb5_fcc_data *) id->data)->file);
- *cursor = (krb5_cc_cursor) fcursor;
-
-done:
- MAYBE_CLOSE (context, id, kret);
- return kret;
-}
-
-
-/*
- * Requires:
- * cursor is a krb5_cc_cursor originally obtained from
- * krb5_fcc_start_seq_get.
- *
- * Modifes:
- * cursor, creds
- *
- * Effects:
- * Fills in creds with the "next" credentals structure from the cache
- * id. The actual order the creds are returned in is arbitrary.
- * Space is allocated for the variable length fields in the
- * credentials structure, so the object returned must be passed to
- * krb5_destroy_credential.
- *
- * The cursor is updated for the next call to krb5_fcc_next_cred.
- *
- * Errors:
- * system errors
- */
-static krb5_error_code KRB5_CALLCONV
-krb5_fcc_next_cred(context, id, cursor, creds)
- krb5_context context;
- krb5_ccache id;
- krb5_cc_cursor *cursor;
- krb5_creds *creds;
-{
-#define TCHECK(ret) if (ret != KRB5_OK) goto lose;
- int ret;
- krb5_error_code kret;
- krb5_fcc_cursor *fcursor;
- krb5_int32 int32;
- krb5_octet octet;
-
-#define Z(field) creds->field = 0
- Z (client);
- Z (server);
- Z (keyblock.contents);
- Z (authdata);
- Z (ticket.data);
- Z (second_ticket.data);
- Z (addresses);
-#undef Z
-
- MAYBE_OPEN (context, id, FCC_OPEN_RDONLY);
-
- fcursor = (krb5_fcc_cursor *) *cursor;
- ret = fseek(((krb5_fcc_data *) id->data)->file, fcursor->pos, 0);
- if (ret < 0) {
- kret = krb5_fcc_interpret(context, errno);
- MAYBE_CLOSE (context, id, kret);
- return kret;
- }
-
- kret = krb5_fcc_read_principal(context, id, &creds->client);
- TCHECK(kret);
- kret = krb5_fcc_read_principal(context, id, &creds->server);
- TCHECK(kret);
- kret = krb5_fcc_read_keyblock(context, id, &creds->keyblock);
- TCHECK(kret);
- kret = krb5_fcc_read_times(context, id, &creds->times);
- TCHECK(kret);
- kret = krb5_fcc_read_octet(context, id, &octet);
- TCHECK(kret);
- creds->is_skey = octet;
- kret = krb5_fcc_read_int32(context, id, &int32);
- TCHECK(kret);
- creds->ticket_flags = int32;
- kret = krb5_fcc_read_addrs(context, id, &creds->addresses);
- TCHECK(kret);
- kret = krb5_fcc_read_authdata (context, id, &creds->authdata);
- TCHECK (kret);
- kret = krb5_fcc_read_data(context, id, &creds->ticket);
- TCHECK(kret);
- kret = krb5_fcc_read_data(context, id, &creds->second_ticket);
- TCHECK(kret);
-
- fcursor->pos = ftell(((krb5_fcc_data *) id->data)->file);
- cursor = (krb5_cc_cursor *) fcursor;
-
-lose:
- if (kret != KRB5_OK)
- krb5_free_cred_contents(context, creds);
- MAYBE_CLOSE (context, id, kret);
- return kret;
-}
-
-/*
- * Requires:
- * cursor is a krb5_cc_cursor originally obtained from
- * krb5_fcc_start_seq_get.
- *
- * Modifies:
- * id, cursor
- *
- * Effects:
- * Finishes sequential processing of the file credentials ccache id,
- * and invalidates the cursor (it must never be used after this call).
- */
-/* ARGSUSED */
-static krb5_error_code KRB5_CALLCONV
-krb5_fcc_end_seq_get(context, id, cursor)
- krb5_context context;
- krb5_ccache id;
- krb5_cc_cursor *cursor;
-{
-/*
- MAYBE_CLOSE (context, id, kret); */
- krb5_xfree((krb5_fcc_cursor *) *cursor);
-
- return 0;
-}
-
-
-extern krb5_cc_ops krb5_scc_ops;
-
-/*
- * Effects:
- * Creates a new file cred cache whose name is guaranteed to be
- * unique. The name begins with the string TKT_ROOT (from scc.h).
- * The cache is not opened, but the new filename is reserved.
- *
- * Returns:
- * The filled in krb5_ccache id.
- *
- * Errors:
- * KRB5_CC_NOMEM - there was insufficient memory to allocate the
- * krb5_ccache. id is undefined.
- * system errors (from open)
- */
-static krb5_error_code KRB5_CALLCONV
-krb5_fcc_generate_new (context, id)
- krb5_context context;
- krb5_ccache *id;
-{
- krb5_ccache lid;
- FILE *f;
- krb5_error_code retcode = 0;
- char scratch[sizeof(TKT_ROOT)+6+1]; /* +6 for the scratch part, +1 for
- NUL */
-
- /* Allocate memory */
- lid = (krb5_ccache) malloc(sizeof(struct _krb5_ccache));
- if (lid == NULL)
- return KRB5_CC_NOMEM;
-
- lid->ops = &krb5_scc_ops;
-
- (void) strcpy(scratch, TKT_ROOT);
- (void) strcat(scratch, "XXXXXX");
- mktemp(scratch);
-
- lid->data = (krb5_pointer) malloc(sizeof(krb5_fcc_data));
- if (lid->data == NULL) {
- krb5_xfree(lid);
- return KRB5_CC_NOMEM;
- }
-
- ((krb5_fcc_data *) lid->data)->filename = (char *)
- malloc(strlen(scratch) + 1);
- if (((krb5_fcc_data *) lid->data)->filename == NULL) {
- krb5_xfree(((krb5_fcc_data *) lid->data));
- krb5_xfree(lid);
- return KRB5_CC_NOMEM;
- }
-
- /* default to open/close on every trn - otherwise cc_destroy
- gets confused as to state
- */
- ((krb5_fcc_data *) lid->data)->flags = KRB5_TC_OPENCLOSE;
- ((krb5_fcc_data *) lid->data)->file = 0;
-
- /* Set up the filename */
- strcpy(((krb5_fcc_data *) lid->data)->filename, scratch);
-
- /* Make sure the file name is useable */
- f = fopen (((krb5_fcc_data *) lid->data)->filename, "w" BINARY_MODE "+");
- if (!f) {
- retcode = krb5_fcc_interpret (context, errno);
- goto err_out;
- } else {
- unsigned char fcc_fvno[2];
-
- fcc_fvno[0] = (unsigned char) ((context->scc_default_format >> 8) & 0xFF);
- fcc_fvno[1] = (unsigned char) (context->scc_default_format & 0xFF);
-
- if (!fwrite((char *)fcc_fvno, sizeof(fcc_fvno), 1, f)) {
- retcode = krb5_fcc_interpret(context, errno);
- (void) fclose(f);
- (void) remove(((krb5_fcc_data *) lid->data)->filename);
- goto err_out;
- }
- /* For version 4 we save a length for the rest of the header */
- if (context->scc_default_format == KRB5_FCC_FVNO_4) {
- unsigned char fcc_flen[2];
- fcc_flen[0] = 0;
- fcc_flen[1] = 0;
- if (!fwrite((char *)fcc_flen, sizeof(fcc_flen), 1, f)) {
- retcode = krb5_fcc_interpret(context, errno);
- (void) fclose(f);
- (void) remove(((krb5_fcc_data *) lid->data)->filename);
- goto err_out;
- }
- }
- if (fclose(f) == EOF) {
- retcode = krb5_fcc_interpret(context, errno);
- (void) remove(((krb5_fcc_data *) lid->data)->filename);
- goto err_out;
- }
- *id = lid;
- return KRB5_OK;
- }
-err_out:
- krb5_xfree(((krb5_fcc_data *) lid->data)->filename);
- krb5_xfree(((krb5_fcc_data *) lid->data));
- krb5_xfree(lid);
- return retcode;
-}
-
-/*
- * Requires:
- * id is a file credential cache
- *
- * Returns:
- * The name of the file cred cache id.
- */
-static const char * KRB5_CALLCONV
-krb5_fcc_get_name (context, id)
- krb5_context context;
- krb5_ccache id;
-{
- return (char *) ((krb5_fcc_data *) id->data)->filename;
-}
-
-/*
- * Modifies:
- * id, princ
- *
- * Effects:
- * Retrieves the primary principal from id, as set with
- * krb5_fcc_initialize. The principal is returned is allocated
- * storage that must be freed by the caller via krb5_free_principal.
- *
- * Errors:
- * system errors
- * KRB5_CC_NOMEM
- */
-static krb5_error_code KRB5_CALLCONV
-krb5_fcc_get_principal(context, id, princ)
- krb5_context context;
- krb5_ccache id;
- krb5_principal *princ;
-{
- krb5_error_code kret = KRB5_OK;
-
- MAYBE_OPEN (context, id, FCC_OPEN_RDONLY);
-
- kret = krb5_fcc_skip_header(context, id);
- if (kret) goto done;
- kret = krb5_fcc_read_principal(context, id, princ);
-
-done:
- MAYBE_CLOSE (context, id, kret);
- return kret;
-}
-
-
-static krb5_error_code KRB5_CALLCONV
-krb5_fcc_retrieve(context, id, whichfields, mcreds, creds)
- krb5_context context;
- krb5_ccache id;
- krb5_flags whichfields;
- krb5_creds *mcreds;
- krb5_creds *creds;
-{
- return krb5_cc_retrieve_cred_default (context, id, whichfields,
- mcreds, creds);
-}
-
-
-/*
- * Modifies:
- * the file cache
- *
- * Effects:
- * stores creds in the file cred cache
- *
- * Errors:
- * system errors
- * storage failure errors
- */
-static krb5_error_code KRB5_CALLCONV
-krb5_fcc_store(context, id, creds)
- krb5_context context;
- krb5_ccache id;
- krb5_creds *creds;
-{
-#define TCHECK(ret) if (ret != KRB5_OK) goto lose;
- krb5_error_code ret;
-
- /* Make sure we are writing to the end of the file */
- MAYBE_OPEN (context, id, FCC_OPEN_RDWR);
-
- ret = fseek(((krb5_fcc_data *) id->data)->file, 0, 2);
- if (ret < 0) {
- return krb5_fcc_interpret(context, errno);
- }
-
- ret = krb5_fcc_store_principal(context, id, creds->client);
- TCHECK(ret);
- ret = krb5_fcc_store_principal(context, id, creds->server);
- TCHECK(ret);
- ret = krb5_fcc_store_keyblock(context, id, &creds->keyblock);
- TCHECK(ret);
- ret = krb5_fcc_store_times(context, id, &creds->times);
- TCHECK(ret);
- ret = krb5_fcc_store_octet(context, id, (krb5_int32) creds->is_skey);
- TCHECK(ret);
- ret = krb5_fcc_store_int32(context, id, creds->ticket_flags);
- TCHECK(ret);
- ret = krb5_fcc_store_addrs(context, id, creds->addresses);
- TCHECK(ret);
- ret = krb5_fcc_store_authdata(context, id, creds->authdata);
- TCHECK(ret);
- ret = krb5_fcc_store_data(context, id, &creds->ticket);
- TCHECK(ret);
- ret = krb5_fcc_store_data(context, id, &creds->second_ticket);
- TCHECK(ret);
-
-lose:
- MAYBE_CLOSE (context, id, ret);
- return ret;
-#undef TCHECK
-}
-
-
-/*
- * Requires:
- * id is a cred cache returned by krb5_fcc_resolve or
- * krb5_fcc_generate_new, but has not been opened by krb5_fcc_initialize.
- *
- * Modifies:
- * id
- *
- * Effects:
- * Sets the operational flags of id to flags.
- */
-static krb5_error_code KRB5_CALLCONV
-krb5_fcc_set_flags(context, id, flags)
- krb5_context context;
- krb5_ccache id;
- krb5_flags flags;
-{
- krb5_error_code ret = 0;
-
- /* XXX This should check for illegal combinations, if any.. */
- if (flags & KRB5_TC_OPENCLOSE) {
- /* asking to turn on OPENCLOSE mode */
- if (!OPENCLOSE(id))
- ret = krb5_fcc_close_file (context, id);
- } else {
- /* asking to turn off OPENCLOSE mode, meaning it must be
- left open. We open if it's not yet open */
- if (OPENCLOSE(id)) {
- ret = krb5_fcc_open_file (context, id, FCC_OPEN_RDWR);
- }
- }
-
- ((krb5_fcc_data *) id->data)->flags = flags;
- return ret;
-}
-
-
-static krb5_error_code
-krb5_fcc_interpret(context, errnum)
- krb5_context context;
- int errnum;
-{
- register krb5_error_code retval;
- switch (errnum) {
- case ENOENT:
- retval = KRB5_FCC_NOFILE;
- break;
- case EPERM:
- case EACCES:
-#ifdef EISDIR
- case EISDIR: /* Mac doesn't have EISDIR */
-#endif
- case ENOTDIR:
-#ifdef ELOOP
- case ELOOP: /* Bad symlink is like no file. */
-#endif
-#ifdef ETXTBSY
- case ETXTBSY:
-#endif
- case EBUSY:
- case EROFS:
- retval = KRB5_FCC_PERM;
- break;
- case EINVAL:
- case EEXIST: /* XXX */
- case EFAULT:
- case EBADF:
-#ifdef ENAMETOOLONG
- case ENAMETOOLONG:
-#endif
-#ifdef EWOULDBLOCK
- case EWOULDBLOCK:
-#endif
- retval = KRB5_FCC_INTERNAL;
- break;
-#ifdef EDQUOT
- case EDQUOT:
-#endif
- case ENOSPC:
- case EIO:
- case ENFILE:
- case EMFILE:
- case ENXIO:
- default:
- retval = KRB5_CC_IO; /* XXX */
- }
- return retval;
-}
-
-krb5_cc_ops krb5_scc_ops = {
- 0,
- "STDIO",
- krb5_fcc_get_name,
- krb5_fcc_resolve,
- krb5_fcc_generate_new,
- krb5_fcc_initialize,
- krb5_fcc_destroy,
- krb5_fcc_close,
- krb5_fcc_store,
- krb5_fcc_retrieve,
- krb5_fcc_get_principal,
- krb5_fcc_start_seq_get,
- krb5_fcc_next_cred,
- krb5_fcc_end_seq_get,
- NULL, /* XXX krb5_fcc_remove, */
- krb5_fcc_set_flags,
-};
-
-krb5_cc_ops krb5_cc_stdio_ops = {
- 0,
- "STDIO",
- krb5_fcc_get_name,
- krb5_fcc_resolve,
- krb5_fcc_generate_new,
- krb5_fcc_initialize,
- krb5_fcc_destroy,
- krb5_fcc_close,
- krb5_fcc_store,
- krb5_fcc_retrieve,
- krb5_fcc_get_principal,
- krb5_fcc_start_seq_get,
- krb5_fcc_next_cred,
- krb5_fcc_end_seq_get,
- NULL, /* XXX krb5_fcc_remove, */
- krb5_fcc_set_flags,
-};
diff --git a/src/lib/krb5/ccache/ccdefops.c b/src/lib/krb5/ccache/ccdefops.c
index 092503e..85978e2 100644
--- a/src/lib/krb5/ccache/ccdefops.c
+++ b/src/lib/krb5/ccache/ccdefops.c
@@ -44,19 +44,7 @@ krb5_cc_ops *krb5_cc_dfl_ops = &krb5_cc_stdcc_ops;
#else
-#ifdef HAVE_SYS_TYPES_H
-/* Systems that have <sys/types.h> probably have Unix-like files (off_t,
- for example, which is needed by fcc.h). */
-
-#include "fcc.h" /* From file subdir */
+#include "fcc.h"
krb5_cc_ops *krb5_cc_dfl_ops = &krb5_cc_file_ops;
-#else
-/* Systems that don't have <sys/types.h> probably have stdio anyway. */
-
-#include "scc.h" /* From stdio subdir */
-krb5_cc_ops *krb5_cc_dfl_ops = &krb5_scc_ops;
-
-#endif
-
#endif
generated by cgit v1.1 at 2024-09-09 15:13:24 +0000