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

Shut up VC

Browse Source
This commit is contained in:
Nicolas Williams
2016-02-26 21:29:27 -06:00
parent c350ca6f6e
commit 6cc69e0b1f
1 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/kadm5/log.c
View File

@@ -459,10 +459,11 @@ kadm5_ret_t
kadm5_log_get_version_fd(kadm5_server_context *server_context, int fd, kadm5_log_get_version_fd(kadm5_server_context *server_context, int fd,
int which, uint32_t *ver, uint32_t *tstamp) int which, uint32_t *ver, uint32_t *tstamp)
{ {
kadm5_ret_t ret; kadm5_ret_t ret = 0;
krb5_storage *sp; krb5_storage *sp;
enum kadm_ops op; enum kadm_ops op = kadm_get;
uint32_t len, tmp; uint32_t len = 0;
uint32_t tmp;
if (fd == -1) if (fd == -1)
return 0; /* /dev/null */ return 0; /* /dev/null */
@@ -476,38 +477,34 @@ kadm5_log_get_version_fd(kadm5_server_context *server_context, int fd,
switch (which) { switch (which) {
case LOG_VERSION_LAST: case LOG_VERSION_LAST:
sp = kadm5_log_goto_end(server_context, fd); sp = kadm5_log_goto_end(server_context, fd);
if (sp == NULL)
return errno;
ret = get_version_prev(sp, ver, tstamp);
krb5_storage_free(sp);
break; break;
case LOG_VERSION_FIRST: case LOG_VERSION_FIRST:
sp = log_goto_first(server_context, fd); sp = log_goto_first(server_context, fd);
if (sp == NULL)
return errno;
ret = get_header(sp, LOG_DOPEEK, ver, tstamp, NULL, NULL);
krb5_storage_free(sp);
break; break;
case LOG_VERSION_UBER: case LOG_VERSION_UBER:
sp = krb5_storage_from_fd(server_context->log_context.log_fd); sp = krb5_storage_from_fd(server_context->log_context.log_fd);
break;
default:
return ENOTSUP;
}
if (sp == NULL) if (sp == NULL)
return errno; return errno;
switch (which) {
case LOG_VERSION_LAST:
ret = get_version_prev(sp, ver, tstamp);
break;
case LOG_VERSION_FIRST:
ret = get_header(sp, LOG_DOPEEK, ver, tstamp, NULL, NULL);
break;
case LOG_VERSION_UBER:
ret = 0;
if (krb5_storage_seek(sp, 0, SEEK_SET) == 0) if (krb5_storage_seek(sp, 0, SEEK_SET) == 0)
ret = get_header(sp, LOG_DOPEEK, ver, tstamp, &op, &len); ret = get_header(sp, LOG_DOPEEK, ver, tstamp, &op, &len);
else else
ret = errno; ret = errno;
if (ret == 0 && (op != kadm_nop || len != LOG_UBER_SZ)) if (ret == 0 && (op != kadm_nop || len != LOG_UBER_SZ))
ret = KADM5_LOG_NEEDS_UPGRADE; ret = KADM5_LOG_NEEDS_UPGRADE;
break;
}
krb5_storage_free(sp); krb5_storage_free(sp);
break;
default:
return ENOTSUP;
}
return ret; return ret;
} }