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

Break out the that we request from principal from the entry and pass

Browse Source 
it in as a separate argument.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17310 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-04-27 11:09:30 +00:00
parent e4adaa6783
commit 5f22b44baa
6 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/kadm5/delete_s.c
View File

@@ -43,13 +43,12 @@ kadm5_s_delete_principal(void *server_handle, krb5_principal princ)
hdb_entry_ex ent; hdb_entry_ex ent;
memset(&ent, 0, sizeof(ent)); memset(&ent, 0, sizeof(ent));
ent.entry.principal = princ;
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0); ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
if(ret) { if(ret) {
krb5_warn(context->context, ret, "opening database"); krb5_warn(context->context, ret, "opening database");
return ret; return ret;
} }
ret = context->db->hdb_fetch(context->context, context->db, ret = context->db->hdb_fetch(context->context, context->db, princ,
HDB_F_DECRYPT, &ent); HDB_F_DECRYPT, &ent);
if(ret == HDB_ERR_NOENTRY) if(ret == HDB_ERR_NOENTRY)
goto out2; goto out2;
@@ -64,7 +63,7 @@ kadm5_s_delete_principal(void *server_handle, krb5_principal princ)
kadm5_log_delete (context, princ); kadm5_log_delete (context, princ);
ret = context->db->hdb_remove(context->context, context->db, &ent); ret = context->db->hdb_remove(context->context, context->db, princ);
out: out:
hdb_free_entry(context->context, &ent); hdb_free_entry(context->context, &ent);
out2: out2:

