[Radmind-commit] radmind lapply.c,1.136,1.137

[Patrick M. <ume...@us...>]

Update of /cvsroot/radmind/radmind
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22096

Modified Files:
	lapply.c 
Log Message:
lapply doesn't attempt to report when run with -n
Fixes bug # 1720312


Index: lapply.c
===================================================================
RCS file: /cvsroot/radmind/radmind/lapply.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -d -r1.136 -r1.137
*** lapply.c	28 Dec 2006 17:05:34 -0000	1.136
--- lapply.c	18 May 2007 19:10:27 -0000	1.137
***************
*** 430,449 ****
  	    }
          }
-     } else {
- 	if ( !quiet ) printf( "No network connection\n" );
-     }
  
  #ifdef HAVE_ZLIB
!     /* Enable compression */
!     if ( zlib_level > 0 ) {
! 	if ( negotiate_compression( sn, capa ) != 0 ) {
! 		exit( 2 );
  	}
-     }
  #endif /* HAVE_ZLIB */
  
!     /* Turn off reporting if server doesn't support it */
!     if ( check_capability( "REPO", capa ) == 0 ) {
! 	report = 0;
      }
  
--- 430,449 ----
  	    }
          }
  
  #ifdef HAVE_ZLIB
! 	/* Enable compression */
! 	if ( zlib_level > 0 ) {
! 	    if ( negotiate_compression( sn, capa ) != 0 ) {
! 		    exit( 2 );
! 	    }
  	}
  #endif /* HAVE_ZLIB */
  
! 	/* Turn off reporting if server doesn't support it */
! 	if ( check_capability( "REPO", capa ) == 0 ) {
! 	    report = 0;
! 	}
!     } else {
! 	if ( !quiet ) printf( "No network connection\n" );
      }
  
***************
*** 748,752 ****
  #endif /* HAVE_ZLIB */
  	if ( change ) {
! 	    if ( report ) {
  		if ( report_event( sn, "lapply",
  			"Error, changes made" ) != 0 ) {
--- 748,752 ----
  #endif /* HAVE_ZLIB */
  	if ( change ) {
! 	    if ( network && report ) {
  		if ( report_event( sn, "lapply",
  			"Error, changes made" ) != 0 ) {
***************
*** 755,759 ****
  	    }
  	} else {
! 	    if ( report ) {
  		if ( report_event( sn, "lapply",
  			"Error, no changes made" ) != 0 ) {
--- 755,759 ----
  	    }
  	} else {
! 	    if ( network && report ) {
  		if ( report_event( sn, "lapply",
  			"Error, no changes made" ) != 0 ) {