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

Formatting: unnecessary lines and trailing whitespace.

Browse Source
This commit is contained in:
Roland C. Dowdeswell
2012-05-22 23:08:18 +01:00
parent e41ff9c0f5
commit 2a27d50fa1
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/hdb/db3.c
View File

@@ -69,7 +69,7 @@ DB_close(krb5_context context, HDB *db)
db->hdb_dbc = 0; db->hdb_dbc = 0;
(*d->close)(d, 0); (*d->close)(d, 0);
db->hdb_db = 0; db->hdb_db = 0;
if (db3->lock_fd >= 0) { if (db3->lock_fd >= 0) {
close(db3->lock_fd); close(db3->lock_fd);
db3->lock_fd = -1; db3->lock_fd = -1;
@@ -265,11 +265,11 @@ _open_db(DB *d, char *fn, int myflags, int flags, mode_t mode, int *fd)
if (*fd == -1) if (*fd == -1)
return errno; return errno;
/* /*
* Without DB_FCNTL_LOCKING, the DB library complains when initializing * Without DB_FCNTL_LOCKING, the DB library complains when initializing
* a database in an empty file. Since the database is our lock file, * a database in an empty file. Since the database is our lock file,
* we create it before Berkeley DB does, so a new DB always starts empty. * we create it before Berkeley DB does, so a new DB always starts empty.
*/ */
myflags |= DB_FCNTL_LOCKING; myflags |= DB_FCNTL_LOCKING;
ret = flock(*fd, (myflags&DB_RDONLY) ? LOCK_SH : LOCK_EX); ret = flock(*fd, (myflags&DB_RDONLY) ? LOCK_SH : LOCK_EX);

3
lib/hdb/print.c
View File

@@ -157,7 +157,6 @@ append_mit_key(krb5_context context, krb5_storage *sp,
krb5_data keylenbytes; krb5_data keylenbytes;
unsigned int salttype; unsigned int salttype;
sz = append_string(context, sp, "\t%u\t%u\t%d\t%d\t", key_versions, kvno, sz = append_string(context, sp, "\t%u\t%u\t%d\t%d\t", key_versions, kvno,
key->key.keytype, key->key.keyvalue.length + 2); key->key.keytype, key->key.keyvalue.length + 2);
if (sz == -1) return sz; if (sz == -1) return sz;
@@ -172,7 +171,7 @@ append_mit_key(krb5_context context, krb5_storage *sp,
sz = append_hex(context, sp, 1, 1, &key->key.keyvalue); sz = append_hex(context, sp, 1, 1, &key->key.keyvalue);
if (!key->salt) if (!key->salt)
return sz; return sz;
/* Map salt to MIT KDB style */ /* Map salt to MIT KDB style */
switch (key->salt->type) { switch (key->salt->type) {
case KRB5_PADATA_PW_SALT: case KRB5_PADATA_PW_SALT: