remove trailing whitespace
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23815 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1,34 +1,34 @@
|
||||
/*
|
||||
* Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* 3. Neither the name of the Institute nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
* 3. Neither the name of the Institute nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include "krb5_locl.h"
|
||||
@@ -45,7 +45,7 @@ struct mkt_data {
|
||||
struct mkt_data *next;
|
||||
};
|
||||
|
||||
/* this mutex protects mkt_head, ->refcount, and ->next
|
||||
/* this mutex protects mkt_head, ->refcount, and ->next
|
||||
* content is not protected (name is static and need no protection)
|
||||
*/
|
||||
static HEIMDAL_MUTEX mkt_mutex = HEIMDAL_MUTEX_INITIALIZER;
|
||||
@@ -105,7 +105,7 @@ mkt_close(krb5_context context, krb5_keytab id)
|
||||
|
||||
HEIMDAL_MUTEX_lock(&mkt_mutex);
|
||||
if (d->refcount < 1)
|
||||
krb5_abortx(context,
|
||||
krb5_abortx(context,
|
||||
"krb5 internal error, memory keytab refcount < 1 on close");
|
||||
|
||||
if (--d->refcount > 0) {
|
||||
@@ -128,10 +128,10 @@ mkt_close(krb5_context context, krb5_keytab id)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static krb5_error_code
|
||||
mkt_get_name(krb5_context context,
|
||||
krb5_keytab id,
|
||||
char *name,
|
||||
static krb5_error_code
|
||||
mkt_get_name(krb5_context context,
|
||||
krb5_keytab id,
|
||||
char *name,
|
||||
size_t namesize)
|
||||
{
|
||||
struct mkt_data *d = id->data;
|
||||
@@ -140,8 +140,8 @@ mkt_get_name(krb5_context context,
|
||||
}
|
||||
|
||||
static krb5_error_code
|
||||
mkt_start_seq_get(krb5_context context,
|
||||
krb5_keytab id,
|
||||
mkt_start_seq_get(krb5_context context,
|
||||
krb5_keytab id,
|
||||
krb5_kt_cursor *c)
|
||||
{
|
||||
/* XXX */
|
||||
@@ -150,9 +150,9 @@ mkt_start_seq_get(krb5_context context,
|
||||
}
|
||||
|
||||
static krb5_error_code
|
||||
mkt_next_entry(krb5_context context,
|
||||
krb5_keytab id,
|
||||
krb5_keytab_entry *entry,
|
||||
mkt_next_entry(krb5_context context,
|
||||
krb5_keytab id,
|
||||
krb5_keytab_entry *entry,
|
||||
krb5_kt_cursor *c)
|
||||
{
|
||||
struct mkt_data *d = id->data;
|
||||
@@ -162,7 +162,7 @@ mkt_next_entry(krb5_context context,
|
||||
}
|
||||
|
||||
static krb5_error_code
|
||||
mkt_end_seq_get(krb5_context context,
|
||||
mkt_end_seq_get(krb5_context context,
|
||||
krb5_keytab id,
|
||||
krb5_kt_cursor *cursor)
|
||||
{
|
||||
@@ -183,7 +183,7 @@ mkt_add_entry(krb5_context context,
|
||||
return ENOMEM;
|
||||
}
|
||||
d->entries = tmp;
|
||||
return krb5_kt_copy_entry_contents(context, entry,
|
||||
return krb5_kt_copy_entry_contents(context, entry,
|
||||
&d->entries[d->num_entries++]);
|
||||
}
|
||||
|
||||
@@ -195,7 +195,7 @@ mkt_remove_entry(krb5_context context,
|
||||
struct mkt_data *d = id->data;
|
||||
krb5_keytab_entry *e, *end;
|
||||
int found = 0;
|
||||
|
||||
|
||||
if (d->num_entries == 0) {
|
||||
krb5_clear_error_string(context);
|
||||
return KRB5_KT_NOTFOUND;
|
||||
@@ -203,7 +203,7 @@ mkt_remove_entry(krb5_context context,
|
||||
|
||||
/* do this backwards to minimize copying */
|
||||
for(end = d->entries + d->num_entries, e = end - 1; e >= d->entries; e--) {
|
||||
if(krb5_kt_compare(context, e, entry->principal,
|
||||
if(krb5_kt_compare(context, e, entry->principal,
|
||||
entry->vno, entry->keyblock.keytype)) {
|
||||
krb5_kt_free_entry(context, e);
|
||||
memmove(e, e + 1, (end - e - 1) * sizeof(*e));
|
||||
|
Reference in New Issue
Block a user