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

ipropd-slave: incorrect errors

Browse Source
This commit is contained in:
Nicolas Williams
2017-01-25 13:42:18 -06:00
parent 3a0bf8eb0c
commit ed46a9b2a6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/kadm5/ipropd_slave.c
View File

@@ -344,7 +344,7 @@ receive_loop (krb5_context context,
off = krb5_storage_seek(sp, 0, SEEK_CUR); off = krb5_storage_seek(sp, 0, SEEK_CUR);
if (krb5_storage_seek(sp, len + 8, SEEK_CUR) != off + len + 8) { if (krb5_storage_seek(sp, len + 8, SEEK_CUR) != off + len + 8) {
krb5_warnx(context, "iprop entries from master were truncated"); krb5_warnx(context, "iprop entries from master were truncated");
return 0; return EINVAL;
} }
if (verbose) { if (verbose) {
krb5_warnx(context, "diff contains old log record version " krb5_warnx(context, "diff contains old log record version "
@@ -416,7 +416,7 @@ receive(krb5_context context,
ret2 = receive_loop(context, sp, server_context); ret2 = receive_loop(context, sp, server_context);
if (ret2) if (ret2)
krb5_warn(context, ret, "receive from ipropd-master had errors"); krb5_warn(context, ret2, "receive from ipropd-master had errors");
ret = server_context->db->hdb_close(context, server_context->db); ret = server_context->db->hdb_close(context, server_context->db);
if (ret) if (ret)
@@ -962,7 +962,7 @@ main(int argc, char **argv)
krb5_warnx(context, "master sent us diffs"); krb5_warnx(context, "master sent us diffs");
ret2 = receive(context, sp, server_context); ret2 = receive(context, sp, server_context);
if (ret2) if (ret2)
krb5_warn(context, ret, krb5_warn(context, ret2,
"receive from ipropd-master had errors"); "receive from ipropd-master had errors");
ret = ihave(context, auth_context, master_fd, ret = ihave(context, auth_context, master_fd,
server_context->log_context.version); server_context->log_context.version);