remove trailing whitespace
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23815 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
@@ -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 "kadm5_locl.h"
|
||||
@@ -36,18 +36,18 @@
|
||||
RCSID("$Id$");
|
||||
|
||||
static kadm5_ret_t
|
||||
get_default(kadm5_server_context *context, krb5_principal princ,
|
||||
get_default(kadm5_server_context *context, krb5_principal princ,
|
||||
kadm5_principal_ent_t def)
|
||||
{
|
||||
kadm5_ret_t ret;
|
||||
krb5_principal def_principal;
|
||||
krb5_realm *realm = krb5_princ_realm(context->context, princ);
|
||||
|
||||
ret = krb5_make_principal(context->context, &def_principal,
|
||||
ret = krb5_make_principal(context->context, &def_principal,
|
||||
*realm, "default", NULL);
|
||||
if (ret)
|
||||
return ret;
|
||||
ret = kadm5_s_get_principal(context, def_principal, def,
|
||||
ret = kadm5_s_get_principal(context, def_principal, def,
|
||||
KADM5_PRINCIPAL_NORMAL_MASK);
|
||||
krb5_free_principal (context->context, def_principal);
|
||||
return ret;
|
||||
@@ -64,7 +64,7 @@ create_principal(kadm5_server_context *context,
|
||||
kadm5_ret_t ret;
|
||||
kadm5_principal_ent_rec defrec, *defent;
|
||||
uint32_t def_mask;
|
||||
|
||||
|
||||
if((mask & required_mask) != required_mask)
|
||||
return KADM5_BAD_MASK;
|
||||
if((mask & forbidden_mask))
|
||||
@@ -73,11 +73,11 @@ create_principal(kadm5_server_context *context,
|
||||
/* XXX no real policies for now */
|
||||
return KADM5_UNK_POLICY;
|
||||
memset(ent, 0, sizeof(*ent));
|
||||
ret = krb5_copy_principal(context->context, princ->principal,
|
||||
ret = krb5_copy_principal(context->context, princ->principal,
|
||||
&ent->entry.principal);
|
||||
if(ret)
|
||||
return ret;
|
||||
|
||||
|
||||
defent = &defrec;
|
||||
ret = get_default(context, princ->principal, defent);
|
||||
if(ret) {
|
||||
@@ -93,9 +93,9 @@ create_principal(kadm5_server_context *context,
|
||||
defent, def_mask);
|
||||
if(defent)
|
||||
kadm5_free_principal_ent(context, defent);
|
||||
|
||||
|
||||
ent->entry.created_by.time = time(NULL);
|
||||
ret = krb5_copy_principal(context->context, context->caller,
|
||||
ret = krb5_copy_principal(context->context, context->caller,
|
||||
&ent->entry.created_by.principal);
|
||||
|
||||
return ret;
|
||||
@@ -112,10 +112,10 @@ kadm5_s_create_principal_with_key(void *server_handle,
|
||||
|
||||
ret = create_principal(context, princ, mask, &ent,
|
||||
KADM5_PRINCIPAL | KADM5_KEY_DATA,
|
||||
KADM5_LAST_PWD_CHANGE | KADM5_MOD_TIME
|
||||
| KADM5_MOD_NAME | KADM5_MKVNO
|
||||
| KADM5_AUX_ATTRIBUTES
|
||||
| KADM5_POLICY_CLR | KADM5_LAST_SUCCESS
|
||||
KADM5_LAST_PWD_CHANGE | KADM5_MOD_TIME
|
||||
| KADM5_MOD_NAME | KADM5_MKVNO
|
||||
| KADM5_AUX_ATTRIBUTES
|
||||
| KADM5_POLICY_CLR | KADM5_LAST_SUCCESS
|
||||
| KADM5_LAST_FAILED | KADM5_FAIL_AUTH_COUNT);
|
||||
if(ret)
|
||||
goto out;
|
||||
@@ -126,7 +126,7 @@ kadm5_s_create_principal_with_key(void *server_handle,
|
||||
ret = hdb_seal_keys(context->context, context->db, &ent.entry);
|
||||
if (ret)
|
||||
goto out;
|
||||
|
||||
|
||||
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
|
||||
if(ret)
|
||||
goto out;
|
||||
@@ -140,11 +140,11 @@ out:
|
||||
hdb_free_entry(context->context, &ent);
|
||||
return _kadm5_error_code(ret);
|
||||
}
|
||||
|
||||
|
||||
|
||||
kadm5_ret_t
|
||||
kadm5_s_create_principal(void *server_handle,
|
||||
kadm5_principal_ent_t princ,
|
||||
kadm5_principal_ent_t princ,
|
||||
uint32_t mask,
|
||||
const char *password)
|
||||
{
|
||||
@@ -154,10 +154,10 @@ kadm5_s_create_principal(void *server_handle,
|
||||
|
||||
ret = create_principal(context, princ, mask, &ent,
|
||||
KADM5_PRINCIPAL,
|
||||
KADM5_LAST_PWD_CHANGE | KADM5_MOD_TIME
|
||||
| KADM5_MOD_NAME | KADM5_MKVNO
|
||||
KADM5_LAST_PWD_CHANGE | KADM5_MOD_TIME
|
||||
| KADM5_MOD_NAME | KADM5_MKVNO
|
||||
| KADM5_AUX_ATTRIBUTES | KADM5_KEY_DATA
|
||||
| KADM5_POLICY_CLR | KADM5_LAST_SUCCESS
|
||||
| KADM5_POLICY_CLR | KADM5_LAST_SUCCESS
|
||||
| KADM5_LAST_FAILED | KADM5_FAIL_AUTH_COUNT);
|
||||
if(ret)
|
||||
goto out;
|
||||
@@ -175,7 +175,7 @@ kadm5_s_create_principal(void *server_handle,
|
||||
ret = hdb_seal_keys(context->context, context->db, &ent.entry);
|
||||
if (ret)
|
||||
goto out;
|
||||
|
||||
|
||||
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
|
||||
if(ret)
|
||||
goto out;
|
||||
|
||||
Reference in New Issue
Block a user