27c27
< __FBSDID("$FreeBSD: head/libexec/tftpd/tftp-transfer.c 207614 2010-05-04 13:07:40Z imp $");
---
> __FBSDID("$FreeBSD: head/libexec/tftpd/tftp-transfer.c 224536 2011-07-31 03:12:20Z rodrigc $");
132,136c132,139
< tftp_log(LOG_ERR,
< "Block rollover but not allowed.");
< send_error(peer, EBADOP);
< gettimeofday(&(ts->tstop), NULL);
< return;
---
> /*
> * "rollover" option not specified in
> * tftp client. Default to rolling block
> * counter to 0.
> */
> *block = 0;
> } else {
> *block = atoi(options[OPT_ROLLOVER].o_request);
139d141
< *block = atoi(options[OPT_ROLLOVER].o_request);
199,203c201,208
< tftp_log(LOG_ERR,
< "Block rollover but not allowed.");
< send_error(peer, EBADOP);
< gettimeofday(&(ts->tstop), NULL);
< return;
---
> /*
> * "rollover" option not specified in
> * tftp client. Default to rolling block
> * counter to 0.
> */
> *block = 0;
> } else {
> *block = atoi(options[OPT_ROLLOVER].o_request);
206d210
< *block = atoi(options[OPT_ROLLOVER].o_request);