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

unlink keyfile on failure, chmod to 400

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6106 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1999-05-03 17:21:48 +00:00
parent c99318a862
commit eceab8ed52
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
kdc/kstash.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 1998, 1999 Kungliga Tekniska H<>gskolan * Copyright (c) 1997-1999 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -14,12 +14,7 @@
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* 3. All advertising materials mentioning features or use of this software * 3. Neither the name of the Institute nor the names of its contributors
* must display the following acknowledgement:
* This product includes software developed by Kungliga Tekniska
* H<>gskolan and its contributors.
*
* 4. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software * may be used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *
@@ -78,9 +73,13 @@ write_keyfile(EncryptionKey key)
sizeof(buf), &key, &len); sizeof(buf), &key, &len);
fwrite(buf + sizeof(buf) - len, len, 1, f); fwrite(buf + sizeof(buf) - len, len, 1, f);
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
if(ferror(f)) if(ferror(f)) {
krb5_err(context, 1, errno, "%s", keyfile); int e = errno;
unlink(keyfile);
krb5_err(context, 1, e, "%s", keyfile);
}
fclose(f); fclose(f);
chmod(keyfile, 0400);
} }
static int static int
@@ -164,7 +163,7 @@ main(int argc, char **argv)
exit(convert_file()); exit(convert_file());
key.keytype = ETYPE_DES_CBC_MD5; /* XXX */ key.keytype = ETYPE_DES_CBC_MD5; /* XXX */
if(v4_keyfile){ if(v4_keyfile) {
f = fopen(v4_keyfile, "r"); f = fopen(v4_keyfile, "r");
if(f == NULL) if(f == NULL)
krb5_err(context, 1, errno, "fopen(%s)", v4_keyfile); krb5_err(context, 1, errno, "fopen(%s)", v4_keyfile);
@@ -172,7 +171,7 @@ main(int argc, char **argv)
key.keyvalue.data = malloc(key.keyvalue.length); key.keyvalue.data = malloc(key.keyvalue.length);
fread(key.keyvalue.data, 1, key.keyvalue.length, f); fread(key.keyvalue.data, 1, key.keyvalue.length, f);
fclose(f); fclose(f);
}else{ } else {
krb5_salt salt; krb5_salt salt;
salt.salttype = KRB5_PW_SALT; salt.salttype = KRB5_PW_SALT;
/* XXX better value? */ /* XXX better value? */