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

Fix warning in ! NO_AFS case

Browse Source
This commit is contained in:
Nicolas Williams
2013-08-19 17:19:26 -05:00
parent 36f22356c5
commit 129b4f3720
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kuser/kinit.c
View File

@@ -879,6 +879,9 @@ renew_func(void *ptr)
struct renew_ctx *ctx = ptr; struct renew_ctx *ctx = ptr;
time_t renew_expire; time_t renew_expire;
static time_t exp_delay = 1; static time_t exp_delay = 1;
#ifndef NO_AFS;
size_t got_tix = 0;
#endif
/* /*
* NOTE: We count on the ccache implementation to notice changes to the * NOTE: We count on the ccache implementation to notice changes to the
@@ -896,6 +899,9 @@ renew_func(void *ptr)
server_str, ctx->ticket_life); server_str, ctx->ticket_life);
expire = ticket_lifetime(ctx->context, ctx->ccache, ctx->principal, expire = ticket_lifetime(ctx->context, ctx->ccache, ctx->principal,
server_str, &renew_expire); server_str, &renew_expire);
#ifndef NO_AFS
got_tix = ret == 0;
#endif
} }
if (expire < ctx->ticket_life / 2) { if (expire < ctx->ticket_life / 2) {
@@ -903,10 +909,13 @@ renew_func(void *ptr)
ctx->ccache, ctx->ticket_life, 0); ctx->ccache, ctx->ticket_life, 0);
expire = ticket_lifetime(ctx->context, ctx->ccache, ctx->principal, expire = ticket_lifetime(ctx->context, ctx->ccache, ctx->principal,
server_str, &renew_expire); server_str, &renew_expire);
#ifndef NO_AFS
got_tix = got_tix || ret == 0;
#endif
} }
#ifndef NO_AFS #ifndef NO_AFS
if (ret == 0 && server_str == NULL && do_afslog && k_hasafs()) if (got_tix && server_str == NULL && do_afslog && k_hasafs())
krb5_afslog(ctx->context, ctx->ccache, NULL, NULL); krb5_afslog(ctx->context, ctx->ccache, NULL, NULL);
#endif #endif