krb5_princ_realm -> krb5_principal_get_realm
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13022 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -632,7 +632,7 @@ krb5_set_password (krb5_context context,
|
|||||||
principal = targprinc;
|
principal = targprinc;
|
||||||
|
|
||||||
ret = krb5_make_principal(context, &creds.server,
|
ret = krb5_make_principal(context, &creds.server,
|
||||||
*krb5_princ_realm(context, principal),
|
krb5_principal_get_realm(context, principal),
|
||||||
"kadmin", "changepw", NULL);
|
"kadmin", "changepw", NULL);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
|
@@ -344,7 +344,7 @@ krb524_convert_creds_kdc(krb5_context context,
|
|||||||
krb5_krbhst_handle handle;
|
krb5_krbhst_handle handle;
|
||||||
|
|
||||||
ret = krb5_krbhst_init(context,
|
ret = krb5_krbhst_init(context,
|
||||||
*krb5_princ_realm(context,
|
krb5_principal_get_realm(context,
|
||||||
v5_creds->server),
|
v5_creds->server),
|
||||||
KRB5_KRBHST_KRB524,
|
KRB5_KRBHST_KRB524,
|
||||||
&handle);
|
&handle);
|
||||||
|
@@ -243,10 +243,10 @@ krb5_get_forwarded_creds (krb5_context context,
|
|||||||
|
|
||||||
if (auth_context->local_address && auth_context->local_port) {
|
if (auth_context->local_address && auth_context->local_port) {
|
||||||
krb5_boolean noaddr;
|
krb5_boolean noaddr;
|
||||||
const krb5_realm *realm;
|
krb5_const_realm realm;
|
||||||
|
|
||||||
realm = krb5_princ_realm(context, out_creds->server);
|
realm = krb5_principal_get_realm(context, out_creds->server);
|
||||||
krb5_appdefault_boolean(context, NULL, *realm, "no-addresses", FALSE,
|
krb5_appdefault_boolean(context, NULL, realm, "no-addresses", FALSE,
|
||||||
&noaddr);
|
&noaddr);
|
||||||
if (!noaddr) {
|
if (!noaddr) {
|
||||||
ret = krb5_make_addrport (context,
|
ret = krb5_make_addrport (context,
|
||||||
@@ -261,10 +261,10 @@ krb5_get_forwarded_creds (krb5_context context,
|
|||||||
if (auth_context->remote_address) {
|
if (auth_context->remote_address) {
|
||||||
if (auth_context->remote_port) {
|
if (auth_context->remote_port) {
|
||||||
krb5_boolean noaddr;
|
krb5_boolean noaddr;
|
||||||
const krb5_realm *realm;
|
krb5_const_realm realm;
|
||||||
|
|
||||||
realm = krb5_princ_realm(context, out_creds->server);
|
realm = krb5_principal_get_realm(context, out_creds->server);
|
||||||
krb5_appdefault_boolean(context, NULL, *realm, "no-addresses",
|
krb5_appdefault_boolean(context, NULL, realm, "no-addresses",
|
||||||
FALSE, &noaddr);
|
FALSE, &noaddr);
|
||||||
if (!noaddr) {
|
if (!noaddr) {
|
||||||
ret = krb5_make_addrport (context,
|
ret = krb5_make_addrport (context,
|
||||||
|
@@ -150,7 +150,7 @@ init_cred (krb5_context context,
|
|||||||
krb5_get_init_creds_opt *options)
|
krb5_get_init_creds_opt *options)
|
||||||
{
|
{
|
||||||
krb5_error_code ret;
|
krb5_error_code ret;
|
||||||
krb5_realm *client_realm;
|
krb5_const_realm client_realm;
|
||||||
int tmp;
|
int tmp;
|
||||||
krb5_timestamp now;
|
krb5_timestamp now;
|
||||||
|
|
||||||
@@ -167,7 +167,7 @@ init_cred (krb5_context context,
|
|||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
client_realm = krb5_princ_realm (context, cred->client);
|
client_realm = krb5_principal_get_realm (context, cred->client);
|
||||||
|
|
||||||
if (start_time)
|
if (start_time)
|
||||||
cred->times.starttime = now + start_time;
|
cred->times.starttime = now + start_time;
|
||||||
@@ -189,12 +189,12 @@ init_cred (krb5_context context,
|
|||||||
ret = krb5_parse_name (context, in_tkt_service, &cred->server);
|
ret = krb5_parse_name (context, in_tkt_service, &cred->server);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
server_realm = strdup (*client_realm);
|
server_realm = strdup (client_realm);
|
||||||
free (*krb5_princ_realm(context, cred->server));
|
free (*krb5_princ_realm(context, cred->server));
|
||||||
krb5_princ_set_realm (context, cred->server, &server_realm);
|
krb5_princ_set_realm (context, cred->server, &server_realm);
|
||||||
} else {
|
} else {
|
||||||
ret = krb5_make_principal(context, &cred->server,
|
ret = krb5_make_principal(context, &cred->server,
|
||||||
*client_realm, KRB5_TGS_NAME, *client_realm,
|
client_realm, KRB5_TGS_NAME, client_realm,
|
||||||
NULL);
|
NULL);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
@@ -230,7 +230,7 @@ report_expiration (krb5_context context,
|
|||||||
|
|
||||||
static void
|
static void
|
||||||
print_expire (krb5_context context,
|
print_expire (krb5_context context,
|
||||||
krb5_realm *realm,
|
krb5_const_realm realm,
|
||||||
krb5_kdc_rep *rep,
|
krb5_kdc_rep *rep,
|
||||||
krb5_prompter_fct prompter,
|
krb5_prompter_fct prompter,
|
||||||
krb5_data *data)
|
krb5_data *data)
|
||||||
@@ -244,7 +244,7 @@ print_expire (krb5_context context,
|
|||||||
krb5_timeofday (context, &sec);
|
krb5_timeofday (context, &sec);
|
||||||
|
|
||||||
t = sec + get_config_time (context,
|
t = sec + get_config_time (context,
|
||||||
*realm,
|
realm,
|
||||||
"warn_pwexpire",
|
"warn_pwexpire",
|
||||||
7 * 24 * 60 * 60);
|
7 * 24 * 60 * 60);
|
||||||
|
|
||||||
@@ -1372,7 +1372,7 @@ krb5_get_init_creds(krb5_context context,
|
|||||||
|
|
||||||
if (prompter)
|
if (prompter)
|
||||||
print_expire (context,
|
print_expire (context,
|
||||||
krb5_princ_realm (context, ctx.cred.client),
|
krb5_principal_get_realm (context, ctx.cred.client),
|
||||||
&kdc_reply,
|
&kdc_reply,
|
||||||
prompter,
|
prompter,
|
||||||
data);
|
data);
|
||||||
|
@@ -143,7 +143,7 @@ verify_user_opt_int(krb5_context context,
|
|||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
krb5_get_init_creds_opt_set_default_flags(context, NULL,
|
krb5_get_init_creds_opt_set_default_flags(context, NULL,
|
||||||
*krb5_princ_realm(context, principal),
|
krb5_principal_get_realm(context, principal),
|
||||||
opt);
|
opt);
|
||||||
ret = krb5_get_init_creds_password (context,
|
ret = krb5_get_init_creds_password (context,
|
||||||
&cred,
|
&cred,
|
||||||
|
Reference in New Issue
Block a user