rename variable exp to expression
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15484 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1021,7 +1021,7 @@ kadm5_ad_get_principal(void *server_handle,
|
|||||||
|
|
||||||
static kadm5_ret_t
|
static kadm5_ret_t
|
||||||
kadm5_ad_get_principals(void *server_handle,
|
kadm5_ad_get_principals(void *server_handle,
|
||||||
const char *exp,
|
const char *expression,
|
||||||
char ***principals,
|
char ***principals,
|
||||||
int *count)
|
int *count)
|
||||||
{
|
{
|
||||||
|
@@ -119,11 +119,11 @@ kadm5_rename_principal(void *server_handle,
|
|||||||
|
|
||||||
kadm5_ret_t
|
kadm5_ret_t
|
||||||
kadm5_get_principals(void *server_handle,
|
kadm5_get_principals(void *server_handle,
|
||||||
const char *exp,
|
const char *expression,
|
||||||
char ***princs,
|
char ***princs,
|
||||||
int *count)
|
int *count)
|
||||||
{
|
{
|
||||||
return __CALL(get_principals, (server_handle, exp, princs, count));
|
return __CALL(get_principals, (server_handle, expression, princs, count));
|
||||||
}
|
}
|
||||||
|
|
||||||
kadm5_ret_t
|
kadm5_ret_t
|
||||||
|
@@ -37,7 +37,7 @@ RCSID("$Id$");
|
|||||||
|
|
||||||
kadm5_ret_t
|
kadm5_ret_t
|
||||||
kadm5_c_get_principals(void *server_handle,
|
kadm5_c_get_principals(void *server_handle,
|
||||||
const char *exp,
|
const char *expression,
|
||||||
char ***princs,
|
char ***princs,
|
||||||
int *count)
|
int *count)
|
||||||
{
|
{
|
||||||
@@ -56,9 +56,9 @@ kadm5_c_get_principals(void *server_handle,
|
|||||||
if (sp == NULL)
|
if (sp == NULL)
|
||||||
return ENOMEM;
|
return ENOMEM;
|
||||||
krb5_store_int32(sp, kadm_get_princs);
|
krb5_store_int32(sp, kadm_get_princs);
|
||||||
krb5_store_int32(sp, exp != NULL);
|
krb5_store_int32(sp, expression != NULL);
|
||||||
if(exp)
|
if(expression)
|
||||||
krb5_store_string(sp, exp);
|
krb5_store_string(sp, expression);
|
||||||
ret = _kadm5_client_send(context, sp);
|
ret = _kadm5_client_send(context, sp);
|
||||||
krb5_storage_free(sp);
|
krb5_storage_free(sp);
|
||||||
ret = _kadm5_client_recv(context, &reply);
|
ret = _kadm5_client_recv(context, &reply);
|
||||||
|
@@ -78,7 +78,7 @@ foreach(krb5_context context, HDB *db, hdb_entry *ent, void *data)
|
|||||||
|
|
||||||
kadm5_ret_t
|
kadm5_ret_t
|
||||||
kadm5_s_get_principals(void *server_handle,
|
kadm5_s_get_principals(void *server_handle,
|
||||||
const char *exp,
|
const char *expression,
|
||||||
char ***princs,
|
char ***princs,
|
||||||
int *count)
|
int *count)
|
||||||
{
|
{
|
||||||
@@ -90,11 +90,11 @@ kadm5_s_get_principals(void *server_handle,
|
|||||||
krb5_warn(context->context, ret, "opening database");
|
krb5_warn(context->context, ret, "opening database");
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
d.exp = exp;
|
d.exp = expression;
|
||||||
{
|
{
|
||||||
krb5_realm r;
|
krb5_realm r;
|
||||||
krb5_get_default_realm(context->context, &r);
|
krb5_get_default_realm(context->context, &r);
|
||||||
asprintf(&d.exp2, "%s@%s", exp, r);
|
asprintf(&d.exp2, "%s@%s", expression, r);
|
||||||
free(r);
|
free(r);
|
||||||
}
|
}
|
||||||
d.princs = NULL;
|
d.princs = NULL;
|
||||||
|
Reference in New Issue
Block a user