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

prefix all struct HDB elements with hdb_

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12880 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-09-19 00:25:35 +00:00
parent ef91ed3046
commit 0540f13b86
29 changed files with 372 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/kadm5/chpass_s.c
View File

@@ -49,11 +49,11 @@ change(void *server_handle,
int cmp = 1;
ent.principal = princ;
ret = context->db->open(context->context, context->db, O_RDWR, 0);
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
if(ret)
return ret;
ret = context->db->fetch(context->context, context->db,
0, &ent);
ret = context->db->hdb_fetch(context->context, context->db,
0, &ent);
if(ret == HDB_ERR_NOENTRY)
goto out;
@@ -93,12 +93,12 @@ change(void *server_handle,
KADM5_PRINCIPAL | KADM5_MOD_NAME | KADM5_MOD_TIME |
KADM5_KEY_DATA | KADM5_KVNO | KADM5_PW_EXPIRATION);
ret = context->db->store(context->context, context->db,
HDB_F_REPLACE, &ent);
ret = context->db->hdb_store(context->context, context->db,
HDB_F_REPLACE, &ent);
out2:
hdb_free_entry(context->context, &ent);
out:
context->db->close(context->context, context->db);
context->db->hdb_close(context->context, context->db);
return _kadm5_error_code(ret);
}
@@ -142,10 +142,10 @@ kadm5_s_chpass_principal_with_key(void *server_handle,
hdb_entry ent;
kadm5_ret_t ret;
ent.principal = princ;
ret = context->db->open(context->context, context->db, O_RDWR, 0);
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
if(ret)
return ret;
ret = context->db->fetch(context->context, context->db, 0, &ent);
ret = context->db->hdb_fetch(context->context, context->db, 0, &ent);
if(ret == HDB_ERR_NOENTRY)
goto out;
ret = _kadm5_set_keys2(context, &ent, n_key_data, key_data);
@@ -167,11 +167,11 @@ kadm5_s_chpass_principal_with_key(void *server_handle,
KADM5_PRINCIPAL | KADM5_MOD_NAME | KADM5_MOD_TIME |
KADM5_KEY_DATA | KADM5_KVNO | KADM5_PW_EXPIRATION);
ret = context->db->store(context->context, context->db,
HDB_F_REPLACE, &ent);
ret = context->db->hdb_store(context->context, context->db,
HDB_F_REPLACE, &ent);
out2:
hdb_free_entry(context->context, &ent);
out:
context->db->close(context->context, context->db);
context->db->hdb_close(context->context, context->db);
return _kadm5_error_code(ret);
}

12
lib/kadm5/create_s.c
View File