5
lib/kadm5/get_s.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 - 2005 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2006 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -75,11 +75,10 @@ kadm5_s_get_principal(void *server_handle,
hdb_entry_ex ent; hdb_entry_ex ent;
memset(&ent, 0, sizeof(ent)); memset(&ent, 0, sizeof(ent));
ent.entry.principal = princ;
ret = context->db->hdb_open(context->context, context->db, O_RDONLY, 0); ret = context->db->hdb_open(context->context, context->db, O_RDONLY, 0);
if(ret) if(ret)
return ret; return ret;
ret = context->db->hdb_fetch(context->context, context->db, ret = context->db->hdb_fetch(context->context, context->db, princ,
HDB_F_DECRYPT, &ent); HDB_F_DECRYPT, &ent);
context->db->hdb_close(context->context, context->db); context->db->hdb_close(context->context, context->db);
if(ret) if(ret)

16
lib/kadm5/log.c
View File

@@ -347,12 +347,12 @@ kadm5_log_replay_delete (kadm5_server_context *context,
krb5_storage *sp) krb5_storage *sp)
{ {
krb5_error_code ret; krb5_error_code ret;
hdb_entry_ex ent; krb5_principal principal;
krb5_ret_principal (sp, &ent.entry.principal); krb5_ret_principal (sp, &principal);
ret = context->db->hdb_remove(context->context, context->db, &ent); ret = context->db->hdb_remove(context->context, context->db, principal);
krb5_free_principal (context->context, ent.entry.principal); krb5_free_principal (context->context, principal);
return ret; return ret;
} }
@@ -434,7 +434,7 @@ kadm5_log_replay_rename (kadm5_server_context *context,
{ {
krb5_error_code ret; krb5_error_code ret;
krb5_principal source; krb5_principal source;
hdb_entry_ex source_ent, target_ent; hdb_entry_ex target_ent;
krb5_data value; krb5_data value;
off_t off; off_t off;
size_t princ_len, data_len; size_t princ_len, data_len;
@@ -464,8 +464,7 @@ kadm5_log_replay_rename (kadm5_server_context *context,
krb5_free_principal (context->context, source); krb5_free_principal (context->context, source);
return ret; return ret;
} }
source_ent.entry.principal = source; ret = context->db->hdb_remove (context->context, context->db, source);
ret = context->db->hdb_remove (context->context, context->db, &source_ent);
krb5_free_principal (context->context, source); krb5_free_principal (context->context, source);
return ret; return ret;
} }
@@ -553,9 +552,8 @@ kadm5_log_replay_modify (kadm5_server_context *context,
return ret; return ret;
memset(&ent, 0, sizeof(ent)); memset(&ent, 0, sizeof(ent));
ent.entry.principal = log_ent.entry.principal;
log_ent.entry.principal = NULL;
ret = context->db->hdb_fetch(context->context, context->db, ret = context->db->hdb_fetch(context->context, context->db,
log_ent.entry.principal,
HDB_F_DECRYPT, &ent); HDB_F_DECRYPT, &ent);
if (ret) if (ret)
goto out; goto out;

4
lib/kadm5/modify_s.c
View File

@@ -50,11 +50,11 @@ modify_principal(void *server_handle,
return KADM5_UNK_POLICY; return KADM5_UNK_POLICY;
memset(&ent, 0, sizeof(ent)); memset(&ent, 0, sizeof(ent));
ent.entry.principal = princ->principal;
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0); ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
if(ret) if(ret)
return ret; return ret;
ret = context->db->hdb_fetch(context->context, context->db, 0, &ent); ret = context->db->hdb_fetch(context->context, context->db,
princ->principal, 0, &ent);
if(ret) if(ret)
goto out; goto out;
ret = _kadm5_setup_entry(context, &ent, mask, princ, mask, NULL, 0); ret = _kadm5_setup_entry(context, &ent, mask, princ, mask, NULL, 0);

3
lib/kadm5/randkey_s.c
View File

@@ -51,11 +51,10 @@ kadm5_s_randkey_principal(void *server_handle,
kadm5_ret_t ret; kadm5_ret_t ret;
memset(&ent, 0, sizeof(ent)); memset(&ent, 0, sizeof(ent));
ent.entry.principal = princ;
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0); ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
if(ret) if(ret)
return ret; return ret;
ret = context->db->hdb_fetch(context->context, context->db, 0, &ent); ret = context->db->hdb_fetch(context->context, context->db, princ, 0, &ent);
if(ret) if(ret)
goto out; goto out;

17
lib/kadm5/rename_s.c
View File

@@ -42,16 +42,17 @@ kadm5_s_rename_principal(void *server_handle,
{ {
kadm5_server_context *context = server_handle; kadm5_server_context *context = server_handle;
kadm5_ret_t ret; kadm5_ret_t ret;
hdb_entry_ex ent, ent2; hdb_entry_ex ent;
krb5_principal remove = NULL;
memset(&ent, 0, sizeof(ent)); memset(&ent, 0, sizeof(ent));
ent.entry.principal = source;
if(krb5_principal_compare(context->context, source, target)) if(krb5_principal_compare(context->context, source, target))
return KADM5_DUP; /* XXX is this right? */ return KADM5_DUP; /* XXX is this right? */
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0); ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
if(ret) if(ret)
return ret; return ret;
ret = context->db->hdb_fetch(context->context, context->db, 0, &ent); ret = context->db->hdb_fetch(context->context, context->db,
source, 0, &ent);
if(ret){ if(ret){
context->db->hdb_close(context->context, context->db); context->db->hdb_close(context->context, context->db);
goto out; goto out;
@@ -80,12 +81,12 @@ kadm5_s_rename_principal(void *server_handle,
} }
if(ret) if(ret)
goto out2; goto out2;
ent2.entry.principal = ent.entry.principal; remove = ent.entry.principal;
ent.entry.principal = target; ent.entry.principal = target;
ret = hdb_seal_keys(context->context, context->db, &ent.entry); ret = hdb_seal_keys(context->context, context->db, &ent.entry);
if (ret) { if (ret) {
ent.entry.principal = ent2.entry.principal; ent.entry.principal = remove;
goto out2; goto out2;
} }
@@ -95,11 +96,11 @@ kadm5_s_rename_principal(void *server_handle,
ret = context->db->hdb_store(context->context, context->db, 0, &ent); ret = context->db->hdb_store(context->context, context->db, 0, &ent);
if(ret){ if(ret){
ent.entry.principal = ent2.entry.principal; ent.entry.principal = remove;
goto out2; goto out2;
} }
ret = context->db->hdb_remove(context->context, context->db, &ent2); ret = context->db->hdb_remove(context->context, context->db, remove);
ent.entry.principal = ent2.entry.principal; ent.entry.principal = remove;
out2: out2:
context->db->hdb_close(context->context, context->db); context->db->hdb_close(context->context, context->db);
hdb_free_entry(context->context, &ent); hdb_free_entry(context->context, &ent);