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

iprop: handle case where master sends nothing new

Browse Source
This commit is contained in:
Nicolas Williams
2017-01-25 18:50:03 -06:00
parent ed46a9b2a6
commit 656e4c4f42
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/kadm5/ipropd_slave.c
View File

@@ -317,6 +317,11 @@ receive_loop (krb5_context context,
uint32_t timestamp; uint32_t timestamp;
uint32_t op; uint32_t op;
if ((ret = krb5_ret_uint32(sp, &vers)) == HEIM_ERR_EOF) {
krb5_warnx(context, "master sent no new iprop entries");
return 0;
}
/* /*
* TODO We could do more to validate the entries from the master * TODO We could do more to validate the entries from the master
* here. And we could use/reuse more kadm5_log_*() code here. * here. And we could use/reuse more kadm5_log_*() code here.
@@ -325,8 +330,7 @@ receive_loop (krb5_context context,
* what we needed and just write this to the log file and let * what we needed and just write this to the log file and let
* kadm5_log_recover() do the rest. * kadm5_log_recover() do the rest.
*/ */
if (krb5_ret_uint32(sp, &vers) != 0 || if (ret || krb5_ret_uint32(sp, &timestamp) != 0 ||
krb5_ret_uint32(sp, &timestamp) != 0 ||
krb5_ret_uint32(sp, &op) != 0 || krb5_ret_uint32(sp, &op) != 0 ||
krb5_ret_uint32(sp, &len) != 0) { krb5_ret_uint32(sp, &len) != 0) {