aboutsummaryrefslogtreecommitdiff
path: root/crypto/heimdal/kadmin/ank.c
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/heimdal/kadmin/ank.c')
-rw-r--r--crypto/heimdal/kadmin/ank.c90
1 files changed, 44 insertions, 46 deletions
diff --git a/crypto/heimdal/kadmin/ank.c b/crypto/heimdal/kadmin/ank.c
index 7e7cfa8817e8..0b7ebc027434 100644
--- a/crypto/heimdal/kadmin/ank.c
+++ b/crypto/heimdal/kadmin/ank.c
@@ -1,61 +1,59 @@
/*
- * Copyright (c) 1997-2006 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
+ * Copyright (c) 1997-2006 Kungliga Tekniska Högskolan
+ * (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"
#include "kadmin-commands.h"
-RCSID("$Id: ank.c 16658 2006-01-25 12:29:46Z lha $");
-
/*
* fetch the default principal corresponding to `princ'
*/
static krb5_error_code
-get_default (kadm5_server_context *context,
+get_default (kadm5_server_context *contextp,
krb5_principal princ,
kadm5_principal_ent_t default_ent)
{
krb5_error_code ret;
krb5_principal def_principal;
- krb5_realm *realm = krb5_princ_realm(context->context, princ);
+ krb5_const_realm realm = krb5_principal_get_realm(contextp->context, princ);
- ret = krb5_make_principal (context->context, &def_principal,
- *realm, "default", NULL);
+ ret = krb5_make_principal (contextp->context, &def_principal,
+ realm, "default", NULL);
if (ret)
return ret;
- ret = kadm5_get_principal (context, def_principal, default_ent,
+ ret = kadm5_get_principal (contextp, def_principal, default_ent,
KADM5_PRINCIPAL_NORMAL_MASK);
- krb5_free_principal (context->context, def_principal);
+ krb5_free_principal (contextp->context, def_principal);
return ret;
}
@@ -68,7 +66,7 @@ static krb5_error_code
add_one_principal (const char *name,
int rand_key,
int rand_password,
- int use_defaults,
+ int use_defaults,
char *password,
krb5_key_data *key_data,
const char *max_ticket_life,
@@ -95,7 +93,7 @@ add_one_principal (const char *name,
mask |= KADM5_PRINCIPAL;
ret = set_entry(context, &princ, &mask,
- max_ticket_life, max_renewable_life,
+ max_ticket_life, max_renewable_life,
expiration, pw_expiration, attributes);
if (ret)
goto out;
@@ -110,7 +108,7 @@ add_one_principal (const char *name,
KADM5_PRINC_EXPIRE_TIME | KADM5_PW_EXPIRATION;
}
- if(use_defaults)
+ if(use_defaults)
set_defaults(&princ, &mask, default_ent, default_mask);
else
if(edit_entry(&princ, &mask, default_ent, default_mask))
@@ -133,13 +131,13 @@ add_one_principal (const char *name,
ret = UI_UTIL_read_pw_string (pwbuf, sizeof(pwbuf), prompt, 1);
free (prompt);
if (ret) {
- krb5_set_error_string(context, "failed to verify password");
ret = KRB5_LIBOS_BADPWDMATCH;
+ krb5_set_error_message(context, ret, "failed to verify password");
goto out;
}
password = pwbuf;
}
-
+
ret = kadm5_create_principal(kadm_handle, &princ, mask, password);
if(ret) {
krb5_warn(context, ret, "kadm5_create_principal");
@@ -148,7 +146,7 @@ add_one_principal (const char *name,
if(rand_key) {
krb5_keyblock *new_keys;
int n_keys, i;
- ret = kadm5_randkey_principal(kadm_handle, princ_ent,
+ ret = kadm5_randkey_principal(kadm_handle, princ_ent,
&new_keys, &n_keys);
if(ret){
krb5_warn(context, ret, "kadm5_randkey_principal");
@@ -158,11 +156,11 @@ add_one_principal (const char *name,
krb5_free_keyblock_contents(context, &new_keys[i]);
if (n_keys > 0)
free(new_keys);
- kadm5_get_principal(kadm_handle, princ_ent, &princ,
+ kadm5_get_principal(kadm_handle, princ_ent, &princ,
KADM5_PRINCIPAL | KADM5_KVNO | KADM5_ATTRIBUTES);
princ.attributes &= (~KRB5_KDB_DISALLOW_ALL_TIX);
princ.kvno = 1;
- kadm5_modify_principal(kadm_handle, &princ,
+ kadm5_modify_principal(kadm_handle, &princ,
KADM5_ATTRIBUTES | KADM5_KVNO);
kadm5_free_principal_ent(kadm_handle, &princ);
} else if (key_data) {
@@ -171,7 +169,7 @@ add_one_principal (const char *name,
if (ret) {
krb5_warn(context, ret, "kadm5_chpass_principal_with_key");
}
- kadm5_get_principal(kadm_handle, princ_ent, &princ,
+ kadm5_get_principal(kadm_handle, princ_ent, &princ,
KADM5_PRINCIPAL | KADM5_ATTRIBUTES);
princ.attributes &= (~KRB5_KDB_DISALLOW_ALL_TIX);
kadm5_modify_principal(kadm_handle, &princ, KADM5_ATTRIBUTES);
@@ -234,7 +232,7 @@ add_new_key(struct add_options *opt, int argc, char **argv)
const char *error;
if (parse_des_key (opt->key_string, key_data, &error)) {
- fprintf (stderr, "failed parsing key \"%s\": %s\n",
+ fprintf (stderr, "failed parsing key \"%s\": %s\n",
opt->key_string, error);
return 1;
}
@@ -242,10 +240,10 @@ add_new_key(struct add_options *opt, int argc, char **argv)
}
for(i = 0; i < argc; i++) {
- ret = add_one_principal (argv[i],
- opt->random_key_flag,
+ ret = add_one_principal (argv[i],
+ opt->random_key_flag,
opt->random_password_flag,
- opt->use_defaults_flag,
+ opt->use_defaults_flag,
opt->password_string,
kdp,
opt->max_ticket_life_string,
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 20:21:27 +0000