oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Removed some warnings

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@874 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1996-10-21 23:12:23 +00:00
parent a9a0d3bd65
commit d7827cfb24
8 changed files with 528 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

510
cache.c
View File

@@ -5,9 +5,9 @@
void krb5_free_ccache(krb5_context context, void krb5_free_ccache(krb5_context context,
krb5_ccache val) krb5_ccache val)
{ {
free(((krb5_fcache*)(val->data.data))->filename); free(((krb5_fcache*)(val->data.data))->filename);
krb5_data_free (&val->data); krb5_data_free (&val->data);
free(val); free(val);
} }
@@ -16,38 +16,38 @@ krb5_cc_resolve(krb5_context context,
const char *residual, const char *residual,
krb5_ccache *id) krb5_ccache *id)
{ {
krb5_ccache p; krb5_ccache p;
krb5_fcache *f; krb5_fcache *f;
if(strncmp(residual, "FILE:", 5)){ if(strncmp(residual, "FILE:", 5)){
return -1; return -1;
} }
p = ALLOC(1, krb5_ccache_data); p = ALLOC(1, krb5_ccache_data);
if(!p) if(!p)
return ENOMEM; return ENOMEM;
f = ALLOC(1, krb5_fcache); f = ALLOC(1, krb5_fcache);
if(!f){ if(!f){
free(p); free(p);
return ENOMEM; return ENOMEM;
} }
f->filename = strdup(residual + 5); f->filename = strdup(residual + 5);
if(!f->filename){ if(!f->filename){
free(f); free(f);
free(p); free(p);
return ENOMEM; return ENOMEM;
} }
p->data.data = f; p->data.data = f;
p->data.length = sizeof(*f); p->data.length = sizeof(*f);
p->type = 1; p->type = 1;
*id = p; *id = p;
return 0; return 0;
} }
#if 0 #if 0
@@ -70,20 +70,20 @@ char*
krb5_cc_get_name(krb5_context context, krb5_cc_get_name(krb5_context context,
krb5_ccache id) krb5_ccache id)
{ {
return ((krb5_fcache*)(id->data.data))->filename; return ((krb5_fcache*)(id->data.data))->filename;
} }
char* char*
krb5_cc_default_name(krb5_context context) krb5_cc_default_name(krb5_context context)
{ {
static char name[1024]; static char name[1024];
char *p; char *p;
p = getenv("KRB5CCNAME"); p = getenv("KRB5CCNAME");
if(p) if(p)
strcpy(name, p); strcpy(name, p);
else else
sprintf(name, "FILE:/tmp/krb5cc_%d", getuid()); sprintf(name, "FILE:/tmp/krb5cc_%d", getuid());
return name; return name;
} }
@@ -93,249 +93,271 @@ krb5_error_code
krb5_cc_default(krb5_context context, krb5_cc_default(krb5_context context,
krb5_ccache *id) krb5_ccache *id)
{ {
return krb5_cc_resolve(context, return krb5_cc_resolve(context,
krb5_cc_default_name(context), krb5_cc_default_name(context),
id); id);
} }
static krb5_error_code static krb5_error_code
store_int32(int fd, store_int32(int fd,
int32_t value) int32_t value)
{ {
int ret; int ret;
value = htonl(value); value = htonl(value);
ret = write(fd, &value, sizeof(value)); ret = write(fd, &value, sizeof(value));
if (ret != sizeof(value)) if (ret != sizeof(value))
return (ret<0)?errno:-1; return (ret<0)?errno:-1;
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
ret_int32(int fd, ret_int32(int fd,
int32_t *value) int32_t *value)
{ {
int32_t v; int32_t v;
int ret; int ret;
ret = read(fd, &v, sizeof(v)); ret = read(fd, &v, sizeof(v));
if(ret != sizeof(v)) if(ret != sizeof(v))
return (ret<0)?errno:-1; /* XXX */ return (ret<0)?errno:-1; /* XXX */
*value = ntohl(v); *value = ntohl(v);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
store_int16(int fd, store_int16(int fd,
int16_t value) int16_t value)
{ {
int ret; int ret;
value = htons(value); value = htons(value);
ret = write(fd, &value, sizeof(value)); ret = write(fd, &value, sizeof(value));
if (ret != sizeof(value)) if (ret != sizeof(value))
return (ret<0)?errno:-1; return (ret<0)?errno:-1;
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
ret_int16(int fd, ret_int16(int fd,
int16_t *value) int16_t *value)
{ {
int16_t v; int16_t v;
int ret; int ret;
ret = read(fd, &v, sizeof(v)); ret = read(fd, &v, sizeof(v));
if(ret != sizeof(v)) if(ret != sizeof(v))
return (ret<0)?errno:-1; /* XXX */ return (ret<0)?errno:-1; /* XXX */
*value = ntohs(v); *value = ntohs(v);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
store_int8(int fd, store_int8(int fd,
int8_t value) int8_t value)
{ {
int ret; int ret;
ret = write(fd, &value, sizeof(value)); ret = write(fd, &value, sizeof(value));
if (ret != sizeof(value)) if (ret != sizeof(value))
return (ret<0)?errno:-1; return (ret<0)?errno:-1;
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
ret_int8(int fd, ret_int8(int fd,
int8_t *value) int8_t *value)
{ {
int ret; int ret;
ret = read (fd, value, sizeof(*value)); ret = read (fd, value, sizeof(*value));
if (ret != sizeof(*value)) if (ret != sizeof(*value))
return (ret<0)?errno:-1; return (ret<0)?errno:-1;
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
store_data(int fd, store_data(int fd,
krb5_data data) krb5_data data)
{ {
int ret; int ret;
ret = store_int32(fd, data.length); ret = store_int32(fd, data.length);
if(ret < 0) if(ret < 0)
return ret; return ret;
return write(fd, data.data, data.length); return write(fd, data.data, data.length);
} }
static krb5_error_code static krb5_error_code
ret_data(int fd, ret_data(int fd,
krb5_data *data) krb5_data *data)
{ {
int ret; int ret;
int size; int size;
ret = ret_int32(fd, &size); ret = ret_int32(fd, &size);
data->length = size; data->length = size;
data->data = malloc(size); data->data = malloc(size);
ret = read(fd, data->data, size); ret = read(fd, data->data, size);
if(ret != size) if(ret != size)
return (ret < 0)? errno : -1; /* XXX */ return (ret < 0)? errno : -1; /* XXX */
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
store_principal(int fd, store_principal(int fd,
krb5_principal p) krb5_principal p)
{ {
int i; int i;
store_int32(fd, p->type); store_int32(fd, p->type);
store_int32(fd, p->ncomp); store_int32(fd, p->ncomp);
store_data(fd, p->realm); store_data(fd, p->realm);
for(i = 0; i < p->ncomp; i++) for(i = 0; i < p->ncomp; i++)
store_data(fd, p->comp[i]); store_data(fd, p->comp[i]);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
ret_principal(int fd, ret_principal(int fd,
krb5_principal *princ) krb5_principal *princ)
{ {
int i; int i;
krb5_principal p; krb5_principal p;
p = ALLOC(1, krb5_principal_data); p = ALLOC(1, krb5_principal_data);
if(ret_int32(fd, &p->type)) if(ret_int32(fd, &p->type))
return -1; return -1;
ret_int32(fd, &p->ncomp); ret_int32(fd, &p->ncomp);
ret_data(fd, &p->realm); ret_data(fd, &p->realm);
p->comp = ALLOC(p->ncomp, krb5_data); p->comp = ALLOC(p->ncomp, krb5_data);
for(i = 0; i < p->ncomp; i++) for(i = 0; i < p->ncomp; i++)
ret_data(fd, &p->comp[i]); ret_data(fd, &p->comp[i]);
*princ = p; *princ = p;
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
store_keyblock(int fd, krb5_keyblock p) store_keyblock(int fd, krb5_keyblock p)
{ {
store_int32(fd, p.keytype); store_int32(fd, p.keytype);
store_data(fd, p.contents); store_data(fd, p.contents);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
ret_keyblock(int fd, krb5_keyblock *p) ret_keyblock(int fd, krb5_keyblock *p)
{ {
ret_int32(fd, (int32_t*)&p->keytype); ret_int32(fd, (int32_t*)&p->keytype);
ret_data(fd, &p->contents); ret_data(fd, &p->contents);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
store_times(int fd, krb5_times times) store_times(int fd, krb5_times times)
{ {
store_int32(fd, times.authtime); store_int32(fd, times.authtime);
store_int32(fd, times.starttime); store_int32(fd, times.starttime);
store_int32(fd, times.endtime); store_int32(fd, times.endtime);
store_int32(fd, times.renew_till); store_int32(fd, times.renew_till);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
ret_times(int fd, krb5_times *times) ret_times(int fd, krb5_times *times)
{ {
ret_int32(fd, &times->authtime); ret_int32(fd, &times->authtime);
ret_int32(fd, &times->starttime); ret_int32(fd, &times->starttime);
ret_int32(fd, &times->endtime); ret_int32(fd, &times->endtime);
ret_int32(fd, &times->renew_till); ret_int32(fd, &times->renew_till);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
store_address(int fd, krb5_address p) store_address(int fd, krb5_address p)
{ {
store_int32(fd, p.type); store_int32(fd, p.type);
store_data(fd, p.address); store_data(fd, p.address);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
ret_address(int fd, krb5_address *adr) ret_address(int fd, krb5_address *adr)
{ {
ret_int32(fd, (int32_t*)&adr->type); ret_int32(fd, (int32_t*)&adr->type);
ret_data(fd, &adr->address); ret_data(fd, &adr->address);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
store_addrs(int fd, krb5_addresses p) store_addrs(int fd, krb5_addresses p)
{ {
int i; int i;
store_int32(fd, p.number); store_int32(fd, p.number);
for(i = 0; i<p.number; i++) for(i = 0; i<p.number; i++)
store_address(fd, p.addrs[i]); store_address(fd, p.addrs[i]);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
ret_addrs(int fd, krb5_addresses *adr) ret_addrs(int fd, krb5_addresses *adr)
{ {
int i; int i;
ret_int32(fd, &adr->number); ret_int32(fd, &adr->number);
adr->addrs = ALLOC(adr->number, krb5_address); adr->addrs = ALLOC(adr->number, krb5_address);
for(i = 0; i < adr->number; i++) for(i = 0; i < adr->number; i++)
ret_address(fd, &adr->addrs[i]); ret_address(fd, &adr->addrs[i]);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
store_ticket(int fd, krb5_ticket p) store_ticket(int fd, krb5_ticket p)
{ {
int i; store_data(fd, p.enc_part);
store_data(fd, p.enc_part); return 0;
return 0;
} }
static krb5_error_code static krb5_error_code
ret_ticket(int fd, krb5_ticket *tkt) ret_ticket(int fd, krb5_ticket *tkt)
{ {
int i; ret_data(fd, &tkt->enc_part);
ret_data(fd, &tkt->enc_part); return 0;
return 0;
} }
static krb5_error_code static krb5_error_code
store_authdata(int fd, krb5_data p) store_authdata(int fd, krb5_data p)
{ {
store_data(fd, p); store_data(fd, p);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
ret_authdata(int fd, krb5_data *auth) ret_authdata(int fd, krb5_data *auth)
{ {
ret_data(fd, auth); ret_data(fd, auth);
return 0; return 0;
}
krb5_error_code
erase_file(const char *filename)
{
int fd;
off_t pos;
char *p;
fd = open(filename, O_RDWR);
if(fd < 0)
if(errno == ENOENT)
return 0;
else
return errno;
pos = lseek(fd, 0, SEEK_END);
lseek(fd, 0, SEEK_SET);
p = (char*) malloc(pos);
memset(p, 0, pos);
write(fd, p, pos);
free(p);
close(fd);
unlink(filename);
return 0;
} }
krb5_error_code krb5_error_code
@@ -343,70 +365,48 @@ krb5_cc_initialize(krb5_context context,
krb5_ccache id, krb5_ccache id,
krb5_principal primary_principal) krb5_principal primary_principal)
{ {
char cc[1024]; int ret;
char *p; int fd;
int ret;
int fd;
char *f; char *f;
f = krb5_cc_get_name(context, id); f = krb5_cc_get_name(context, id);
if(ret = erase_file(f)) if((ret = erase_file(f)))
return ret; return ret;
fd = open(f, O_RDWR | O_CREAT | O_EXCL, 0600); fd = open(f, O_RDWR | O_CREAT | O_EXCL, 0600);
if(fd == -1) if(fd == -1)
return errno; return errno;
store_int16(fd, 0x503); store_int16(fd, 0x503);
store_principal(fd, primary_principal); store_principal(fd, primary_principal);
close(fd); close(fd);
return 0; return 0;
} }
krb5_error_code
erase_file(const char *filename)
{
int fd;
off_t pos;
fd = open(filename, O_RDWR);
if(fd < 0)
if(errno == ENOENT)
return 0;
else
return errno;
pos = lseek(fd, 0, SEEK_END);
lseek(fd, 0, SEEK_SET);
for(; pos > 0; pos -= 16)
write(fd, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 16);
close(fd);
unlink(filename);
return 0;
}
krb5_error_code krb5_error_code
krb5_cc_destroy(krb5_context context, krb5_cc_destroy(krb5_context context,
krb5_ccache id) krb5_ccache id)
{ {
char *f; char *f;
int ret; int ret;
f = krb5_cc_get_name(context, id); f = krb5_cc_get_name(context, id);
ret = erase_file(f); ret = erase_file(f);
krb5_free_ccache(context, id); krb5_free_ccache(context, id);
return ret; return ret;
} }
krb5_error_code krb5_error_code
krb5_cc_close(krb5_context context, krb5_cc_close(krb5_context context,
krb5_ccache id) krb5_ccache id)
{ {
krb5_data_free (&id->data); krb5_data_free (&id->data);
free(id); free(id);
return 0; return 0;
} }
krb5_error_code krb5_error_code
@@ -414,45 +414,45 @@ krb5_cc_store_cred(krb5_context context,
krb5_ccache id, krb5_ccache id,
krb5_creds *creds) krb5_creds *creds)
{ {
int fd; int fd;
krb5_fcache *f; krb5_fcache *f;
f = (krb5_fcache *)id->data.data; f = (krb5_fcache *)id->data.data;
fd = open(f->filename, O_WRONLY | O_APPEND); fd = open(f->filename, O_WRONLY | O_APPEND);
if(fd < 0) if(fd < 0)
return errno; return errno;
store_principal(fd, creds->client); store_principal(fd, creds->client);
store_principal(fd, creds->server); store_principal(fd, creds->server);
store_keyblock(fd, creds->session); store_keyblock(fd, creds->session);
store_times(fd, creds->times); store_times(fd, creds->times);
store_int8(fd, 0); /* s/key */ store_int8(fd, 0); /* s/key */
store_int32(fd, 0); /* flags */ store_int32(fd, 0); /* flags */
store_addrs(fd, creds->addresses); store_addrs(fd, creds->addresses);
store_authdata(fd, creds->authdata); store_authdata(fd, creds->authdata);
store_ticket(fd, creds->ticket); store_ticket(fd, creds->ticket);
store_ticket(fd, creds->second_ticket); store_ticket(fd, creds->second_ticket);
close(fd); close(fd);
return 0; return 0; /* XXX */
} }
static krb5_error_code static krb5_error_code
krb5_cc_read_cred (int fd, krb5_cc_read_cred (int fd,
krb5_creds *creds) krb5_creds *creds)
{ {
int8_t dummy8; int8_t dummy8;
int32_t dummy32; int32_t dummy32;
return ret_principal (fd, &creds->client) || return ret_principal (fd, &creds->client) ||
ret_principal (fd, &creds->server) || ret_principal (fd, &creds->server) ||
ret_keyblock (fd, &creds->session) || ret_keyblock (fd, &creds->session) ||
ret_times (fd, &creds->times) || ret_times (fd, &creds->times) ||
ret_int8 (fd, &dummy8) || ret_int8 (fd, &dummy8) ||
ret_int32 (fd, &dummy32) || ret_int32 (fd, &dummy32) ||
ret_addrs (fd, &creds->addresses) || ret_addrs (fd, &creds->addresses) ||
ret_authdata (fd, &creds->authdata) || ret_authdata (fd, &creds->authdata) ||
ret_ticket (fd, &creds->ticket) || ret_ticket (fd, &creds->ticket) ||
ret_ticket (fd, &creds->second_ticket); ret_ticket (fd, &creds->second_ticket);
} }
krb5_error_code krb5_error_code
@@ -462,7 +462,7 @@ krb5_cc_retrieve_cred(krb5_context context,
krb5_creds *mcreds, krb5_creds *mcreds,
krb5_creds *creds) krb5_creds *creds)
{ {
return 0; /* XXX */
} }
krb5_error_code krb5_error_code
@@ -470,17 +470,16 @@ krb5_cc_get_principal(krb5_context context,
krb5_ccache id, krb5_ccache id,
krb5_principal *principal) krb5_principal *principal)
{ {
int fd; int fd;
char *f; int16_t tag;
int16_t tag;
fd = open(krb5_cc_get_name(context, id), O_RDONLY); fd = open(krb5_cc_get_name(context, id), O_RDONLY);
if(fd < 0) if(fd < 0)
return errno; return errno;
ret_int16(fd, &tag); ret_int16(fd, &tag);
ret_principal(fd, principal); ret_principal(fd, principal);
close(fd); close(fd);
return 0; return 0;
} }
krb5_error_code krb5_error_code
@@ -488,18 +487,18 @@ krb5_cc_start_seq_get (krb5_context context,
krb5_ccache id, krb5_ccache id,
krb5_cc_cursor *cursor) krb5_cc_cursor *cursor)
{ {
int16_t tag; int16_t tag;
krb5_principal principal; krb5_principal principal;
if (id->type != 1) if (id->type != 1)
abort (); abort ();
cursor->fd = open (krb5_cc_get_name (context, id), O_RDONLY); cursor->fd = open (krb5_cc_get_name (context, id), O_RDONLY);
if (cursor->fd < 0) if (cursor->fd < 0)
return errno; return errno;
ret_int16 (cursor->fd, &tag); ret_int16 (cursor->fd, &tag);
ret_principal (cursor->fd, &principal); ret_principal (cursor->fd, &principal);
krb5_free_principal (principal); krb5_free_principal (principal);
return 0; return 0;
} }
krb5_error_code krb5_error_code
@@ -508,9 +507,9 @@ krb5_cc_next_cred (krb5_context context,
krb5_creds *creds, krb5_creds *creds,
krb5_cc_cursor *cursor) krb5_cc_cursor *cursor)
{ {
if (id->type != 1) if (id->type != 1)
abort (); abort ();
return krb5_cc_read_cred (cursor->fd, creds); return krb5_cc_read_cred (cursor->fd, creds);
} }
krb5_error_code krb5_error_code
@@ -518,9 +517,9 @@ krb5_cc_end_seq_get (krb5_context context,
krb5_ccache id, krb5_ccache id,
krb5_cc_cursor *cursor) krb5_cc_cursor *cursor)
{ {
if (id->type != 1) if (id->type != 1)
abort (); abort ();
return close (cursor->fd); return close (cursor->fd);
} }
krb5_error_code krb5_error_code
@@ -528,6 +527,7 @@ krb5_cc_get_first(krb5_context context,
krb5_ccache id, krb5_ccache id,
krb5_cc_cursor *cursor) krb5_cc_cursor *cursor)
{ {
return 0; /* XXX */
} }
krb5_error_code krb5_error_code
@@ -536,6 +536,7 @@ krb5_cc_get_next(krb5_context context,
krb5_creds *creds, krb5_creds *creds,
krb5_cc_cursor *cursor) krb5_cc_cursor *cursor)
{ {
return 0; /* XXX */
} }
krb5_error_code krb5_error_code
@@ -543,6 +544,7 @@ krb5_cc_end_get(krb5_context context,
krb5_ccache id, krb5_ccache id,
krb5_cc_cursor *cursor) krb5_cc_cursor *cursor)
{ {
return 0; /* XXX */
} }
krb5_error_code krb5_error_code
@@ -551,6 +553,7 @@ krb5_cc_remove_cred(krb5_context context,
krb5_flags which, krb5_flags which,
krb5_creds *cred) krb5_creds *cred)
{ {
return 0; /* XXX */
} }
krb5_error_code krb5_error_code
@@ -558,5 +561,6 @@ krb5_cc_set_flags(krb5_context context,
krb5_ccache id, krb5_ccache id,
krb5_flags flags) krb5_flags flags)
{ {
return 0; /* XXX */
} }

5
krbhst.c
View File

@@ -9,7 +9,7 @@ krb5_get_krbhst (krb5_context context,
char buf[BUFSIZ]; char buf[BUFSIZ];
char *val; char *val;
sprintf (buf, "realms %.*s kdc", realm->length, realm->data); sprintf (buf, "realms %.*s kdc", (int)realm->length, (char*)realm->data);
err = krb5_get_config_tag (context->cf, buf, &val); err = krb5_get_config_tag (context->cf, buf, &val);
if (err) if (err)
return err; return err;
@@ -23,5 +23,6 @@ krb5_error_code
krb5_free_krbhst (krb5_context context, krb5_free_krbhst (krb5_context context,
char *const *hostlist) char *const *hostlist)
{ {
free (hostlist); free ((void*)hostlist);
return 0; /* XXX */
} }

510
lib/krb5/cache.c
View File

@@ -5,9 +5,9 @@
void krb5_free_ccache(krb5_context context, void krb5_free_ccache(krb5_context context,
krb5_ccache val) krb5_ccache val)
{ {
free(((krb5_fcache*)(val->data.data))->filename); free(((krb5_fcache*)(val->data.data))->filename);
krb5_data_free (&val->data); krb5_data_free (&val->data);
free(val); free(val);
} }
@@ -16,38 +16,38 @@ krb5_cc_resolve(krb5_context context,
const char *residual, const char *residual,
krb5_ccache *id) krb5_ccache *id)
{ {
krb5_ccache p; krb5_ccache p;
krb5_fcache *f; krb5_fcache *f;
if(strncmp(residual, "FILE:", 5)){ if(strncmp(residual, "FILE:", 5)){
return -1; return -1;
} }
p = ALLOC(1, krb5_ccache_data); p = ALLOC(1, krb5_ccache_data);
if(!p) if(!p)
return ENOMEM; return ENOMEM;
f = ALLOC(1, krb5_fcache); f = ALLOC(1, krb5_fcache);
if(!f){ if(!f){
free(p); free(p);
return ENOMEM; return ENOMEM;
} }
f->filename = strdup(residual + 5); f->filename = strdup(residual + 5);
if(!f->filename){ if(!f->filename){
free(f); free(f);
free(p); free(p);
return ENOMEM; return ENOMEM;
} }
p->data.data = f; p->data.data = f;
p->data.length = sizeof(*f); p->data.length = sizeof(*f);
p->type = 1; p->type = 1;
*id = p; *id = p;
return 0; return 0;
} }
#if 0 #if 0
@@ -70,20 +70,20 @@ char*
krb5_cc_get_name(krb5_context context, krb5_cc_get_name(krb5_context context,
krb5_ccache id) krb5_ccache id)
{ {
return ((krb5_fcache*)(id->data.data))->filename; return ((krb5_fcache*)(id->data.data))->filename;
} }
char* char*
krb5_cc_default_name(krb5_context context) krb5_cc_default_name(krb5_context context)
{ {
static char name[1024]; static char name[1024];
char *p; char *p;
p = getenv("KRB5CCNAME"); p = getenv("KRB5CCNAME");
if(p) if(p)
strcpy(name, p); strcpy(name, p);
else else
sprintf(name, "FILE:/tmp/krb5cc_%d", getuid()); sprintf(name, "FILE:/tmp/krb5cc_%d", getuid());
return name; return name;
} }
@@ -93,249 +93,271 @@ krb5_error_code
krb5_cc_default(krb5_context context, krb5_cc_default(krb5_context context,
krb5_ccache *id) krb5_ccache *id)
{ {
return krb5_cc_resolve(context, return krb5_cc_resolve(context,
krb5_cc_default_name(context), krb5_cc_default_name(context),
id); id);
} }
static krb5_error_code static krb5_error_code
store_int32(int fd, store_int32(int fd,
int32_t value) int32_t value)
{ {
int ret; int ret;
value = htonl(value); value = htonl(value);
ret = write(fd, &value, sizeof(value)); ret = write(fd, &value, sizeof(value));
if (ret != sizeof(value)) if (ret != sizeof(value))
return (ret<0)?errno:-1; return (ret<0)?errno:-1;
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
ret_int32(int fd, ret_int32(int fd,
int32_t *value) int32_t *value)
{ {
int32_t v; int32_t v;
int ret; int ret;
ret = read(fd, &v, sizeof(v)); ret = read(fd, &v, sizeof(v));
if(ret != sizeof(v)) if(ret != sizeof(v))
return (ret<0)?errno:-1; /* XXX */ return (ret<0)?errno:-1; /* XXX */
*value = ntohl(v); *value = ntohl(v);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
store_int16(int fd, store_int16(int fd,
int16_t value) int16_t value)
{ {
int ret; int ret;
value = htons(value); value = htons(value);
ret = write(fd, &value, sizeof(value)); ret = write(fd, &value, sizeof(value));
if (ret != sizeof(value)) if (ret != sizeof(value))
return (ret<0)?errno:-1; return (ret<0)?errno:-1;
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
ret_int16(int fd, ret_int16(int fd,
int16_t *value) int16_t *value)
{ {
int16_t v; int16_t v;
int ret; int ret;
ret = read(fd, &v, sizeof(v)); ret = read(fd, &v, sizeof(v));
if(ret != sizeof(v)) if(ret != sizeof(v))
return (ret<0)?errno:-1; /* XXX */ return (ret<0)?errno:-1; /* XXX */
*value = ntohs(v); *value = ntohs(v);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
store_int8(int fd, store_int8(int fd,
int8_t value) int8_t value)
{ {
int ret; int ret;
ret = write(fd, &value, sizeof(value)); ret = write(fd, &value, sizeof(value));
if (ret != sizeof(value)) if (ret != sizeof(value))
return (ret<0)?errno:-1; return (ret<0)?errno:-1;
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
ret_int8(int fd, ret_int8(int fd,
int8_t *value) int8_t *value)
{ {
int ret; int ret;
ret = read (fd, value, sizeof(*value)); ret = read (fd, value, sizeof(*value));
if (ret != sizeof(*value)) if (ret != sizeof(*value))
return (ret<0)?errno:-1; return (ret<0)?errno:-1;
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
store_data(int fd, store_data(int fd,
krb5_data data) krb5_data data)
{ {
int ret; int ret;
ret = store_int32(fd, data.length); ret = store_int32(fd, data.length);
if(ret < 0) if(ret < 0)
return ret; return ret;
return write(fd, data.data, data.length); return write(fd, data.data, data.length);
} }
static krb5_error_code static krb5_error_code
ret_data(int fd, ret_data(int fd,
krb5_data *data) krb5_data *data)
{ {
int ret; int ret;
int size; int size;
ret = ret_int32(fd, &size); ret = ret_int32(fd, &size);
data->length = size; data->length = size;
data->data = malloc(size); data->data = malloc(size);
ret = read(fd, data->data, size); ret = read(fd, data->data, size);
if(ret != size) if(ret != size)
return (ret < 0)? errno : -1; /* XXX */ return (ret < 0)? errno : -1; /* XXX */
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
store_principal(int fd, store_principal(int fd,
krb5_principal p) krb5_principal p)
{ {
int i; int i;
store_int32(fd, p->type); store_int32(fd, p->type);
store_int32(fd, p->ncomp); store_int32(fd, p->ncomp);
store_data(fd, p->realm); store_data(fd, p->realm);
for(i = 0; i < p->ncomp; i++) for(i = 0; i < p->ncomp; i++)
store_data(fd, p->comp[i]); store_data(fd, p->comp[i]);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
ret_principal(int fd, ret_principal(int fd,
krb5_principal *princ) krb5_principal *princ)
{ {
int i; int i;
krb5_principal p; krb5_principal p;
p = ALLOC(1, krb5_principal_data); p = ALLOC(1, krb5_principal_data);
if(ret_int32(fd, &p->type)) if(ret_int32(fd, &p->type))
return -1; return -1;
ret_int32(fd, &p->ncomp); ret_int32(fd, &p->ncomp);
ret_data(fd, &p->realm); ret_data(fd, &p->realm);
p->comp = ALLOC(p->ncomp, krb5_data); p->comp = ALLOC(p->ncomp, krb5_data);
for(i = 0; i < p->ncomp; i++) for(i = 0; i < p->ncomp; i++)
ret_data(fd, &p->comp[i]); ret_data(fd, &p->comp[i]);
*princ = p; *princ = p;
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
store_keyblock(int fd, krb5_keyblock p) store_keyblock(int fd, krb5_keyblock p)
{ {
store_int32(fd, p.keytype); store_int32(fd, p.keytype);
store_data(fd, p.contents); store_data(fd, p.contents);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
ret_keyblock(int fd, krb5_keyblock *p) ret_keyblock(int fd, krb5_keyblock *p)
{ {
ret_int32(fd, (int32_t*)&p->keytype); ret_int32(fd, (int32_t*)&p->keytype);
ret_data(fd, &p->contents); ret_data(fd, &p->contents);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
store_times(int fd, krb5_times times) store_times(int fd, krb5_times times)
{ {
store_int32(fd, times.authtime); store_int32(fd, times.authtime);
store_int32(fd, times.starttime); store_int32(fd, times.starttime);
store_int32(fd, times.endtime); store_int32(fd, times.endtime);
store_int32(fd, times.renew_till); store_int32(fd, times.renew_till);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
ret_times(int fd, krb5_times *times) ret_times(int fd, krb5_times *times)
{ {
ret_int32(fd, &times->authtime); ret_int32(fd, &times->authtime);
ret_int32(fd, &times->starttime); ret_int32(fd, &times->starttime);
ret_int32(fd, &times->endtime); ret_int32(fd, &times->endtime);
ret_int32(fd, &times->renew_till); ret_int32(fd, &times->renew_till);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
store_address(int fd, krb5_address p) store_address(int fd, krb5_address p)
{ {
store_int32(fd, p.type); store_int32(fd, p.type);
store_data(fd, p.address); store_data(fd, p.address);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
ret_address(int fd, krb5_address *adr) ret_address(int fd, krb5_address *adr)
{ {
ret_int32(fd, (int32_t*)&adr->type); ret_int32(fd, (int32_t*)&adr->type);
ret_data(fd, &adr->address); ret_data(fd, &adr->address);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
store_addrs(int fd, krb5_addresses p) store_addrs(int fd, krb5_addresses p)
{ {
int i; int i;
store_int32(fd, p.number); store_int32(fd, p.number);
for(i = 0; i<p.number; i++) for(i = 0; i<p.number; i++)
store_address(fd, p.addrs[i]); store_address(fd, p.addrs[i]);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
ret_addrs(int fd, krb5_addresses *adr) ret_addrs(int fd, krb5_addresses *adr)
{ {
int i; int i;
ret_int32(fd, &adr->number); ret_int32(fd, &adr->number);
adr->addrs = ALLOC(adr->number, krb5_address); adr->addrs = ALLOC(adr->number, krb5_address);
for(i = 0; i < adr->number; i++) for(i = 0; i < adr->number; i++)
ret_address(fd, &adr->addrs[i]); ret_address(fd, &adr->addrs[i]);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
store_ticket(int fd, krb5_ticket p) store_ticket(int fd, krb5_ticket p)
{ {
int i; store_data(fd, p.enc_part);
store_data(fd, p.enc_part); return 0;
return 0;
} }
static krb5_error_code static krb5_error_code
ret_ticket(int fd, krb5_ticket *tkt) ret_ticket(int fd, krb5_ticket *tkt)
{ {
int i; ret_data(fd, &tkt->enc_part);
ret_data(fd, &tkt->enc_part); return 0;
return 0;
} }
static krb5_error_code static krb5_error_code
store_authdata(int fd, krb5_data p) store_authdata(int fd, krb5_data p)
{ {
store_data(fd, p); store_data(fd, p);
return 0; return 0;
} }
static krb5_error_code static krb5_error_code
ret_authdata(int fd, krb5_data *auth) ret_authdata(int fd, krb5_data *auth)
{ {
ret_data(fd, auth); ret_data(fd, auth);
return 0; return 0;
}
krb5_error_code
erase_file(const char *filename)
{
int fd;
off_t pos;
char *p;
fd = open(filename, O_RDWR);
if(fd < 0)
if(errno == ENOENT)
return 0;
else
return errno;
pos = lseek(fd, 0, SEEK_END);
lseek(fd, 0, SEEK_SET);
p = (char*) malloc(pos);
memset(p, 0, pos);
write(fd, p, pos);
free(p);
close(fd);
unlink(filename);
return 0;
} }
krb5_error_code krb5_error_code
@@ -343,70 +365,48 @@ krb5_cc_initialize(krb5_context context,
krb5_ccache id, krb5_ccache id,
krb5_principal primary_principal) krb5_principal primary_principal)
{ {
char cc[1024]; int ret;
char *p; int fd;
int ret;
int fd;
char *f; char *f;
f = krb5_cc_get_name(context, id); f = krb5_cc_get_name(context, id);
if(ret = erase_file(f)) if((ret = erase_file(f)))
return ret; return ret;
fd = open(f, O_RDWR | O_CREAT | O_EXCL, 0600); fd = open(f, O_RDWR | O_CREAT | O_EXCL, 0600);
if(fd == -1) if(fd == -1)
return errno; return errno;
store_int16(fd, 0x503); store_int16(fd, 0x503);
store_principal(fd, primary_principal); store_principal(fd, primary_principal);
close(fd); close(fd);
return 0; return 0;
} }
krb5_error_code
erase_file(const char *filename)
{
int fd;
off_t pos;
fd = open(filename, O_RDWR);
if(fd < 0)
if(errno == ENOENT)
return 0;
else
return errno;
pos = lseek(fd, 0, SEEK_END);
lseek(fd, 0, SEEK_SET);
for(; pos > 0; pos -= 16)
write(fd, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 16);
close(fd);
unlink(filename);
return 0;
}
krb5_error_code krb5_error_code
krb5_cc_destroy(krb5_context context, krb5_cc_destroy(krb5_context context,
krb5_ccache id) krb5_ccache id)
{ {
char *f; char *f;
int ret; int ret;
f = krb5_cc_get_name(context, id); f = krb5_cc_get_name(context, id);
ret = erase_file(f); ret = erase_file(f);
krb5_free_ccache(context, id); krb5_free_ccache(context, id);
return ret; return ret;
} }
krb5_error_code krb5_error_code
krb5_cc_close(krb5_context context, krb5_cc_close(krb5_context context,
krb5_ccache id) krb5_ccache id)
{ {
krb5_data_free (&id->data); krb5_data_free (&id->data);
free(id); free(id);
return 0; return 0;
} }
krb5_error_code krb5_error_code
@@ -414,45 +414,45 @@ krb5_cc_store_cred(krb5_context context,
krb5_ccache id, krb5_ccache id,
krb5_creds *creds) krb5_creds *creds)
{ {
int fd; int fd;
krb5_fcache *f; krb5_fcache *f;
f = (krb5_fcache *)id->data.data; f = (krb5_fcache *)id->data.data;
fd = open(f->filename, O_WRONLY | O_APPEND); fd = open(f->filename, O_WRONLY | O_APPEND);
if(fd < 0) if(fd < 0)
return errno; return errno;
store_principal(fd, creds->client); store_principal(fd, creds->client);
store_principal(fd, creds->server); store_principal(fd, creds->server);
store_keyblock(fd, creds->session); store_keyblock(fd, creds->session);
store_times(fd, creds->times); store_times(fd, creds->times);
store_int8(fd, 0); /* s/key */ store_int8(fd, 0); /* s/key */
store_int32(fd, 0); /* flags */ store_int32(fd, 0); /* flags */
store_addrs(fd, creds->addresses); store_addrs(fd, creds->addresses);
store_authdata(fd, creds->authdata); store_authdata(fd, creds->authdata);
store_ticket(fd, creds->ticket); store_ticket(fd, creds->ticket);
store_ticket(fd, creds->second_ticket); store_ticket(fd, creds->second_ticket);
close(fd); close(fd);
return 0; return 0; /* XXX */
} }
static krb5_error_code static krb5_error_code
krb5_cc_read_cred (int fd, krb5_cc_read_cred (int fd,
krb5_creds *creds) krb5_creds *creds)
{ {
int8_t dummy8; int8_t dummy8;
int32_t dummy32; int32_t dummy32;
return ret_principal (fd, &creds->client) || return ret_principal (fd, &creds->client) ||
ret_principal (fd, &creds->server) || ret_principal (fd, &creds->server) ||
ret_keyblock (fd, &creds->session) || ret_keyblock (fd, &creds->session) ||
ret_times (fd, &creds->times) || ret_times (fd, &creds->times) ||
ret_int8 (fd, &dummy8) || ret_int8 (fd, &dummy8) ||
ret_int32 (fd, &dummy32) || ret_int32 (fd, &dummy32) ||
ret_addrs (fd, &creds->addresses) || ret_addrs (fd, &creds->addresses) ||
ret_authdata (fd, &creds->authdata) || ret_authdata (fd, &creds->authdata) ||
ret_ticket (fd, &creds->ticket) || ret_ticket (fd, &creds->ticket) ||
ret_ticket (fd, &creds->second_ticket); ret_ticket (fd, &creds->second_ticket);
} }
krb5_error_code krb5_error_code
@@ -462,7 +462,7 @@ krb5_cc_retrieve_cred(krb5_context context,
krb5_creds *mcreds, krb5_creds *mcreds,
krb5_creds *creds) krb5_creds *creds)
{ {
return 0; /* XXX */
} }
krb5_error_code krb5_error_code
@@ -470,17 +470,16 @@ krb5_cc_get_principal(krb5_context context,
krb5_ccache id, krb5_ccache id,
krb5_principal *principal) krb5_principal *principal)
{ {
int fd; int fd;
char *f; int16_t tag;
int16_t tag;
fd = open(krb5_cc_get_name(context, id), O_RDONLY); fd = open(krb5_cc_get_name(context, id), O_RDONLY);
if(fd < 0) if(fd < 0)
return errno; return errno;
ret_int16(fd, &tag); ret_int16(fd, &tag);
ret_principal(fd, principal); ret_principal(fd, principal);
close(fd); close(fd);
return 0; return 0;
} }
krb5_error_code krb5_error_code
@@ -488,18 +487,18 @@ krb5_cc_start_seq_get (krb5_context context,
krb5_ccache id, krb5_ccache id,
krb5_cc_cursor *cursor) krb5_cc_cursor *cursor)
{ {
int16_t tag; int16_t tag;
krb5_principal principal; krb5_principal principal;
if (id->type != 1) if (id->type != 1)
abort (); abort ();
cursor->fd = open (krb5_cc_get_name (context, id), O_RDONLY); cursor->fd = open (krb5_cc_get_name (context, id), O_RDONLY);
if (cursor->fd < 0) if (cursor->fd < 0)
return errno; return errno;
ret_int16 (cursor->fd, &tag); ret_int16 (cursor->fd, &tag);
ret_principal (cursor->fd, &principal); ret_principal (cursor->fd, &principal);
krb5_free_principal (principal); krb5_free_principal (principal);
return 0; return 0;
} }
krb5_error_code krb5_error_code
@@ -508,9 +507,9 @@ krb5_cc_next_cred (krb5_context context,
krb5_creds *creds, krb5_creds *creds,
krb5_cc_cursor *cursor) krb5_cc_cursor *cursor)
{ {
if (id->type != 1) if (id->type != 1)
abort (); abort ();
return krb5_cc_read_cred (cursor->fd, creds); return krb5_cc_read_cred (cursor->fd, creds);
} }
krb5_error_code krb5_error_code
@@ -518,9 +517,9 @@ krb5_cc_end_seq_get (krb5_context context,
krb5_ccache id, krb5_ccache id,
krb5_cc_cursor *cursor) krb5_cc_cursor *cursor)
{ {
if (id->type != 1) if (id->type != 1)
abort (); abort ();
return close (cursor->fd); return close (cursor->fd);
} }
krb5_error_code krb5_error_code
@@ -528,6 +527,7 @@ krb5_cc_get_first(krb5_context context,
krb5_ccache id, krb5_ccache id,
krb5_cc_cursor *cursor) krb5_cc_cursor *cursor)
{ {
return 0; /* XXX */
} }
krb5_error_code krb5_error_code
@@ -536,6 +536,7 @@ krb5_cc_get_next(krb5_context context,
krb5_creds *creds, krb5_creds *creds,
krb5_cc_cursor *cursor) krb5_cc_cursor *cursor)
{ {
return 0; /* XXX */
} }
krb5_error_code krb5_error_code
@@ -543,6 +544,7 @@ krb5_cc_end_get(krb5_context context,
krb5_ccache id, krb5_ccache id,
krb5_cc_cursor *cursor) krb5_cc_cursor *cursor)
{ {
return 0; /* XXX */
} }
krb5_error_code krb5_error_code
@@ -551,6 +553,7 @@ krb5_cc_remove_cred(krb5_context context,
krb5_flags which, krb5_flags which,
krb5_creds *cred) krb5_creds *cred)
{ {
return 0; /* XXX */
} }
krb5_error_code krb5_error_code
@@ -558,5 +561,6 @@ krb5_cc_set_flags(krb5_context context,
krb5_ccache id, krb5_ccache id,
krb5_flags flags) krb5_flags flags)
{ {
return 0; /* XXX */
} }

5
lib/krb5/krbhst.c
View File

@@ -9,7 +9,7 @@ krb5_get_krbhst (krb5_context context,
char buf[BUFSIZ]; char buf[BUFSIZ];
char *val; char *val;
sprintf (buf, "realms %.*s kdc", realm->length, realm->data); sprintf (buf, "realms %.*s kdc", (int)realm->length, (char*)realm->data);
err = krb5_get_config_tag (context->cf, buf, &val); err = krb5_get_config_tag (context->cf, buf, &val);
if (err) if (err)
return err; return err;
@@ -23,5 +23,6 @@ krb5_error_code
krb5_free_krbhst (krb5_context context, krb5_free_krbhst (krb5_context context,
char *const *hostlist) char *const *hostlist)
{ {
free (hostlist); free ((void*)hostlist);
return 0; /* XXX */
} }

4
lib/krb5/send_to_kdc.c
View File

@@ -67,7 +67,7 @@ krb5_sendto_kdc (krb5_context context,
} }
for (i = 0; i < 3; ++i) for (i = 0; i < 3; ++i)
for (hp = hostlist; p = *hp; ++hp) { for (hp = hostlist; (p = *hp); ++hp) {
char *addr; char *addr;
char *colon; char *colon;
@@ -77,7 +77,7 @@ krb5_sendto_kdc (krb5_context context,
hostent = gethostbyname (p); hostent = gethostbyname (p);
if (colon) if (colon)
*colon++ = ':'; *colon++ = ':';
while (addr = *hostent->h_addr_list++) { while ((addr = *hostent->h_addr_list++)) {
struct sockaddr_in a; struct sockaddr_in a;
memset (&a, 0, sizeof(a)); memset (&a, 0, sizeof(a));

4
lib/krb5/str2key.c
View File

@@ -119,7 +119,7 @@ krb5_string_to_key (char *str,
for (i = 0; i < len; i += 8) { for (i = 0; i < len; i += 8) {
unsigned char tmp[8]; unsigned char tmp[8];
init (tmp, &s[i]); init (tmp, (unsigned char*)&s[i]);
if (odd == 0) { if (odd == 0) {
odd = 1; odd = 1;
@@ -135,7 +135,7 @@ krb5_string_to_key (char *str,
free (s); free (s);
des_set_odd_parity (&tempkey); des_set_odd_parity (&tempkey);
if (des_is_weak_key (&tempkey)) if (des_is_weak_key (&tempkey))
xor ((char *)&tempkey, "0x000x000x000x000x000x000x000xF0"); xor ((unsigned char *)&tempkey, (unsigned char*)"0x000x000x000x000x000x000x000xF0");
memcpy (key->contents.data, &tempkey, sizeof(tempkey)); memcpy (key->contents.data, &tempkey, sizeof(tempkey));
return 0; return 0;
} }

4
send_to_kdc.c
View File

@@ -67,7 +67,7 @@ krb5_sendto_kdc (krb5_context context,
} }
for (i = 0; i < 3; ++i) for (i = 0; i < 3; ++i)
for (hp = hostlist; p = *hp; ++hp) { for (hp = hostlist; (p = *hp); ++hp) {
char *addr; char *addr;
char *colon; char *colon;
@@ -77,7 +77,7 @@ krb5_sendto_kdc (krb5_context context,
hostent = gethostbyname (p); hostent = gethostbyname (p);
if (colon) if (colon)
*colon++ = ':'; *colon++ = ':';
while (addr = *hostent->h_addr_list++) { while ((addr = *hostent->h_addr_list++)) {
struct sockaddr_in a; struct sockaddr_in a;
memset (&a, 0, sizeof(a)); memset (&a, 0, sizeof(a));

4
str2key.c
View File

@@ -119,7 +119,7 @@ krb5_string_to_key (char *str,
for (i = 0; i < len; i += 8) { for (i = 0; i < len; i += 8) {
unsigned char tmp[8]; unsigned char tmp[8];
init (tmp, &s[i]); init (tmp, (unsigned char*)&s[i]);
if (odd == 0) { if (odd == 0) {
odd = 1; odd = 1;
@@ -135,7 +135,7 @@ krb5_string_to_key (char *str,
free (s); free (s);
des_set_odd_parity (&tempkey); des_set_odd_parity (&tempkey);
if (des_is_weak_key (&tempkey)) if (des_is_weak_key (&tempkey))
xor ((char *)&tempkey, "0x000x000x000x000x000x000x000xF0"); xor ((unsigned char *)&tempkey, (unsigned char*)"0x000x000x000x000x000x000x000xF0");
memcpy (key->contents.data, &tempkey, sizeof(tempkey)); memcpy (key->contents.data, &tempkey, sizeof(tempkey));
return 0; return 0;
} }