Imported Upstream version 2.6.1p2

[debian/amanda] / server-src / taper-mem-port-source.c

diff --git a/server-src/taper-mem-port-source.c b/server-src/taper-mem-port-source.c
index d201e45a03757b1a3b16c7b15acd020822fe9819..7c7e266565ad7d4bad09988e9aaf20ee979d45bb 100644 (file)
--- a/server-src/taper-mem-port-source.c
+++ b/server-src/taper-mem-port-source.c
@@ -162,6 +162,12 @@ taper_mem_port_source_read (TaperSource * pself, void * buf, size_t count) {
 
         memcpy(buf, selfp->retry_buffer + selfp->buffer_offset, count);
         selfp->buffer_offset += count;
+
+       /* cancel retry mode if we're at the end of the retry buffer */
+       if (selfp->buffer_offset == selfp->buffer_len) {
+           selfp->retry_mode = 0;
+       }
+
         return count;
     } else {
         int read_result;