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
92
kadmin/mod.c
92
kadmin/mod.c
@@ -1,34 +1,34 @@
|
||||
/*
|
||||
* Copyright (c) 1997 - 2006 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 "kadmin_locl.h"
|
||||
@@ -46,7 +46,7 @@ add_tl(kadm5_principal_ent_rec *princ, int type, krb5_data *data)
|
||||
tl->tl_data_type = KRB5_TL_EXTENSION;
|
||||
tl->tl_data_length = data->length;
|
||||
tl->tl_data_contents = data->data;
|
||||
|
||||
|
||||
princ->n_tl_data++;
|
||||
ptl = &princ->tl_data;
|
||||
while (*ptl != NULL)
|
||||
@@ -65,7 +65,7 @@ add_constrained_delegation(krb5_context context,
|
||||
HDB_extension ext;
|
||||
krb5_data buf;
|
||||
size_t size;
|
||||
|
||||
|
||||
memset(&ext, 0, sizeof(ext));
|
||||
ext.mandatory = FALSE;
|
||||
ext.data.element = choice_HDB_extension_data_allowed_to_delegate_to;
|
||||
@@ -77,8 +77,8 @@ add_constrained_delegation(krb5_context context,
|
||||
krb5_principal p;
|
||||
int i;
|
||||
|
||||
ext.data.u.allowed_to_delegate_to.val =
|
||||
calloc(strings->num_strings,
|
||||
ext.data.u.allowed_to_delegate_to.val =
|
||||
calloc(strings->num_strings,
|
||||
sizeof(ext.data.u.allowed_to_delegate_to.val[0]));
|
||||
ext.data.u.allowed_to_delegate_to.len = strings->num_strings;
|
||||
|
||||
@@ -110,7 +110,7 @@ add_aliases(krb5_context context, kadm5_principal_ent_rec *princ,
|
||||
krb5_principal p;
|
||||
size_t size;
|
||||
int i;
|
||||
|
||||
|
||||
memset(&ext, 0, sizeof(ext));
|
||||
ext.mandatory = FALSE;
|
||||
ext.data.element = choice_HDB_extension_data_aliases;
|
||||
@@ -120,8 +120,8 @@ add_aliases(krb5_context context, kadm5_principal_ent_rec *princ,
|
||||
ext.data.u.aliases.aliases.val = NULL;
|
||||
ext.data.u.aliases.aliases.len = 0;
|
||||
} else {
|
||||
ext.data.u.aliases.aliases.val =
|
||||
calloc(strings->num_strings,
|
||||
ext.data.u.aliases.aliases.val =
|
||||
calloc(strings->num_strings,
|
||||
sizeof(ext.data.u.aliases.aliases.val[0]));
|
||||
ext.data.u.aliases.aliases.len = strings->num_strings;
|
||||
|
||||
@@ -139,7 +139,7 @@ add_aliases(krb5_context context, kadm5_principal_ent_rec *princ,
|
||||
abort();
|
||||
if (buf.length != size)
|
||||
abort();
|
||||
|
||||
|
||||
add_tl(princ, KRB5_TL_EXTENSION, &buf);
|
||||
}
|
||||
|
||||
@@ -152,7 +152,7 @@ add_pkinit_acl(krb5_context context, kadm5_principal_ent_rec *princ,
|
||||
krb5_data buf;
|
||||
size_t size;
|
||||
int i;
|
||||
|
||||
|
||||
memset(&ext, 0, sizeof(ext));
|
||||
ext.mandatory = FALSE;
|
||||
ext.data.element = choice_HDB_extension_data_pkinit_acl;
|
||||
@@ -162,8 +162,8 @@ add_pkinit_acl(krb5_context context, kadm5_principal_ent_rec *princ,
|
||||
ext.data.u.pkinit_acl.val = NULL;
|
||||
ext.data.u.pkinit_acl.len = 0;
|
||||
} else {
|
||||
ext.data.u.pkinit_acl.val =
|
||||
calloc(strings->num_strings,
|
||||
ext.data.u.pkinit_acl.val =
|
||||
calloc(strings->num_strings,
|
||||
sizeof(ext.data.u.pkinit_acl.val[0]));
|
||||
ext.data.u.pkinit_acl.len = strings->num_strings;
|
||||
|
||||
@@ -179,7 +179,7 @@ add_pkinit_acl(krb5_context context, kadm5_principal_ent_rec *princ,
|
||||
abort();
|
||||
if (buf.length != size)
|
||||
abort();
|
||||
|
||||
|
||||
add_tl(princ, KRB5_TL_EXTENSION, &buf);
|
||||
}
|
||||
|
||||
@@ -190,17 +190,17 @@ do_mod_entry(krb5_principal principal, void *data)
|
||||
kadm5_principal_ent_rec princ;
|
||||
int mask = 0;
|
||||
struct modify_options *e = data;
|
||||
|
||||
|
||||
memset (&princ, 0, sizeof(princ));
|
||||
ret = kadm5_get_principal(kadm_handle, principal, &princ,
|
||||
KADM5_PRINCIPAL | KADM5_ATTRIBUTES |
|
||||
KADM5_PRINCIPAL | KADM5_ATTRIBUTES |
|
||||
KADM5_MAX_LIFE | KADM5_MAX_RLIFE |
|
||||
KADM5_PRINC_EXPIRE_TIME |
|
||||
KADM5_PW_EXPIRATION);
|
||||
if(ret)
|
||||
if(ret)
|
||||
return ret;
|
||||
|
||||
if(e->max_ticket_life_string ||
|
||||
if(e->max_ticket_life_string ||
|
||||
e->max_renewable_life_string ||
|
||||
e->expiration_time_string ||
|
||||
e->pw_expiration_time_string ||
|
||||
@@ -209,11 +209,11 @@ do_mod_entry(krb5_principal principal, void *data)
|
||||
e->constrained_delegation_strings.num_strings ||
|
||||
e->alias_strings.num_strings ||
|
||||
e->pkinit_acl_strings.num_strings) {
|
||||
ret = set_entry(context, &princ, &mask,
|
||||
e->max_ticket_life_string,
|
||||
e->max_renewable_life_string,
|
||||
e->expiration_time_string,
|
||||
e->pw_expiration_time_string,
|
||||
ret = set_entry(context, &princ, &mask,
|
||||
e->max_ticket_life_string,
|
||||
e->max_renewable_life_string,
|
||||
e->expiration_time_string,
|
||||
e->pw_expiration_time_string,
|
||||
e->attributes_string);
|
||||
if(e->kvno_integer != -1) {
|
||||
princ.kvno = e->kvno_integer;
|
||||
@@ -240,7 +240,7 @@ do_mod_entry(krb5_principal principal, void *data)
|
||||
if(ret)
|
||||
krb5_warn(context, ret, "kadm5_modify_principal");
|
||||
}
|
||||
|
||||
|
||||
kadm5_free_principal_ent(kadm_handle, &princ);
|
||||
return ret;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user