oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(change_entry): just use global context to avoid shadowing; make a

Browse Source 
copy of realm and admin_server to avoid un-consting.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15578 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-07-07 20:44:48 +00:00
parent e0ce376387
commit 68b297f83d
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
admin/change.c
View File

@@ -36,7 +36,7 @@
RCSID("$Id$"); RCSID("$Id$");
static krb5_error_code static krb5_error_code
change_entry (krb5_context context, krb5_keytab keytab, change_entry (krb5_keytab keytab,
krb5_principal principal, krb5_kvno kvno, krb5_principal principal, krb5_kvno kvno,
const char *realm, const char *admin_server, int server_port) const char *realm, const char *admin_server, int server_port)
{ {
@@ -56,14 +56,24 @@ change_entry (krb5_context context, krb5_keytab keytab,
memset (&conf, 0, sizeof(conf)); memset (&conf, 0, sizeof(conf));
if(realm) if(realm == NULL)
conf.realm = (char *)realm; realm = krb5_principal_get_realm(context, principal);
else conf.realm = strdup(realm);
conf.realm = (char*)krb5_principal_get_realm(context, principal); if (conf.realm == NULL) {
free (client_name);
krb5_set_error_string(context, "malloc failed");
return ENOMEM;
}
conf.mask |= KADM5_CONFIG_REALM; conf.mask |= KADM5_CONFIG_REALM;
if (admin_server) { if (admin_server) {
conf.admin_server = (char *)admin_server; conf.admin_server = strdup(admin_server);
if (conf.admin_server == NULL) {
free(client_name);
free(conf.realm);
krb5_set_error_string(context, "malloc failed");
return ENOMEM;
}
conf.mask |= KADM5_CONFIG_ADMIN_SERVER; conf.mask |= KADM5_CONFIG_ADMIN_SERVER;
} }
@@ -78,6 +88,8 @@ change_entry (krb5_context context, krb5_keytab keytab,
KADM5_ADMIN_SERVICE, KADM5_ADMIN_SERVICE,
&conf, 0, 0, &conf, 0, 0,
&kadm_handle); &kadm_handle);
free(conf.admin_server);
free(conf.realm);
if (ret) { if (ret) {
krb5_warn (context, ret, krb5_warn (context, ret,
"kadm5_c_init_with_skey_ctx: %s:", client_name); "kadm5_c_init_with_skey_ctx: %s:", client_name);
@@ -220,7 +232,7 @@ kt_change (struct change_options *opt, int argc, char **argv)
free(client_name); free(client_name);
} }
} }
ret = change_entry (context, keytab, ret = change_entry (keytab,
changeset[i].principal, changeset[i].kvno, changeset[i].principal, changeset[i].kvno,
opt->realm_string, opt->realm_string,
opt->admin_server_string, opt->admin_server_string,