@@ -130,11 +130,11 @@ kadm5_s_create_principal_with_key(void *server_handle,
kadm5_log_create (context, &ent);
ret = context->db->open(context->context, context->db, O_RDWR, 0);
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
if(ret)
goto out;
ret = context->db->store(context->context, context->db, 0, &ent);
context->db->close(context->context, context->db);
ret = context->db->hdb_store(context->context, context->db, 0, &ent);
context->db->hdb_close(context->context, context->db);
out:
hdb_free_entry(context->context, &ent);
return _kadm5_error_code(ret);
@@ -186,11 +186,11 @@ kadm5_s_create_principal(void *server_handle,
kadm5_log_create (context, &ent);
ret = context->db->open(context->context, context->db, O_RDWR, 0);
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
if(ret)
goto out;
ret = context->db->store(context->context, context->db, 0, &ent);
context->db->close(context->context, context->db);
ret = context->db->hdb_store(context->context, context->db, 0, &ent);
context->db->hdb_close(context->context, context->db);
out:
hdb_free_entry(context->context, &ent);
return _kadm5_error_code(ret);

10
lib/kadm5/delete_s.c
View File

@@ -43,13 +43,13 @@ kadm5_s_delete_principal(void *server_handle, krb5_principal princ)
hdb_entry ent;
ent.principal = princ;
ret = context->db->open(context->context, context->db, O_RDWR, 0);
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
if(ret) {
krb5_warn(context->context, ret, "opening database");
return ret;
}
ret = context->db->fetch(context->context, context->db,
HDB_F_DECRYPT, &ent);
ret = context->db->hdb_fetch(context->context, context->db,
HDB_F_DECRYPT, &ent);
if(ret == HDB_ERR_NOENTRY)
goto out2;
if(ent.flags.immutable) {
@@ -63,10 +63,10 @@ kadm5_s_delete_principal(void *server_handle, krb5_principal princ)
kadm5_log_delete (context, princ);
ret = context->db->remove(context->context, context->db, &ent);
ret = context->db->hdb_remove(context->context, context->db, &ent);
out:
hdb_free_entry(context->context, &ent);
out2:
context->db->close(context->context, context->db);
context->db->hdb_close(context->context, context->db);
return _kadm5_error_code(ret);
}

2
lib/kadm5/destroy_s.c
View File

@@ -70,7 +70,7 @@ kadm5_s_destroy(void *server_handle)
kadm5_server_context *context = server_handle;
krb5_context kcontext = context->context;
ret = context->db->destroy(kcontext, context->db);
ret = context->db->hdb_destroy(kcontext, context->db);
destroy_kadm5_log_context (&context->log_context);
destroy_config (&context->config);
krb5_free_principal (kcontext, context->caller);

4
lib/kadm5/get_princs_s.c
View File

@@ -85,7 +85,7 @@ kadm5_s_get_principals(void *server_handle,
struct foreach_data d;
kadm5_server_context *context = server_handle;
kadm5_ret_t ret;
ret = context->db->open(context->context, context->db, O_RDWR, 0);
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
if(ret) {
krb5_warn(context->context, ret, "opening database");
return ret;
@@ -100,7 +100,7 @@ kadm5_s_get_principals(void *server_handle,
d.princs = NULL;
d.count = 0;
ret = hdb_foreach(context->context, context->db, 0, foreach, &d);
context->db->close(context->context, context->db);
context->db->hdb_close(context->context, context->db);
if(ret == 0)
ret = add_princ(&d, NULL);
if(ret == 0){

8
lib/kadm5/get_s.c
View File

@@ -46,12 +46,12 @@ kadm5_s_get_principal(void *server_handle,
hdb_entry ent;
ent.principal = princ;
ret = context->db->open(context->context, context->db, O_RDONLY, 0);
ret = context->db->hdb_open(context->context, context->db, O_RDONLY, 0);
if(ret)
return ret;
ret = context->db->fetch(context->context, context->db,
HDB_F_DECRYPT, &ent);
context->db->close(context->context, context->db);
ret = context->db->hdb_fetch(context->context, context->db,
HDB_F_DECRYPT, &ent);
context->db->hdb_close(context->context, context->db);
if(ret)
return _kadm5_error_code(ret);

5
lib/kadm5/ipropd_master.c
View File

@@ -295,7 +295,7 @@ send_complete (krb5_context context, slave *s,
ret = hdb_create (context, &db, database);
if (ret)
krb5_err (context, 1, ret, "hdb_create: %s", database);
ret = db->open (context, db, O_RDONLY, 0);
ret = db->hdb_open (context, db, O_RDONLY, 0);
if (ret)
krb5_err (context, 1, ret, "db->open");
@@ -319,6 +319,9 @@ send_complete (krb5_context context, slave *s,
return ret;
}
(*db->hdb_close)(context, db);
(*db->hdb_destroy)(context, db);
_krb5_put_int (buf, NOW_YOU_HAVE, 4);
_krb5_put_int (buf + 4, current_version, 4);
data.length = 8;

24
lib/kadm5/ipropd_slave.c
View File

@@ -209,15 +209,15 @@ receive (krb5_context context,
{
int ret;
ret = server_context->db->open(context,
server_context->db,
O_RDWR | O_CREAT, 0600);
ret = server_context->db->hdb_open(context,
server_context->db,
O_RDWR | O_CREAT, 0600);
if (ret)
krb5_err (context, 1, ret, "db->open");
receive_loop (context, sp, server_context);
ret = server_context->db->close (context, server_context->db);
ret = server_context->db->hdb_close (context, server_context->db);
if (ret)
krb5_err (context, 1, ret, "db->close");
}
@@ -256,7 +256,7 @@ receive_everything (krb5_context context, int fd,
char *dbname;
HDB *mydb;
asprintf(&dbname, "%s-NEW", server_context->db->name);
asprintf(&dbname, "%s-NEW", server_context->db->hdb_name);
ret = hdb_create(context, &mydb, dbname);
if(ret)
krb5_err(context,1, ret, "hdb_create");
@@ -269,7 +269,7 @@ receive_everything (krb5_context context, int fd,
/* I really want to use O_EXCL here, but given that I can't easily clean
up on error, I won't */
ret = mydb->open(context, mydb, O_RDWR | O_CREAT | O_TRUNC, 0600);
ret = mydb->hdb_open(context, mydb, O_RDWR | O_CREAT | O_TRUNC, 0600);
if (ret)
krb5_err (context, 1, ret, "db->open");
@@ -294,9 +294,9 @@ receive_everything (krb5_context context, int fd,
ret = hdb_value2entry (context, &fake_data, &entry);
if (ret)
krb5_err (context, 1, ret, "hdb_value2entry");
ret = mydb->store(server_context->context,
mydb,
0, &entry);
ret = mydb->hdb_store(server_context->context,
mydb,
0, &entry);
if (ret)
krb5_err (context, 1, ret, "hdb_store");
@@ -325,15 +325,15 @@ receive_everything (krb5_context context, int fd,
krb5_data_free (&data);
ret = mydb->rename (context, mydb, server_context->db->name);
ret = mydb->hdb_rename (context, mydb, server_context->db->hdb_name);
if (ret)
krb5_err (context, 1, ret, "db->rename");
ret = mydb->close (context, mydb);
ret = mydb->hdb_close (context, mydb);
if (ret)
krb5_err (context, 1, ret, "db->close");
ret = mydb->destroy (context, mydb);
ret = mydb->hdb_destroy (context, mydb);
if (ret)
krb5_err (context, 1, ret, "db->destroy");
}

17
lib/kadm5/log.c
View File

@@ -276,7 +276,7 @@ kadm5_log_replay_create (kadm5_server_context *context,
krb5_data_free(&data);
if (ret)
return ret;
ret = context->db->store(context->context, context->db, 0, &ent);
ret = context->db->hdb_store(context->context, context->db, 0, &ent);
hdb_free_entry (context->context, &ent);
return ret;
}
@@ -341,7 +341,7 @@ kadm5_log_replay_delete (kadm5_server_context *context,
krb5_ret_principal (sp, &ent.principal);
ret = context->db->remove(context->context, context->db, &ent);
ret = context->db->hdb_remove(context->context, context->db, &ent);
krb5_free_principal (context->context, ent.principal);
return ret;
}
@@ -435,14 +435,15 @@ kadm5_log_replay_rename (kadm5_server_context *context,
krb5_free_principal (context->context, source);
return ret;
}
ret = context->db->store (context->context, context->db, 0, &target_ent);
ret = context->db->hdb_store (context->context, context->db,
0, &target_ent);
hdb_free_entry (context->context, &target_ent);
if (ret) {
krb5_free_principal (context->context, source);
return ret;
}
source_ent.principal = source;
ret = context->db->remove (context->context, context->db, &source_ent);
ret = context->db->hdb_remove (context->context, context->db, &source_ent);
krb5_free_principal (context->context, source);
return ret;
}
@@ -525,8 +526,8 @@ kadm5_log_replay_modify (kadm5_server_context *context,
return ret;
ent.principal = log_ent.principal;
log_ent.principal = NULL;
ret = context->db->fetch(context->context, context->db,
HDB_F_DECRYPT, &ent);
ret = context->db->hdb_fetch(context->context, context->db,
HDB_F_DECRYPT, &ent);
if (ret)
return ret;
if (mask & KADM5_PRINC_EXPIRE_TIME) {
@@ -618,8 +619,8 @@ kadm5_log_replay_modify (kadm5_server_context *context,
copy_Key(&log_ent.keys.val[i],
&ent.keys.val[i]);
}
ret = context->db->store(context->context, context->db,
HDB_F_REPLACE, &ent);
ret = context->db->hdb_store(context->context, context->db,
HDB_F_REPLACE, &ent);
hdb_free_entry (context->context, &ent);
hdb_free_entry (context->context, &log_ent);
return ret;

8
lib/kadm5/modify_s.c
View File

@@ -50,10 +50,10 @@ modify_principal(void *server_handle,
return KADM5_UNK_POLICY;
ent.principal = princ->principal;
ret = context->db->open(context->context, context->db, O_RDWR, 0);
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
if(ret)
return ret;
ret = context->db->fetch(context->context, context->db, 0, &ent);
ret = context->db->hdb_fetch(context->context, context->db, 0, &ent);
if(ret)
goto out;
ret = _kadm5_setup_entry(context, &ent, mask, princ, mask, NULL, 0);
@@ -71,12 +71,12 @@ modify_principal(void *server_handle,
&ent,
mask | KADM5_MOD_NAME | KADM5_MOD_TIME);
ret = context->db->store(context->context, context->db,
ret = context->db->hdb_store(context->context, context->db,
HDB_F_REPLACE, &ent);
out2:
hdb_free_entry(context->context, &ent);
out:
context->db->close(context->context, context->db);
context->db->hdb_close(context->context, context->db);
return _kadm5_error_code(ret);
}

10
lib/kadm5/randkey_s.c
View File

@@ -51,10 +51,10 @@ kadm5_s_randkey_principal(void *server_handle,
kadm5_ret_t ret;
ent.principal = princ;
ret = context->db->open(context->context, context->db, O_RDWR, 0);
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
if(ret)
return ret;
ret = context->db->fetch(context->context, context->db, 0, &ent);
ret = context->db->hdb_fetch(context->context, context->db, 0, &ent);
if(ret)
goto out;
@@ -81,8 +81,8 @@ kadm5_s_randkey_principal(void *server_handle,
KADM5_PRINCIPAL | KADM5_MOD_NAME | KADM5_MOD_TIME |
KADM5_KEY_DATA | KADM5_KVNO | KADM5_PW_EXPIRATION);
ret = context->db->store(context->context, context->db,
HDB_F_REPLACE, &ent);
ret = context->db->hdb_store(context->context, context->db,
HDB_F_REPLACE, &ent);
out3:
if (ret) {
int i;
@@ -96,6 +96,6 @@ out3:
out2:
hdb_free_entry(context->context, &ent);
out:
context->db->close(context->context, context->db);
context->db->hdb_close(context->context, context->db);
return _kadm5_error_code(ret);
}

12
lib/kadm5/rename_s.c
View File

@@ -48,12 +48,12 @@ kadm5_s_rename_principal(void *server_handle,
return KADM5_DUP; /* XXX is this right? */
if(!krb5_realm_compare(context->context, source, target))
return KADM5_FAILURE; /* XXX better code */
ret = context->db->open(context->context, context->db, O_RDWR, 0);
ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
if(ret)
return ret;
ret = context->db->fetch(context->context, context->db, 0, &ent);
ret = context->db->hdb_fetch(context->context, context->db, 0, &ent);
if(ret){
context->db->close(context->context, context->db);
context->db->hdb_close(context->context, context->db);
goto out;
}
ret = _kadm5_set_modifier(context, &ent);
@@ -92,15 +92,15 @@ kadm5_s_rename_principal(void *server_handle,
source,
&ent);
ret = context->db->store(context->context, context->db, 0, &ent);
ret = context->db->hdb_store(context->context, context->db, 0, &ent);
if(ret){
ent.principal = ent2.principal;
goto out2;
}
ret = context->db->remove(context->context, context->db, &ent2);
ret = context->db->hdb_remove(context->context, context->db, &ent2);
ent.principal = ent2.principal;
out2:
context->db->close(context->context, context->db);
context->db->hdb_close(context->context, context->db);
hdb_free_entry(context->context, &ent);
out:
return _kadm5_error_code(ret);

8
lib/kadm5/replay_log.c
View File

@@ -106,9 +106,9 @@ main(int argc, char **argv)
server_context = (kadm5_server_context *)kadm_handle;
ret = server_context->db->open(context,
server_context->db,
O_RDWR | O_CREAT, 0);
ret = server_context->db->hdb_open(context,
server_context->db,
O_RDWR | O_CREAT, 0);
if (ret)
krb5_err (context, 1, ret, "db->open");
@@ -122,7 +122,7 @@ main(int argc, char **argv)
ret = kadm5_log_end (server_context);
if (ret)
krb5_warn(context, ret, "kadm5_log_end");
ret = server_context->db->close (context, server_context->db);
ret = server_context->db->hdb_close (context, server_context->db);
if (ret)
krb5_err (context, 1, ret, "db->close");
return 0;