From d2d1edf80a328b75b548db57b819bb6745fd3e21 Mon Sep 17 00:00:00 2001
From: Sergey Dorofeev <sergey@fidoman.ru>
Date: Sun, 5 Feb 2012 23:28:42 +0400
Subject: [PATCH] disable NR in NETSPOOL mode due to fatal incompatibility

---
 source/bforce/prot_binkp.c  |  4 ++--
 source/bforce/prot_common.c | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/source/bforce/prot_binkp.c b/source/bforce/prot_binkp.c
index 274cffe..e9528af 100644
--- a/source/bforce/prot_binkp.c
+++ b/source/bforce/prot_binkp.c
@@ -441,7 +441,7 @@ int binkp_transfer(s_protinfo *pi) {
 	if (remote->options & BINKP_OPT_NR) {
 	  binkp_queuemsgf(&bpi,BPMSG_FILE,"%s %ld %ld -1",name,total,time);
 	  binkp_send_state = BPT_Wait_M_GET;
-	  log("binkp going to BPT_Wait_M_GET");
+	  /*log("binkp going to BPT_Wait_M_GET");*/
 	} else {
 	  binkp_queuemsgf(&bpi,BPMSG_FILE,"%s %ld %ld 0", name,total,time);
 	  binkp_send_state = BPT_Send_File;
@@ -449,7 +449,7 @@ int binkp_transfer(s_protinfo *pi) {
       }
     }
     if (binkp_send_state == BPT_Send_File) {
-      log("binkp BPT_Send_File");
+      /*log("binkp BPT_Send_File");*/
       if (bpi.opos == 0 && bpi.n_msgs == 0) {
 	if((n = p_tx_readfile (bpi.obuf+BINKP_BLK_HDRSIZE,4096,pi))<0) {
 	  p_tx_fclose (pi);
diff --git a/source/bforce/prot_common.c b/source/bforce/prot_common.c
index 21273bb..06ceecc 100644
--- a/source/bforce/prot_common.c
+++ b/source/bforce/prot_common.c
@@ -102,9 +102,9 @@ static int prot_get_next_file(s_filelist **dest, s_protinfo *pi)
 	/* network queue */
 #ifdef NETSPOOL
 
-	log("netspool next file");
+	/*log("netspool next file");*/
 	if(state.netspool.state == NS_NOTINIT) {
-	    log("new netspool connection");
+	    /*log("new netspool connection");*/
 	    char password[100];
 	    char address[300];
 	    char *host = conf_string(cf_netspool_host);
@@ -121,18 +121,18 @@ static int prot_get_next_file(s_filelist **dest, s_protinfo *pi)
 		} else {
 		    password[0] = 0;
 		}
-		log("netspool start %s %s %s %s", host, port, address, password);
+		log("netspool start %s %s %s (pwd)", host, port, address);
 		netspool_start(&state.netspool, host, port, address, password);
 	    }
 	}
 
 	if(state.netspool.state == NS_READY) {
-	    log("netspool request");
+	    /*log("netspool request");*/
 	    netspool_query(&state.netspool, "ALL");
 	}
 
 	if(state.netspool.state == NS_RECEIVING) {
-	    log("netspool begin receive");
+	    /*log("netspool begin receive");*/
 	    netspool_receive(&state.netspool);
 	} else {
 	    log("netspool could not start receive");
@@ -140,13 +140,13 @@ static int prot_get_next_file(s_filelist **dest, s_protinfo *pi)
 	}
 
 	if(state.netspool.state == NS_RECVFILE) {
-	    log("netspool start file");
+	    /*log("netspool start file");*/
 	    *dest = NULL;
 	    return 0;
 	}
 
 	if(state.netspool.state == NS_READY) {
-	    log("no files to receive");
+	    log("netspool queue empty");
 	    netspool_end(&state.netspool);
 	}
 
@@ -486,7 +486,7 @@ int p_tx_readfile(char *buffer, size_t buflen, s_protinfo *pi)
 
 #ifdef NETSPOOL
 	if(pi->send->fname==NULL && strcmp(pi->send->local_name, "NETSPOOL")==0 ) {
-	    log("reading netspool file");
+	    /*log("reading netspool file");*/
 	    if( state.netspool.state != NS_RECVFILE ) {
 		log("send: wrong netspool state");
 		pi->send->status = FSTAT_SKIPPED;
@@ -499,10 +499,10 @@ int p_tx_readfile(char *buffer, size_t buflen, s_protinfo *pi)
 		pi->send->status = FSTAT_SKIPPED;
 		return -2;
 	    }
-	    log("got %d bytes from netspool", n);
+	    /*log("got %d bytes from netspool", n);*/
 	    return n;
 	} else {
-	    log("reading local file");
+	    /*log("reading local file");*/
 	}
 #endif
 	/*