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

Use heim_assert() instead of assert()

Browse Source
This commit is contained in:
Nicolas Williams
2011-07-24 11:10:37 -05:00
parent 11c54cd6c8
commit a7717ae4f9
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/kadm5/context_s.c
View File

@@ -47,7 +47,8 @@ kadm5_s_lock(void *server_handle)
* open if the DB was locked with a prior call to kadm5_lock(), * open if the DB was locked with a prior call to kadm5_lock(),
* so if it's open here that must be because the DB is locked. * so if it's open here that must be because the DB is locked.
*/ */
assert( context->db->lock_count > 0 ); heim_assert(context->db->lock_count > 0,
"Internal error in tracking HDB locks");
return KADM5_ALREADY_LOCKED; return KADM5_ALREADY_LOCKED;
} }

1
lib/kadm5/kadm5_locl.h
View File

@@ -38,6 +38,7 @@
#include <config.h> #include <config.h>
#include <roken.h> #include <roken.h>
#include <heimbase.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

6
lib/kadm5/log.c
View File

@@ -717,10 +717,10 @@ kadm5_log_replay_modify (kadm5_server_context *context,
* choice_HDB_extension_data_hist_keys); * choice_HDB_extension_data_hist_keys);
* *
* Maybe we should do this here anyways, wasteful as it would * Maybe we should do this here anyways, wasteful as it would
* be, as a defensive programming measure? For now we stick an * be, as a defensive programming measure? For now we heim_assert().
* assert().
*/ */
assert( (mask & KADM5_TL_DATA) ); heim_assert((mask & KADM5_TL_DATA),
"Wouldn't log and replay key history");
for (i = 0; i < ent.entry.keys.len; ++i) for (i = 0; i < ent.entry.keys.len; ++i)
free_Key(&ent.entry.keys.val[i]); free_Key(&ent.entry.keys.val[i]);