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

(akf_add_entry): don't create the file before we need to write to it

Browse Source 
(from Åke Sandgren)


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10838 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2002-02-15 14:32:52 +00:00
parent cbcb1ea7aa
commit f5fea2deb2
1 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
lib/krb5/keytab_keyfile.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 - 2001 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2002 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -286,6 +286,13 @@ akf_add_entry(krb5_context context,
struct akf_data *d = id->data; struct akf_data *d = id->data;
int fd, created = 0; int fd, created = 0;
krb5_error_code ret; krb5_error_code ret;
int32_t len;
krb5_storage *sp;
if (entry->keyblock.keyvalue.length != 8
|| entry->keyblock.keytype != ETYPE_DES_CBC_MD5)
return 0;
fd = open (d->filename, O_RDWR | O_BINARY); fd = open (d->filename, O_RDWR | O_BINARY);
if (fd < 0) { if (fd < 0) {
@@ -300,38 +307,15 @@ akf_add_entry(krb5_context context,
created = 1; created = 1;
} }
if (entry->keyblock.keyvalue.length == 8 sp = krb5_storage_from_fd(fd);
&& entry->keyblock.keytype == ETYPE_DES_CBC_MD5) { if(sp == NULL) {
close(fd);
int32_t len; krb5_set_error_string (context, "malloc: out of memory");
krb5_storage *sp; return ENOMEM;
}
sp = krb5_storage_from_fd(fd); if (created)
if(sp == NULL) { len = 0;
close(fd); else {
krb5_set_error_string (context, "malloc: out of memory");
return ENOMEM;
}
if (created)
len = 0;
else {
if((*sp->seek)(sp, 0, SEEK_SET) < 0) {
ret = errno;
krb5_storage_free(sp);
close(fd);
krb5_set_error_string (context, "seek: %s", strerror(ret));
return ret;
}
ret = krb5_ret_int32(sp, &len);
if(ret) {
krb5_storage_free(sp);
close(fd);
return ret;
}
}
len++;
if((*sp->seek)(sp, 0, SEEK_SET) < 0) { if((*sp->seek)(sp, 0, SEEK_SET) < 0) {
ret = errno; ret = errno;
krb5_storage_free(sp); krb5_storage_free(sp);
@@ -340,39 +324,55 @@ akf_add_entry(krb5_context context,
return ret; return ret;
} }
ret = krb5_store_int32(sp, len); ret = krb5_ret_int32(sp, &len);
if(ret) { if(ret) {
krb5_storage_free(sp); krb5_storage_free(sp);
close(fd); close(fd);
return ret; return ret;
} }
if((*sp->seek)(sp, (len - 1) * (8 + 4), SEEK_CUR) < 0) {
ret = errno;
krb5_storage_free(sp);
close(fd);
krb5_set_error_string (context, "seek: %s", strerror(ret));
return ret;
}
ret = krb5_store_int32(sp, entry->vno);
if(ret) {
krb5_storage_free(sp);
close(fd);
return ret;
}
ret = sp->store(sp, entry->keyblock.keyvalue.data,
entry->keyblock.keyvalue.length);
if(ret != entry->keyblock.keyvalue.length) {
krb5_storage_free(sp);
close(fd);
if(ret < 0)
return errno;
return ENOTTY;
}
krb5_storage_free(sp);
} }
len++;
if((*sp->seek)(sp, 0, SEEK_SET) < 0) {
ret = errno;
krb5_storage_free(sp);
close(fd);
krb5_set_error_string (context, "seek: %s", strerror(ret));
return ret;
}
ret = krb5_store_int32(sp, len);
if(ret) {
krb5_storage_free(sp);
close(fd);
return ret;
}
if((*sp->seek)(sp, (len - 1) * (8 + 4), SEEK_CUR) < 0) {
ret = errno;
krb5_storage_free(sp);
close(fd);
krb5_set_error_string (context, "seek: %s", strerror(ret));
return ret;
}
ret = krb5_store_int32(sp, entry->vno);
if(ret) {
krb5_storage_free(sp);
close(fd);
return ret;
}
ret = sp->store(sp, entry->keyblock.keyvalue.data,
entry->keyblock.keyvalue.length);
if(ret != entry->keyblock.keyvalue.length) {
krb5_storage_free(sp);
close(fd);
if(ret < 0)
return errno;
return ENOTTY;
}
krb5_storage_free(sp);
close (fd); close (fd);
return 0; return 0;
} }