remove trailing whitespace
This commit is contained in:
@@ -71,7 +71,7 @@ typedef struct krb5_get_init_creds_ctx {
|
||||
KRB_ERROR error;
|
||||
AS_REP as_rep;
|
||||
EncKDCRepPart enc_part;
|
||||
|
||||
|
||||
krb5_prompter_fct prompter;
|
||||
void *prompter_data;
|
||||
|
||||
@@ -313,14 +313,14 @@ process_last_request(krb5_context context,
|
||||
if (lr->val[i].lr_value <= t) {
|
||||
switch (abs(lr->val[i].lr_type)) {
|
||||
case LR_PW_EXPTIME :
|
||||
report_expiration(context, ctx->prompter,
|
||||
report_expiration(context, ctx->prompter,
|
||||
ctx->prompter_data,
|
||||
"Your password will expire at ",
|
||||
lr->val[i].lr_value);
|
||||
reported = TRUE;
|
||||
break;
|
||||
case LR_ACCT_EXPTIME :
|
||||
report_expiration(context, ctx->prompter,
|
||||
report_expiration(context, ctx->prompter,
|
||||
ctx->prompter_data,
|
||||
"Your account will expire at ",
|
||||
lr->val[i].lr_value);
|
||||
@@ -333,7 +333,7 @@ process_last_request(krb5_context context,
|
||||
if (!reported
|
||||
&& ctx->enc_part.key_expiration
|
||||
&& *ctx->enc_part.key_expiration <= t) {
|
||||
report_expiration(context, ctx->prompter,
|
||||
report_expiration(context, ctx->prompter,
|
||||
ctx->prompter_data,
|
||||
"Your password/account will expire at ",
|
||||
*ctx->enc_part.key_expiration);
|
||||
@@ -367,7 +367,7 @@ get_init_creds_common(krb5_context context,
|
||||
|
||||
if (options->opt_private) {
|
||||
if (options->opt_private->password) {
|
||||
ret = krb5_init_creds_set_password(context, ctx,
|
||||
ret = krb5_init_creds_set_password(context, ctx,
|
||||
options->opt_private->password);
|
||||
if (ret)
|
||||
goto out;
|
||||
@@ -384,7 +384,7 @@ get_init_creds_common(krb5_context context,
|
||||
ctx->keyproc = default_s2k_func;
|
||||
|
||||
/* Enterprise name implicitly turns on canonicalize */
|
||||
if ((ctx->ic_flags & KRB5_INIT_CREDS_CANONICALIZE) ||
|
||||
if ((ctx->ic_flags & KRB5_INIT_CREDS_CANONICALIZE) ||
|
||||
krb5_principal_get_type(context, client) == KRB5_NT_ENTERPRISE_PRINCIPAL)
|
||||
ctx->flags.canonicalize = 1;
|
||||
|
||||
@@ -1179,14 +1179,14 @@ process_pa_data_to_md(krb5_context context,
|
||||
_krb5_debug(context, 5, "krb5_get_init_creds: "
|
||||
"prepareing PKINIT padata (%s)",
|
||||
(ctx->used_pa_types & USED_PKINIT_W2K) ? "win2k" : "ietf");
|
||||
|
||||
|
||||
if (ctx->used_pa_types & USED_PKINIT_W2K) {
|
||||
krb5_set_error_message(context, KRB5_GET_IN_TKT_LOOP,
|
||||
"Already tried pkinit, looping");
|
||||
return KRB5_GET_IN_TKT_LOOP;
|
||||
}
|
||||
|
||||
ret = pa_data_to_md_pkinit(context, a, creds->client,
|
||||
ret = pa_data_to_md_pkinit(context, a, creds->client,
|
||||
(ctx->used_pa_types & USED_PKINIT),
|
||||
ctx, *out_md);
|
||||
if (ret)
|
||||
@@ -1526,14 +1526,14 @@ krb5_init_creds_set_keytab(krb5_context context,
|
||||
krb5_error_code ret;
|
||||
size_t netypes = 0;
|
||||
int kvno = 0;
|
||||
|
||||
|
||||
a = malloc(sizeof(*a));
|
||||
if (a == NULL) {
|
||||
krb5_set_error_message(context, ENOMEM,
|
||||
N_("malloc: out of memory", ""));
|
||||
return ENOMEM;
|
||||
}
|
||||
|
||||
|
||||
a->principal = ctx->cred.client;
|
||||
a->keytab = keytab;
|
||||
|
||||
@@ -1568,7 +1568,7 @@ krb5_init_creds_set_keytab(krb5_context context,
|
||||
kvno = entry.vno;
|
||||
} else if (entry.vno != kvno)
|
||||
goto next;
|
||||
|
||||
|
||||
/* check if enctype is supported */
|
||||
if (krb5_enctype_valid(context, entry.keyblock.keytype) != 0)
|
||||
goto next;
|
||||
@@ -1619,7 +1619,7 @@ krb5_init_creds_set_keyblock(krb5_context context,
|
||||
|
||||
/**
|
||||
* The core loop if krb5_get_init_creds() function family. Create the
|
||||
* packets and have the caller send them off to the KDC.
|
||||
* packets and have the caller send them off to the KDC.
|
||||
*
|
||||
* If the caller want all work been done for them, use
|
||||
* krb5_init_creds_get() instead.
|
||||
@@ -1768,13 +1768,13 @@ krb5_init_creds_step(krb5_context context,
|
||||
"options send by KDC", ""));
|
||||
}
|
||||
} else if (ret == KRB5KRB_AP_ERR_SKEW && context->kdc_sec_offset == 0) {
|
||||
/*
|
||||
/*
|
||||
* Try adapt to timeskrew when we are using pre-auth, and
|
||||
* if there was a time skew, try again.
|
||||
*/
|
||||
krb5_set_real_time(context, ctx->error.stime, -1);
|
||||
if (context->kdc_sec_offset)
|
||||
ret = 0;
|
||||
ret = 0;
|
||||
|
||||
_krb5_debug(context, 10, "init_creds: err skew updateing kdc offset to %d",
|
||||
context->kdc_sec_offset);
|
||||
@@ -1793,7 +1793,7 @@ krb5_init_creds_step(krb5_context context,
|
||||
"krb5_get_init_creds: got referal to realm %s",
|
||||
*ctx->error.crealm);
|
||||
|
||||
ret = krb5_principal_set_realm(context,
|
||||
ret = krb5_principal_set_realm(context,
|
||||
ctx->cred.client,
|
||||
*ctx->error.crealm);
|
||||
|
||||
@@ -1934,7 +1934,7 @@ krb5_init_creds_get(krb5_context context, krb5_init_creds_context ctx)
|
||||
if ((flags & 1) == 0)
|
||||
break;
|
||||
|
||||
ret = krb5_sendto_context (context, stctx, &out,
|
||||
ret = krb5_sendto_context (context, stctx, &out,
|
||||
ctx->cred.client->realm, &in);
|
||||
if (ret)
|
||||
goto out;
|
||||
@@ -2013,7 +2013,7 @@ krb5_get_init_creds_password(krb5_context context,
|
||||
}
|
||||
|
||||
ret = krb5_init_creds_get(context, ctx);
|
||||
|
||||
|
||||
if (ret == 0)
|
||||
process_last_request(context, options, ctx);
|
||||
|
||||
|
Reference in New Issue
Block a user