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 - 2000 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 "kadm5_locl.h"
|
||||
@@ -36,9 +36,9 @@
|
||||
RCSID("$Id$");
|
||||
|
||||
|
||||
static kadm5_ret_t
|
||||
static kadm5_ret_t
|
||||
kadm5_s_init_with_context(krb5_context context,
|
||||
const char *client_name,
|
||||
const char *client_name,
|
||||
const char *service_name,
|
||||
kadm5_config_params *realm_params,
|
||||
unsigned long struct_version,
|
||||
@@ -60,7 +60,7 @@ kadm5_s_init_with_context(krb5_context context,
|
||||
ret = hdb_create(ctx->context, &ctx->db, ctx->config.dbname);
|
||||
if(ret)
|
||||
return ret;
|
||||
ret = hdb_set_master_keyfile (ctx->context,
|
||||
ret = hdb_set_master_keyfile (ctx->context,
|
||||
ctx->db, ctx->config.stash_file);
|
||||
if(ret)
|
||||
return ret;
|
||||
@@ -76,14 +76,14 @@ kadm5_s_init_with_context(krb5_context context,
|
||||
ret = _kadm5_acl_init(ctx);
|
||||
if(ret)
|
||||
return ret;
|
||||
|
||||
|
||||
*server_handle = ctx;
|
||||
return 0;
|
||||
}
|
||||
|
||||
kadm5_ret_t
|
||||
kadm5_ret_t
|
||||
kadm5_s_init_with_password_ctx(krb5_context context,
|
||||
const char *client_name,
|
||||
const char *client_name,
|
||||
const char *password,
|
||||
const char *service_name,
|
||||
kadm5_config_params *realm_params,
|
||||
@@ -100,8 +100,8 @@ kadm5_s_init_with_password_ctx(krb5_context context,
|
||||
server_handle);
|
||||
}
|
||||
|
||||
kadm5_ret_t
|
||||
kadm5_s_init_with_password(const char *client_name,
|
||||
kadm5_ret_t
|
||||
kadm5_s_init_with_password(const char *client_name,
|
||||
const char *password,
|
||||
const char *service_name,
|
||||
kadm5_config_params *realm_params,
|
||||
@@ -116,13 +116,13 @@ kadm5_s_init_with_password(const char *client_name,
|
||||
ret = krb5_init_context(&context);
|
||||
if (ret)
|
||||
return ret;
|
||||
ret = kadm5_s_init_with_password_ctx(context,
|
||||
client_name,
|
||||
password,
|
||||
service_name,
|
||||
realm_params,
|
||||
struct_version,
|
||||
api_version,
|
||||
ret = kadm5_s_init_with_password_ctx(context,
|
||||
client_name,
|
||||
password,
|
||||
service_name,
|
||||
realm_params,
|
||||
struct_version,
|
||||
api_version,
|
||||
server_handle);
|
||||
if(ret){
|
||||
krb5_free_context(context);
|
||||
@@ -133,9 +133,9 @@ kadm5_s_init_with_password(const char *client_name,
|
||||
return 0;
|
||||
}
|
||||
|
||||
kadm5_ret_t
|
||||
kadm5_ret_t
|
||||
kadm5_s_init_with_skey_ctx(krb5_context context,
|
||||
const char *client_name,
|
||||
const char *client_name,
|
||||
const char *keytab,
|
||||
const char *service_name,
|
||||
kadm5_config_params *realm_params,
|
||||
@@ -152,7 +152,7 @@ kadm5_s_init_with_skey_ctx(krb5_context context,
|
||||
server_handle);
|
||||
}
|
||||
|
||||
kadm5_ret_t
|
||||
kadm5_ret_t
|
||||
kadm5_s_init_with_skey(const char *client_name,
|
||||
const char *keytab,
|
||||
const char *service_name,
|
||||
@@ -168,13 +168,13 @@ kadm5_s_init_with_skey(const char *client_name,
|
||||
ret = krb5_init_context(&context);
|
||||
if (ret)
|
||||
return ret;
|
||||
ret = kadm5_s_init_with_skey_ctx(context,
|
||||
client_name,
|
||||
keytab,
|
||||
service_name,
|
||||
realm_params,
|
||||
struct_version,
|
||||
api_version,
|
||||
ret = kadm5_s_init_with_skey_ctx(context,
|
||||
client_name,
|
||||
keytab,
|
||||
service_name,
|
||||
realm_params,
|
||||
struct_version,
|
||||
api_version,
|
||||
server_handle);
|
||||
if(ret){
|
||||
krb5_free_context(context);
|
||||
@@ -185,7 +185,7 @@ kadm5_s_init_with_skey(const char *client_name,
|
||||
return 0;
|
||||
}
|
||||
|
||||
kadm5_ret_t
|
||||
kadm5_ret_t
|
||||
kadm5_s_init_with_creds_ctx(krb5_context context,
|
||||
const char *client_name,
|
||||
krb5_ccache ccache,
|
||||
@@ -204,7 +204,7 @@ kadm5_s_init_with_creds_ctx(krb5_context context,
|
||||
server_handle);
|
||||
}
|
||||
|
||||
kadm5_ret_t
|
||||
kadm5_ret_t
|
||||
kadm5_s_init_with_creds(const char *client_name,
|
||||
krb5_ccache ccache,
|
||||
const char *service_name,
|
||||
@@ -220,13 +220,13 @@ kadm5_s_init_with_creds(const char *client_name,
|
||||
ret = krb5_init_context(&context);
|
||||
if (ret)
|
||||
return ret;
|
||||
ret = kadm5_s_init_with_creds_ctx(context,
|
||||
client_name,
|
||||
ccache,
|
||||
service_name,
|
||||
realm_params,
|
||||
struct_version,
|
||||
api_version,
|
||||
ret = kadm5_s_init_with_creds_ctx(context,
|
||||
client_name,
|
||||
ccache,
|
||||
service_name,
|
||||
realm_params,
|
||||
struct_version,
|
||||
api_version,
|
||||
server_handle);
|
||||
if(ret){
|
||||
krb5_free_context(context);
|
||||
|
Reference in New Issue
Block a user