diff options
Diffstat (limited to 'crypto/heimdal/lib/kadm5/get_princs_s.c')
| -rw-r--r-- | crypto/heimdal/lib/kadm5/get_princs_s.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crypto/heimdal/lib/kadm5/get_princs_s.c b/crypto/heimdal/lib/kadm5/get_princs_s.c index 2702bae..cab6ef7 100644 --- a/crypto/heimdal/lib/kadm5/get_princs_s.c +++ b/crypto/heimdal/lib/kadm5/get_princs_s.c @@ -33,7 +33,7 @@ #include "kadm5_locl.h" -RCSID("$Id: get_princs_s.c,v 1.5 1999/12/02 17:05:06 joda Exp $"); +RCSID("$Id: get_princs_s.c 16378 2005-12-12 12:40:12Z lha $"); struct foreach_data { const char *exp; @@ -55,12 +55,12 @@ add_princ(struct foreach_data *d, char *princ) } static krb5_error_code -foreach(krb5_context context, HDB *db, hdb_entry *ent, void *data) +foreach(krb5_context context, HDB *db, hdb_entry_ex *ent, void *data) { struct foreach_data *d = data; char *princ; krb5_error_code ret; - ret = krb5_unparse_name(context, ent->principal, &princ); + ret = krb5_unparse_name(context, ent->entry.principal, &princ); if(ret) return ret; if(d->exp){ @@ -78,29 +78,29 @@ foreach(krb5_context context, HDB *db, hdb_entry *ent, void *data) kadm5_ret_t kadm5_s_get_principals(void *server_handle, - const char *exp, + const char *expression, char ***princs, int *count) { 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; } - d.exp = exp; + d.exp = expression; { krb5_realm r; krb5_get_default_realm(context->context, &r); - asprintf(&d.exp2, "%s@%s", exp, r); + asprintf(&d.exp2, "%s@%s", expression, r); free(r); } 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){ |
