radmind-commit Mailing List for Radmind (Page 11)

Brought to you by: fitterhappier, shannahs, umeditor, uurazzle, wescraig

radmind-commit — CVS commit messages.

You can subscribe to this list here.

2006	Jan	Feb (52)	Mar (83)	Apr (37)	May (23)	Jun (9)	Jul (10)	Aug (30)	Sep (4)	Oct (9)	Nov (10)	Dec (7)
2007	Jan (3)	Feb (20)	Mar (3)	Apr	May (10)	Jun (17)	Jul (11)	Aug (6)	Sep (6)	Oct	Nov (15)	Dec (15)
2008	Jan (12)	Feb (1)	Mar (13)	Apr (7)	May (4)	Jun (37)	Jul (9)	Aug (7)	Sep	Oct	Nov	Dec (1)
2009	Jan (1)	Feb (11)	Mar	Apr	May	Jun	Jul	Aug (2)	Sep	Oct (1)	Nov	Dec
2010	Jan (3)	Feb (1)	Mar	Apr	May (2)	Jun (2)	Jul (1)	Aug	Sep	Oct (4)	Nov (6)	Dec (2)
2011	Jan (1)	Feb (1)	Mar	Apr	May	Jun (4)	Jul	Aug	Sep (3)	Oct (3)	Nov (6)	Dec
2012	Jan	Feb	Mar	Apr (1)	May (2)	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec
2014	Jan (3)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 9 10 11 12 13 .. 22 > >> (Page 11 of 22)

[Radmind-commit] radmind ktcheck.c,1.116,1.117

From: Patrick M. <ume...@us...> - 2007-02-19 16:09:57

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

Modified Files:
	ktcheck.c 
Log Message:
Exit immediately if server returns 5xx to avoid cascading error messages.


Index: ktcheck.c
===================================================================
RCS file: /cvsroot/radmind/radmind/ktcheck.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** ktcheck.c	28 Dec 2006 17:05:34 -0000	1.116
--- ktcheck.c	19 Feb 2007 16:09:54 -0000	1.117
***************
*** 259,263 ****
      if ( *line != '2' ) {
  	fprintf( stderr, "%s\n",  line );
! 	return( -1 );
      }
  
--- 259,267 ----
      if ( *line != '2' ) {
  	fprintf( stderr, "%s\n",  line );
! 	if ( *line == '5' ) {
! 	    exit( 2 );
! 	} else {
! 	    return( -1 );
! 	}
      }

[Radmind-commit] radmind repo.c,1.3,1.4

From: Andrew M. <fit...@us...> - 2007-02-19 15:57:25

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

Modified Files:
	repo.c 
Log Message:
Fix double message reporting if message is only one argument.


Index: repo.c
===================================================================
RCS file: /cvsroot/radmind/radmind/repo.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** repo.c	28 Dec 2006 17:05:34 -0000	1.3
--- repo.c	19 Feb 2007 15:57:17 -0000	1.4
***************
*** 46,50 ****
      SNET		*sn;
      int			c, port = htons( 6662 );
!     int			i = 0, err = 0, len;
      int			authlevel = _RADMIND_AUTHLEVEL;
      int			use_randfile = 0;
--- 46,50 ----
      SNET		*sn;
      int			c, port = htons( 6662 );
!     int			i = 1, err = 0, len;
      int			authlevel = _RADMIND_AUTHLEVEL;
      int			use_randfile = 0;

[Radmind-commit] radmind daemon.c,1.77,1.78

From: Patrick M. <ume...@us...> - 2007-02-18 23:20:00

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

Modified Files:
	daemon.c 
Log Message:
Default rap_extensions to 1 so REPO is offered by default.


Index: daemon.c
===================================================================
RCS file: /cvsroot/radmind/radmind/daemon.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** daemon.c	22 Sep 2006 20:44:41 -0000	1.77
--- daemon.c	18 Feb 2007 23:19:57 -0000	1.78
***************
*** 58,62 ****
  int             child_signal = 0;
  int		maxconnections = _RADMIND_MAXCONNECTIONS; /* 0 = no limit */
! int		rap_extensions = 0;
  char		*radmind_path = _RADMIND_PATH;
  SSL_CTX         *ctx = NULL;
--- 58,62 ----
  int             child_signal = 0;
  int		maxconnections = _RADMIND_MAXCONNECTIONS; /* 0 = no limit */
! int		rap_extensions = 1;			/* 1 for REPO */
  char		*radmind_path = _RADMIND_PATH;
  SSL_CTX         *ctx = NULL;

[Radmind-commit] radmind ra.sh,1.37,1.38

From: Patrick M. <ume...@us...> - 2007-02-07 15:30:34

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

Modified Files:
	ra.sh 
Log Message:
ra.sh auto now does pre/post apply.
Thanks Sean Sweda.


Index: ra.sh
===================================================================
RCS file: /cvsroot/radmind/radmind/ra.sh,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** ra.sh	7 Feb 2007 15:28:09 -0000	1.37
--- ra.sh	7 Feb 2007 15:30:20 -0000	1.38
***************
*** 506,509 ****
--- 506,510 ----
  		exit 1
  	    fi
+ 	    dopreapply ${FTMP}
  	    if [ -s ${FTMP} ]; then
  		lapply -w ${TLSLEVEL} ${CASE} ${PROGRESS} -h ${SERVER} \
***************
*** 513,516 ****
--- 514,518 ----
  		    echo Auto update: `hostname`
  		    cat ${FTMP}
+ 		    dopostapply ${FTMP}
  		    cleanup
  		    break

[Radmind-commit] radmind ra.sh,1.36,1.37

From: Patrick M. <ume...@us...> - 2007-02-07 15:28:21

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

Modified Files:
	ra.sh 
Log Message:
Fixes the find argument to something which will work with both older and
newer versions of GNU find.
Thanks Sean Sweda


Index: ra.sh
===================================================================
RCS file: /cvsroot/radmind/radmind/ra.sh,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** ra.sh	5 Jan 2007 20:42:16 -0000	1.36
--- ra.sh	7 Feb 2007 15:28:09 -0000	1.37
***************
*** 99,103 ****
  dopreapply() {
      if [ -d ${PREAPPLY} ]; then
! 	SCRIPTS=`find ${PREAPPLY} -perm +u+x \! -type d | sort`
  	if [ "${SCRIPTS}" ]; then
  	    for script in ${SCRIPTS}; do
--- 99,103 ----
  dopreapply() {
      if [ -d ${PREAPPLY} ]; then
! 	SCRIPTS=`find ${PREAPPLY} -perm -u+x \! -type d | sort`
  	if [ "${SCRIPTS}" ]; then
  	    for script in ${SCRIPTS}; do
***************
*** 110,114 ****
  dopostapply() {
      if [ -d ${POSTAPPLY} ]; then
! 	SCRIPTS=`find ${POSTAPPLY} -perm +u+x \! -type d | sort`
  	if [ "${SCRIPTS}" ]; then
  	    for script in ${SCRIPTS}; do
--- 110,114 ----
  dopostapply() {
      if [ -d ${POSTAPPLY} ]; then
! 	SCRIPTS=`find ${POSTAPPLY} -perm -u+x \! -type d | sort`
  	if [ "${SCRIPTS}" ]; then
  	    for script in ${SCRIPTS}; do

[Radmind-commit] radmind transcript.c,1.115,1.116

From: Patrick M. <ume...@us...> - 2007-01-26 18:26:16

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

Modified Files:
	transcript.c 
Log Message:
fsdiff displays the command file name when reporting command file line errors.  [ Feature #1592739 ]


Index: transcript.c
===================================================================
RCS file: /cvsroot/radmind/radmind/transcript.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** transcript.c	28 Sep 2006 18:55:52 -0000	1.115
--- transcript.c	26 Jan 2007 18:26:08 -0000	1.116
***************
*** 814,818 ****
  	length = strlen( line );
  	if ( line[ length - 1 ] != '\n' ) {
! 	    fprintf( stderr, "command: line %d: line too long\n", linenum );
  	    return( -1 );
  	}
--- 814,819 ----
  	length = strlen( line );
  	if ( line[ length - 1 ] != '\n' ) {
! 	    fprintf( stderr, "command file %s: line %d: line too long\n",
! 		kfile, linenum );
  	    return( -1 );
  	}
***************
*** 824,829 ****
  
  	if ( ac != 2 ) {
! 	    fprintf( stderr, "command: line %d: expected 2 arguments, got %d\n",
! 		    linenum, ac );
  	    return( -1 );
  	} 
--- 825,831 ----
  
  	if ( ac != 2 ) {
! 	    fprintf( stderr,
! 		"command file %s: line %d: expected 2 arguments, got %d\n",
! 		kfile, linenum, ac );
  	    return( -1 );
  	} 
***************
*** 833,840 ****
  	    if ( snprintf( fullpath, MAXPATHLEN, "%s%s", kdir,
  		    av[ 1 ] ) >= MAXPATHLEN ) {
! 		fprintf( stderr, "command: line %d: path too long\n",
! 			linenum );
! 		fprintf( stderr, "command: line %d: %s%s\n",
! 			linenum, kdir, av[ 1 ] );
  		return( -1 );
  	    }
--- 835,842 ----
  	    if ( snprintf( fullpath, MAXPATHLEN, "%s%s", kdir,
  		    av[ 1 ] ) >= MAXPATHLEN ) {
! 		fprintf( stderr, "comand file %s: line %d: path too long\n",
! 			kfile, linenum );
! 		fprintf( stderr, "command file %s: line %d: %s%s\n",
! 			kfile, linenum, kdir, av[ 1 ] );
  		return( -1 );
  	    }
***************
*** 849,856 ****
  	    if ( snprintf( fullpath, MAXPATHLEN, "%s/%s/%s", _RADMIND_PATH,
  			subpath, av[ 1 ] ) >= MAXPATHLEN ) {
! 		fprintf( stderr, "command: line %d: path too long\n",
! 			linenum );
! 		fprintf( stderr, "command: line %d: %s%s\n",
! 			linenum, kdir, av[ 1 ] );
  		return( -1 );
  	    }
--- 851,858 ----
  	    if ( snprintf( fullpath, MAXPATHLEN, "%s/%s/%s", _RADMIND_PATH,
  			subpath, av[ 1 ] ) >= MAXPATHLEN ) {
! 		fprintf( stderr, "command file %s: line %d: path too long\n",
! 			kfile, linenum );
! 		fprintf( stderr, "command file %s: line %d: %s%s\n",
! 			kfile, linenum, kdir, av[ 1 ] );
  		return( -1 );
  	    }
***************
*** 866,870 ****
  	    if ( list_check( kfile_list, fullpath )) {
  		fprintf( stderr,
! 		    "%s: line %d: command file loop: %s already included\n",
  		    kfile, linenum, av[ 1 ] );
  		return( -1 );
--- 868,872 ----
  	    if ( list_check( kfile_list, fullpath )) {
  		fprintf( stderr,
! 		    "command file %s: line %d: command file loop: %s already included\n",
  		    kfile, linenum, av[ 1 ] );
  		return( -1 );
***************
*** 903,908 ****
  
  	default:
! 	    fprintf( stderr, "command: line %d: '%s' invalid\n",
! 		    linenum, av[ 0 ] );
  	    return( -1 );
  	}
--- 905,910 ----
  
  	default:
! 	    fprintf( stderr, "command file %s: line %d: '%s' invalid\n",
! 		    kfile, linenum, av[ 0 ] );
  	    return( -1 );
  	}

[Radmind-commit] radmind Makefile.in,1.99,1.100

From: Wes C. <wes...@us...> - 2007-01-22 19:33:44

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

Modified Files:
	Makefile.in 
Log Message:
updating sub-make methodology to POSIX


Index: Makefile.in
===================================================================
RCS file: /cvsroot/radmind/radmind/Makefile.in,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** Makefile.in	12 Dec 2006 15:01:49 -0000	1.99
--- Makefile.in	22 Jan 2007 19:33:30 -0000	1.100
***************
*** 225,229 ****
  
  libsnet/libsnet.la : FRC
! 	cd libsnet; ${MAKE} ${MFLAGS} CC=${CC}
  
  VERSION=$(shell date +%Y%m%d)
--- 225,229 ----
  
  libsnet/libsnet.la : FRC
! 	cd libsnet; ${MAKE}
  
  VERSION=$(shell date +%Y%m%d)
***************
*** 353,357 ****
  
  clean :
! 	(cd libsnet; ${MAKE} ${MAKEFLAGS} clean)
  	rm -f *.o a.out core
  	rm -f ${TARGETS}
--- 353,357 ----
  
  clean :
! 	(cd libsnet; ${MAKE} clean)
  	rm -f *.o a.out core
  	rm -f ${TARGETS}

[Radmind-commit] radmind ra.sh,1.35,1.36

From: Andrew M. <fit...@us...> - 2007-01-05 20:42:22

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

Modified Files:
	ra.sh 
Log Message:
A function is not an if block.


Index: ra.sh
===================================================================
RCS file: /cvsroot/radmind/radmind/ra.sh,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** ra.sh	22 Dec 2006 16:21:25 -0000	1.35
--- ra.sh	5 Jan 2007 20:42:16 -0000	1.36
***************
*** 95,99 ****
      cleanup
      exit 1
! fi
  
  dopreapply() {
--- 95,99 ----
      cleanup
      exit 1
! }
  
  dopreapply() {

[Radmind-commit] radmind command.c, 1.133, 1.134 ktcheck.c, 1.115, 1.116 lapply.c, 1.135, 1.136 repo.c, 1.2, 1.3

From: Patrick M. <ume...@us...> - 2006-12-28 17:05:44

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

Modified Files:
	command.c ktcheck.c lapply.c repo.c 
Log Message:
Server lists REPO as a capability.
ktcheck and lapply report only if server provides REPO as a capability.


Index: lapply.c
===================================================================
RCS file: /cvsroot/radmind/radmind/lapply.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** lapply.c	22 Nov 2006 18:36:43 -0000	1.135
--- lapply.c	28 Dec 2006 17:05:34 -0000	1.136
***************
*** 53,58 ****
--- 53,60 ----
  int		change = 0;
  int		case_sensitive = 1;
+ int		report = 1;
  char		transcript[ 2 * MAXPATHLEN ] = { 0 };
  char		prepath[ MAXPATHLEN ]  = { 0 };
+ 
  extern char	*version, *checksumlist;
  extern off_t	lsize;
***************
*** 422,426 ****
  	}
  
- 
  	if ( authlevel != 0 ) {
  	    if ( tls_client_start( sn, host, authlevel ) != 0 ) {
--- 424,427 ----
***************
*** 442,445 ****
--- 443,451 ----
  #endif /* HAVE_ZLIB */
  
+     /* Turn off reporting if server doesn't support it */
+     if ( check_capability( "REPO", capa ) == 0 ) {
+ 	report = 0;
+     }
+ 
      acav = acav_alloc( );
  
***************
*** 717,724 ****
  
      if ( network ) {
! 	if ( report_event( sn, "lapply",
!                 "Changes applied successfully" ) != 0 ) {
!             fprintf( stderr, "warning: could not report event\n" );
!         }
  	if (( closesn( sn )) != 0 ) {
  	    fprintf( stderr, "cannot close sn\n" );
--- 723,732 ----
  
      if ( network ) {
! 	if ( report ) {
! 	    if ( report_event( sn, "lapply",
! 		    "Changes applied successfully" ) != 0 ) {
! 		fprintf( stderr, "warning: could not report event\n" );
! 	    }
! 	}
  	if (( closesn( sn )) != 0 ) {
  	    fprintf( stderr, "cannot close sn\n" );
***************
*** 740,749 ****
  #endif /* HAVE_ZLIB */
  	if ( change ) {
! 	    if ( report_event( sn, "lapply", "Error, changes made" ) != 0 ) {
! 		fprintf( stderr, "warning: could not report event\n" );
  	    }
  	} else {
! 	    if ( report_event( sn, "lapply", "Error, no changes made" ) != 0 ) {
! 		fprintf( stderr, "warning: could not report event\n" );
  	    }
  	}
--- 748,763 ----
  #endif /* HAVE_ZLIB */
  	if ( change ) {
! 	    if ( report ) {
! 		if ( report_event( sn, "lapply",
! 			"Error, changes made" ) != 0 ) {
! 		    fprintf( stderr, "warning: could not report event\n" );
! 		}
  	    }
  	} else {
! 	    if ( report ) {
! 		if ( report_event( sn, "lapply",
! 			"Error, no changes made" ) != 0 ) {
! 		    fprintf( stderr, "warning: could not report event\n" );
! 		}
  	    }
  	}

Index: repo.c
===================================================================
RCS file: /cvsroot/radmind/radmind/repo.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** repo.c	24 Nov 2006 21:24:12 -0000	1.2
--- repo.c	28 Dec 2006 17:05:34 -0000	1.3
***************
*** 189,192 ****
--- 189,193 ----
      if ( zlib_level > 0 ) {
          if ( negotiate_compression( sn, capa ) != 0 ) {
+ 	    fprintf( stderr, "%s: server does not support reporting\n", host );
              exit( 2 );
          }
***************
*** 194,197 ****
--- 195,203 ----
  #endif /* HAVE_ZLIB */
  
+     /* Check to see if server supports reporting */
+     if ( check_capability( "REPO", capa ) == 0 ) {
+ 	exit( 2 );
+     }
+ 
      if ( report_event( sn, event, repodata ) != 0 ) {
  	exit( 2 );

Index: command.c
===================================================================
RCS file: /cvsroot/radmind/radmind/command.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -d -r1.133 -r1.134
*** command.c	28 Dec 2006 17:03:32 -0000	1.133
--- command.c	28 Dec 2006 17:05:34 -0000	1.134
***************
*** 1531,1534 ****
--- 1531,1535 ----
  	}
  #endif /* HAVE_ZLIB */
+ 	snet_writef( sn, " REPO" ); 
  	snet_writef( sn, "\r\n" ); 
      }

Index: ktcheck.c
===================================================================
RCS file: /cvsroot/radmind/radmind/ktcheck.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** ktcheck.c	22 Nov 2006 18:36:43 -0000	1.115
--- ktcheck.c	28 Dec 2006 17:05:34 -0000	1.116
***************
*** 65,68 ****
--- 65,69 ----
  int			change = 0;
  int			case_sensitive = 1;
+ int			report = 1;
  char			*base_kfile= _RADMIND_COMMANDFILE;
  char			*radmind_path = _RADMIND_PATH;
***************
*** 728,731 ****
--- 729,737 ----
  #endif /* HAVE_ZLIB */
  
+     /* Turn off reporting if server doesn't support it */
+     if ( check_capability( "REPO", capa ) == 0 ) {
+ 	report = 0;
+     }
+ 
      /* Check/get correct base command file */
      switch( check( sn, "COMMAND", NULL )) { 
***************
*** 741,745 ****
  
      case 2:
! 	report_event( sn, "ktcheck", "Error" );
  	exit( 2 );
      }
--- 747,751 ----
  
      case 2:
! 	if ( report ) report_event( sn, "ktcheck", "Error" );
  	exit( 2 );
      }
***************
*** 861,875 ****
      if ( change ) {
  	if ( update ) {
! 	    if ( report_event( sn, "ktcheck", "Updates retrieved" ) != 0 ) {
! 		fprintf( stderr, "warning: could not report event\n" );
  	    }
  	} else {
! 	    if ( report_event( sn, "ktcheck", "Updates available" ) != 0 ) {
! 		fprintf( stderr, "warning: could not report event\n" );
  	    }
  	}
      } else {
! 	if ( report_event( sn, "ktcheck", "No updates needed" ) != 0 ) {
! 	    fprintf( stderr, "warning: could not report event\n" );
  	}
      }
--- 867,887 ----
      if ( change ) {
  	if ( update ) {
! 	    if ( report ) {
! 		if ( report_event( sn, "ktcheck", "Updates retrieved" ) != 0 ) {
! 		    fprintf( stderr, "warning: could not report event\n" );
! 		}
  	    }
  	} else {
! 	    if ( report ) {
! 		if ( report_event( sn, "ktcheck", "Updates available" ) != 0 ) {
! 		    fprintf( stderr, "warning: could not report event\n" );
! 		}
  	    }
  	}
      } else {
! 	if ( report ) {
! 	    if ( report_event( sn, "ktcheck", "No updates needed" ) != 0 ) {
! 		fprintf( stderr, "warning: could not report event\n" );
! 	    }
  	}
      }
***************
*** 950,954 ****
  		break;
  	    case 2:
! 		report_event( sn, "ktcheck", "Error" );
  		goto error;
  	    }
--- 962,966 ----
  		break;
  	    case 2:
! 		if ( report ) report_event( sn, "ktcheck", "Error" );
  		goto error;
  	    }
***************
*** 977,981 ****
  		break;
  	    case 2:
! 		report_event( sn, "ktcheck", "Error" );
  		exit( 2 );
  	    }
--- 989,993 ----
  		break;
  	    case 2:
! 		if ( report ) report_event( sn, "ktcheck", "Error" );
  		exit( 2 );
  	    }
***************
*** 998,1002 ****
      }
      if ( !update && change ) {
! 	report_event( sn, "ktcheck", "Updates available" );
  	exit( 1 );
      }
--- 1010,1014 ----
      }
      if ( !update && change ) {
! 	if ( report ) report_event( sn, "ktcheck", "Updates available" );
  	exit( 1 );
      }

[Radmind-commit] radmind command.c,1.132,1.133

From: Patrick M. <ume...@us...> - 2006-12-28 17:03:35

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

Modified Files:
	command.c 
Log Message:
Removed extra "\r\n" from zlib capability reporting.


Index: command.c
===================================================================
RCS file: /cvsroot/radmind/radmind/command.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** command.c	28 Dec 2006 14:27:21 -0000	1.132
--- command.c	28 Dec 2006 17:03:32 -0000	1.133
***************
*** 1528,1532 ****
  #ifdef HAVE_ZLIB
  	if ( max_zlib_level > 0 ) {
! 	    snet_writef( sn, " ZLIB\r\n" ); 
  	}
  #endif /* HAVE_ZLIB */
--- 1528,1532 ----
  #ifdef HAVE_ZLIB
  	if ( max_zlib_level > 0 ) {
! 	    snet_writef( sn, " ZLIB" ); 
  	}
  #endif /* HAVE_ZLIB */

[Radmind-commit] radmind connect.c,1.28,1.29 connect.h,1.13,1.14

From: Patrick M. <ume...@us...> - 2006-12-28 16:07:21

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

Modified Files:
	connect.c connect.h 
Log Message:
Added check_capability to generalize capability checking.
Updated ZLIB code to use check_capability.


Index: connect.h
===================================================================
RCS file: /cvsroot/radmind/radmind/connect.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** connect.h	13 Oct 2006 20:20:20 -0000	1.13
--- connect.h	28 Dec 2006 16:07:18 -0000	1.14
***************
*** 26,27 ****
--- 26,28 ----
  int stor_response( SNET *sn, int *respcount, struct timeval * );
  void v_logger( char *string);
+ int check_capability( char *type, char **capa );

Index: connect.c
===================================================================
RCS file: /cvsroot/radmind/radmind/connect.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** connect.c	13 Oct 2006 20:20:20 -0000	1.28
--- connect.c	28 Dec 2006 16:07:17 -0000	1.29
***************
*** 208,212 ****
  negotiate_compression( SNET *sn, char **capa )
  {
-     char         	**p;
      char          	*name = NULL;
      char          	*line;
--- 208,211 ----
***************
*** 218,228 ****
      if ( zlib_level ) { 
  	/* walk through capabilities looking for "ZLIB" */
! 	for( p = capa; *p; p++ ) {
! 	    if( !strncasecmp( "ZLIB", *p, MIN( 4, strlen( *p )))) {
! 		name = "ZLIB";
! 		type = SNET_ZLIB;
! 		level = zlib_level;
! 	    }
  	}
  	if ( level == 0 ) {
  	    fprintf( stderr, "compression capability mismatch, "
--- 217,226 ----
      if ( zlib_level ) { 
  	/* walk through capabilities looking for "ZLIB" */
! 	if ( check_capability( "ZLIB", capa ) == 1 ) {
! 	    name = "ZLIB";
! 	    type = SNET_ZLIB;
! 	    level = zlib_level;
  	}
+ 
  	if ( level == 0 ) {
  	    fprintf( stderr, "compression capability mismatch, "
***************
*** 294,295 ****
--- 292,314 ----
  }
  #endif /* HAVE_ZLIB */
+ 
+ /*
+  * check_capabilities: check to see if type is a listed capability
+  *
+  * return codes:
+  *      0:      type not in capability list
+  *      1:      type in capability list
+  */
+     int
+ check_capability( char *type, char **capa )
+ {
+     char **p;
+ 
+     /* walk through capabilities looking for "REPO" */
+     for ( p = capa; *p; p++ ) {
+         if ( !strncasecmp( type, *p, MIN( 4, strlen( *p )))) {
+             return( 1 );
+         }   
+     }
+     return( 0 );
+ }

[Radmind-commit] radmind command.c,1.131,1.132

From: Patrick M. <ume...@us...> - 2006-12-28 14:27:28

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

Modified Files:
	command.c 
Log Message:
Made capability reporting more granular.  This will allow for support of
additional capabilities.


Index: command.c
===================================================================
RCS file: /cvsroot/radmind/radmind/command.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -C2 -d -r1.131 -r1.132
*** command.c	22 Nov 2006 18:36:43 -0000	1.131
--- command.c	28 Dec 2006 14:27:21 -0000	1.132
***************
*** 1525,1529 ****
  	rap_extensions ? "-" : " ", hostname, version );
      if ( rap_extensions ) {
! 	snet_writef( sn, "200 CAPA ZLIB\r\n" ); 
      }
  
--- 1525,1535 ----
  	rap_extensions ? "-" : " ", hostname, version );
      if ( rap_extensions ) {
! 	snet_writef( sn, "200 CAPA" ); 
! #ifdef HAVE_ZLIB
! 	if ( max_zlib_level > 0 ) {
! 	    snet_writef( sn, " ZLIB\r\n" ); 
! 	}
! #endif /* HAVE_ZLIB */
! 	snet_writef( sn, "\r\n" ); 
      }

[Radmind-commit] radmind ra.sh,1.34,1.35

From: Wes C. <wes...@us...> - 2006-12-22 16:21:29

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

Modified Files:
	ra.sh 
Log Message:
added an optional path to update & create


Index: ra.sh
===================================================================
RCS file: /cvsroot/radmind/radmind/ra.sh,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** ra.sh	7 Nov 2006 19:35:19 -0000	1.34
--- ra.sh	22 Dec 2006 16:21:25 -0000	1.35
***************
*** 82,86 ****
  
  usage() {
!     echo "Usage:	$0 [ -ctV ] [ -h server ] [ -w authlevel ] { trip | update | create | auto | force | checkout | checkin }" >&2
      exit 1
  }
--- 82,86 ----
  
  usage() {
!     echo "Usage:	$0 [ -ctV ] [ -h server ] [ -w authlevel ] { trip | update | create | auto | force | checkout | checkin } [ /path/or/file ]" >&2
      exit 1
  }
***************
*** 319,324 ****
  shift `expr $OPTIND - 1`
  
! if [ $# -ne 1 ]; then
! 	usage
  fi
  
--- 319,326 ----
  shift `expr $OPTIND - 1`
  
! if [ $# -eq 2 ]; then
!     FSDIFFROOT=$2
! elif [ $# -ne 1 ]; then
!     usage
  fi

[Radmind-commit] radmind EXCLUDE,1.9,1.10

From: Patrick M. <ume...@us...> - 2006-12-18 14:56:33

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

Modified Files:
	EXCLUDE 
Log Message:
Removed configure.ac from exclude list so it will be included in source 
releases.


Index: EXCLUDE
===================================================================
RCS file: /cvsroot/radmind/radmind/EXCLUDE,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** EXCLUDE	23 Dec 2004 01:57:25 -0000	1.9
--- EXCLUDE	18 Dec 2006 14:56:28 -0000	1.10
***************
*** 2,6 ****
  CVS
  Makefile
- configure.ac
  config.log
  config.status
--- 2,5 ----

[Radmind-commit] radmind Makefile.in,1.98,1.99

From: Andrew M. <fit...@us...> - 2006-12-12 15:01:58

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

Modified Files:
	Makefile.in 
Log Message:
Added repo.1 to MAN1TARGETS


Index: Makefile.in
===================================================================
RCS file: /cvsroot/radmind/radmind/Makefile.in,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** Makefile.in	22 Nov 2006 18:36:43 -0000	1.98
--- Makefile.in	12 Dec 2006 15:01:49 -0000	1.99
***************
*** 45,50 ****
  BINTARGETS=     fsdiff ktcheck lapply lcksum lcreate lmerge lfdiff repo \
  		twhich lsort
! MAN1TARGETS=    fsdiff.1 ktcheck.1 lapply.1 lcksum.1 \
! 		lcreate.1 lfdiff.1 lmerge.1 twhich.1 rash.1 lsort.1
  MAN5TARGETS= 	applefile.5
  MAN8TARGETS=	radmind.8
--- 45,50 ----
  BINTARGETS=     fsdiff ktcheck lapply lcksum lcreate lmerge lfdiff repo \
  		twhich lsort
! MAN1TARGETS=    fsdiff.1 ktcheck.1 lapply.1 lcksum.1 lcreate.1 lfdiff.1 \
! 		lmerge.1 twhich.1 rash.1 repo.1 lsort.1
  MAN5TARGETS= 	applefile.5
  MAN8TARGETS=	radmind.8

[Radmind-commit] radmind ra.sh,1.31,1.31.2.1

From: Patrick M. <ume...@us...> - 2006-11-30 02:03:46

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

Modified Files:
      Tag: radmind-1-7-1-branch
	ra.sh 
Log Message:
Added ra.sh revision 1.34 from main trunk for 1.7.2 release.
Includes fixes for using TMPDIR (1.34), exiting on EOF (1.33 & 1.32 ),
an infinite loop (1.32) and processing postapply scripts (1.32).


Index: ra.sh
===================================================================
RCS file: /cvsroot/radmind/radmind/ra.sh,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -C2 -d -r1.31 -r1.31.2.1
*** ra.sh	19 Jul 2006 20:17:51 -0000	1.31
--- ra.sh	30 Nov 2006 02:03:41 -0000	1.31.2.1
***************
*** 26,29 ****
--- 26,30 ----
  EDITOR=${EDITOR:-vi}
  USER=${SUDO_USER:-$USER}
+ TMPDIR="${TMPDIR:=/tmp}"
  DEFAULTS="/etc/defaults/radmind"
  FSDIFFROOT="."
***************
*** 41,47 ****
  MKTEMP="_RADMIND_MKTEMP"
  TEMPFILES=FALSE
! TMPDIR="/tmp/.ra.$$"
! if [ -f "${MKTEMP}" ]; then
!     TMPDIR=`${MKTEMP} -qd /tmp/.ra.$$.XXXXXX`
      if [ $? -ne 0 ]; then
  	echo "mktemp failed"
--- 42,48 ----
  MKTEMP="_RADMIND_MKTEMP"
  TEMPFILES=FALSE
! RASHTMP="${TMPDIR}/.ra.$$"
! if [ -f "${MKTEMP}"  ]; then
!     RASHTMP=`${MKTEMP} -qd "${TMPDIR}/.ra.$$.XXXXXX"`
      if [ $? -ne 0 ]; then
  	echo "mktemp failed"
***************
*** 49,54 ****
      fi
  fi
! LTMP="${TMPDIR}/lapply.out"
! FTMP="${TMPDIR}/fsdiff.out"
  
  # different systems use different default dirs
--- 50,55 ----
      fi
  fi
! LTMP="${RASHTMP}/lapply.out"
! FTMP="${RASHTMP}/fsdiff.out"
  
  # different systems use different default dirs
***************
*** 63,66 ****
--- 64,70 ----
      echo -n "$*" "[Yn] "
      read ans
+     if [ $? -ne 0 ]; then
+ 	return 0
+     fi
      if [ -z "$ans" -o X"$ans" = Xy -o X"$ans" = XY -o X"$ans" = Xyes ]; then
  	return 1
***************
*** 84,91 ****
  cleanup() {
      if [ "$TEMPFILES" = FALSE ]; then
! 	rm -fr "${TMPDIR}"
      fi
  }
  
  dopreapply() {
      if [ -d ${PREAPPLY} ]; then
--- 88,100 ----
  cleanup() {
      if [ "$TEMPFILES" = FALSE ]; then
! 	rm -fr "${RASHTMP}"
      fi
  }
  
+ cleanup_and_exit() {
+     cleanup
+     exit 1
+ fi
+ 
  dopreapply() {
      if [ -d ${PREAPPLY} ]; then
***************
*** 199,202 ****
--- 208,215 ----
  
  	    read ans
+ 	    if [ $? -ne 0 ]; then
+ 		cleanup_and_exit
+ 	    fi
+ 
  	    case "${ans}" in
  	    a|A)
***************
*** 219,222 ****
--- 232,236 ----
  	    *)
  		;;
+ 
  	    esac
  	done
***************
*** 245,249 ****
  	Yn "Run post-apply scripts on difference transcript?"
          if [ $? -eq 1 ]; then
!             dopostapply ${FMTP}
          fi
      elif [ x"$opt" != x"interactive" ]; then
--- 259,263 ----
  	Yn "Run post-apply scripts on difference transcript?"
          if [ $? -eq 1 ]; then
!             dopostapply ${FTMP}
          fi
      elif [ x"$opt" != x"interactive" ]; then
***************
*** 311,318 ****
  cd /
  
! if [ ! -d ${TMPDIR} ]; then
!     mkdir -m 700 ${TMPDIR} 
      if [ $? -ne 0 ]; then
!         echo "Cannot create temporary directory $TMPDIR" 
  	exit 1
      fi
--- 325,332 ----
  cd /
  
! if [ ! -d "${RASHTMP}" ]; then
!     mkdir -m 700 "${RASHTMP}"
      if [ $? -ne 0 ]; then
!         echo "Cannot create temporary directory $RASHTMP" 
  	exit 1
      fi
***************
*** 320,324 ****
  
  # Trap meaningful signals
! trap cleanup HUP INT PIPE QUIT TERM TRAP XCPU XFSZ
  
  case "$1" in
--- 334,338 ----
  
  # Trap meaningful signals
! trap cleanup_and_exit HUP INT PIPE QUIT TERM TRAP XCPU XFSZ
  
  case "$1" in
***************
*** 394,398 ****
  	TNAME=`hostname | cut -d. -f1`-`date +%Y%m%d`-${USER}.T
      fi
!     FTMP="${TMPDIR}/${TNAME}"
      fsdiff -C ${CASE} ${FPROGRESS} ${CHECKSUM} -o ${FTMP} ${FSDIFFROOT}
      if [ $? -ne 0 ]; then
--- 408,412 ----
  	TNAME=`hostname | cut -d. -f1`-`date +%Y%m%d`-${USER}.T
      fi
!     FTMP="${RASHTMP}/${TNAME}"
      fsdiff -C ${CASE} ${FPROGRESS} ${CHECKSUM} -o ${FTMP} ${FSDIFFROOT}
      if [ $? -ne 0 ]; then

[Radmind-commit] radmind repo.c,1.1,1.2

From: Patrick M. <ume...@us...> - 2006-11-24 21:24:15

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

Modified Files:
	repo.c 
Log Message:
Including applefile.h.


Index: repo.c
===================================================================
RCS file: /cvsroot/radmind/radmind/repo.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** repo.c	22 Nov 2006 18:37:23 -0000	1.1
--- repo.c	24 Nov 2006 21:24:12 -0000	1.2
***************
*** 29,32 ****
--- 29,33 ----
  
  #include "code.h"
+ #include "applefile.h"
  #include "connect.h"
  #include "report.h"

[Radmind-commit] radmind/man repo.1,NONE,1.1

From: Andrew M. <fit...@us...> - 2006-11-22 18:38:48

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

Added Files:
	repo.1 
Log Message:
repo man page


--- NEW FILE: repo.1 ---
.TH repo "1" "_RADMIND_BUILD_DATE" "RSUG" "User Commands"
.SH NAME
.B repo 
\- report events to a radmind server
.SH SYNOPSIS
.B repo
.BI \-e\ event
[
.RI \-Vv
] [
.BI \-h\  host
] [
.BI \-p\  port
] [
.BI \-w\  auth-level
] [
.BI \-x\  ca-pem-file
] [
.BI \-y\  cert-pem-file
] [
.BI \-z\  private-key-file
] [
.BI \-Z\  compression-level
] [
.I event message ...
]
.SH DESCRIPTION
.B repo
reports status messages to the radmind server. The administrator defines
the
.I event
type with the -e option. The
.I message
is read from the command line or from standard input. The
.I event
and the
.I message
are logged by the server if
.B repo
succeeds.
.SH OPTIONS
.TP 19
.BI \-e\  event
the event type to report. This is an arbitrary string.
.TP 19
.BI \-h\  host
specifies the radmind server, by default
.BR _RADMIND_HOST .
.TP 19
.BI \-p\  port
specifies a port, by default
.B 6662.
.TP 19
.B \-V
displays the version of
.BR repo ,
and exits.
.TP 19
.B \-v
displays communication with the radmind server.
.TP 19
.BI \-w\  auth-level
TLS authorization level, by default _RADMIND_AUTHLEVEL.
0 = no TLS, 1 = server verification, 2 = server and client verification.
.TP 19
.BI \-x\  ca-pem-file
Certificate authority's public certificate, by default _RADMIND_TLS_CA.
.TP 19
.BI \-y\  cert-pem-file
Client's public certificate, by default _RADMIND_TLS_CERT.
.TP 19
.BI \-z\  private-key-file
Client's private key, by default _RADMIND_TLS_CERT.
.TP 19
.BI \-Z\  compression-level
Compress all outbound data.  compression-level can be between 0 and 9:
1 gives best speed, 9 gives best compression, 0 gives no compression at
all (the input data is simply copied a block at a time).
.SH EXIT STATUS
The following exit values are returned:
.TP 5
0
No errors.
.TP 5
>0
An error occurred.
.SH SEE ALSO
.BR radmind (8).

[Radmind-commit] radmind repo.c, NONE, 1.1 report.c, NONE, 1.1 report.h, NONE, 1.1

From: Andrew M. <fit...@us...> - 2006-11-22 18:37:27

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

Added Files:
	repo.c report.c report.h 
Log Message:
Accepted [ 1443298 ] client status reporting


--- NEW FILE: repo.c ---
/*
 * Copyright (c) 2006 Regents of The University of Michigan.
 * All Rights Reserved. See COPYRIGHT.
 */

#include "config.h"

#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
#include <netinet/in.h>
#include <netdb.h>
#include <stdio.h>
#include <string.h>
#include <time.h>
#include <unistd.h>

#include <openssl/ssl.h>
#include <openssl/rand.h>
#include <openssl/err.h>

#include <openssl/evp.h>

#ifdef HAVE_ZLIB
#include <zlib.h>
#endif /* HAVE_ZLIB */

#include <snet.h>

#include "code.h"
#include "connect.h"
#include "report.h"
#include "tls.h"

int			verbose = 0;
void			(*logger)( char * ) = NULL;
extern struct timeval	timeout;
extern char		*version;
extern char		*ca, *cert, *privatekey;
SSL_CTX			*ctx;

    int
main( int argc, char *argv[] )
{
    SNET		*sn;
    int			c, port = htons( 6662 );
    int			i = 0, err = 0, len;
    int			authlevel = _RADMIND_AUTHLEVEL;
    int			use_randfile = 0;
    extern int		optind;
    struct servent      *se;
    char		*host = _RADMIND_HOST;
    char		*event = NULL;
    char		repodata[ MAXPATHLEN * 2 ];
    char		**capa = NULL; /* server capabilities */

    while (( c = getopt( argc, argv, "e:h:p:vVw:x:y:Z:z:" )) != EOF ) {
	switch ( c ) {
	case 'e':		/* event to report */
	    event = optarg;
	    break;

	case 'h':
	    host = optarg;
	    break;

	case 'p':
	    if (( port = htons( atoi( optarg ))) == 0 ) {
		if (( se = getservbyname( optarg, "tcp" )) == NULL ) {
		    fprintf( stderr, "%s: service unknown\n", optarg );
		    exit( 2 );
		}
		port = se->s_port;
	    }
	    break;

	case 'v':
	    verbose = 1;
	    logger = v_logger;
	    break;

	case 'V':
	    printf( "%s\n", version );
	    break;

	case 'w':
	    authlevel = atoi( optarg );
	    if (( authlevel < 0 ) || ( authlevel > 2 )) {
		fprintf( stderr, "%s: invalid authorization level\n",
			optarg );
		exit( 2 );
	    }
	    break;

	case 'x':
	    ca = optarg;
	    break;

	case 'y':
	    cert = optarg;
	    break;

	case 'z':
	    privatekey = optarg;
	    break;

	case 'Z':
#ifdef HAVE_ZLIB
            zlib_level = atoi( optarg );
            if (( zlib_level < 0 ) || ( zlib_level > 9 )) {
                fprintf( stderr, "Invalid compression level\n" );
                exit( 1 );
            }
            break;
#else /* HAVE_ZLIB */
            fprintf( stderr, "Zlib not supported.\n" );
            exit( 1 );
#endif /* HAVE_ZLIB */

	default:
	    err++;
	    break;
	}
    }

    if ( event == NULL ) {
	err++;
    }

    if ( err || (( argc - optind ) < 0 )) {
	fprintf( stderr, "usage: %s -e event [ -Vv ] ", argv[ 0 ] );
	fprintf( stderr, "[ -h host ] [ -p port ] " );
	fprintf( stderr, "[ -w auth-level ] [ -x ca-pem-file ] " );
	fprintf( stderr, "[ -y cert-pem-file ] [ -z key-pem-file ] " );
	fprintf( stderr, "[ -Z compression-level ] [ event message ... ]\n" );
	exit( 1 );
    }

    if ( argc == optind ) {	/* read message from stdin */
	if ( fgets( repodata, sizeof( repodata ), stdin ) == NULL ) {
	    perror( "fgets" );
	    exit( 2 );
	}

	len = strlen( repodata );
	if ( repodata[ len - 1 ] != '\n' ) {
	    fprintf( stderr, "report too long\n" );
	    exit( 2 );
	}
	repodata[ len - 1 ] = '\0';
    } else {
	if ( strlen( argv[ optind ] ) >= sizeof( repodata )) {
	    fprintf( stderr, "%s: too long\n", argv[ optind ] );
	    exit( 2 );
	}
	strcpy( repodata, argv[ optind ] );

	for ( i += optind; i < argc; i++ ) {
	    if (( strlen( repodata ) + strlen( argv[ i ] ) + 2 )
			>= sizeof( repodata )) {
		fprintf( stderr, "%s %s: too long\n", repodata, argv[ i ] );
		exit( 2 );
	    }
	    strcat( repodata, " " );
	    strcat( repodata, argv[ i ] );
	}
    }

    if (( sn = connectsn( host, port )) == NULL ) {
	exit( 2 );
    }
    if (( capa = get_capabilities( sn )) == NULL ) {
            exit( 2 );
    }

    if ( authlevel != 0 ) {
	if ( tls_client_setup( use_randfile, authlevel, ca, cert,
		privatekey ) != 0 ) {
	    exit( 2 );
	}
	if ( tls_client_start( sn, host, authlevel ) != 0 ) {
	    exit( 2 );
	}
    }

#ifdef HAVE_ZLIB
    /* Enable compression */
    if ( zlib_level > 0 ) {
        if ( negotiate_compression( sn, capa ) != 0 ) {
            exit( 2 );
        }
    }
#endif /* HAVE_ZLIB */

    if ( report_event( sn, event, repodata ) != 0 ) {
	exit( 2 );
    }

    if (( closesn( sn )) != 0 ) {
	fprintf( stderr, "closesn failed.\n" );
	exit( 2 );
    }

    return( 0 );
}

--- NEW FILE: report.h ---
int report_event( SNET *sn, char *event, char *repodata );
void report_error_and_exit( SNET *sn, char *event, char *repodata, int rc );

--- NEW FILE: report.c ---
/*
 * Copyright (c) 2006 Regents of The University of Michigan.
 * All Rights Reserved. See COPYRIGHT.
 */

#include "config.h"

#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
#include <netinet/in.h>
#include <netdb.h>
#include <stdio.h>
#include <string.h>
#include <time.h>
#include <unistd.h>

#include <openssl/ssl.h>
#include <openssl/rand.h>
#include <openssl/err.h>

#ifdef HAVE_ZLIB
#include <zlib.h>
#endif /* HAVE_ZLIB */

#include <snet.h>

#include "code.h"
#include "report.h"

extern int		verbose;
extern void		(*logger)( char * );
extern struct timeval	timeout;

/*
 * report_event: report an arbitrary event to the server
 *
 * return codes:
 *	0:	event reported
 *	1:	report failed
 */
    int
report_event( SNET *sn, char *event, char *repodata )
{
    struct timeval	tv;
    char		*line;
    char		*e_repodata;

    if (( e_repodata = encode( repodata )) == NULL ) {
	fprintf( stderr, "report_event: encode: buffer too small\n" );
	return( 1 );
    }

    if ( snet_writef( sn, "REPO %s %s\r\n", event, e_repodata ) < 0 ) {
	perror( "snet_writef" );
	return( 1 );
    }
    if ( verbose ) printf( ">>> REPO %s %s\n", event, e_repodata );

    tv = timeout;
    if (( line = snet_getline_multi( sn, logger, &tv )) == NULL ) {
	perror( "snet_getline_multi" );
	return( 1 );
    }
    if ( *line != '2' ) {
	fprintf( stderr, "%s\n", line );
	return( 1 );
    }

    return( 0 );
}

/*
 * report_error_and_exit: report an error and exit with the give value
 */
    void
report_error_and_exit( SNET *sn, char *event, char *repodata, int rc )
{
    ( void )report_event( sn, event, repodata );

    exit( rc );
}

[Radmind-commit] radmind/man radmind.8,1.35,1.36

From: Andrew M. <fit...@us...> - 2006-11-22 18:36:47

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

Modified Files:
	radmind.8 
Log Message:
Accepted [ 1443298 ] client status reporting.


Index: radmind.8
===================================================================
RCS file: /cvsroot/radmind/radmind/man/radmind.8,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** radmind.8	27 Sep 2006 15:39:53 -0000	1.35
--- radmind.8	22 Nov 2006 18:36:43 -0000	1.36
***************
*** 182,185 ****
--- 182,190 ----
  COMP
  start compression
+ .TP 10
+ REPO
+ report a client status message. The daemon logs the message and some of the
+ reporting client's attributes, including client name, client IP address,
+ client CN, and the report event type. 
  .SH OPTIONS
  .TP 19
***************
*** 299,302 ****
--- 304,308 ----
  .BR lmerge (1),
  .BR lsort (1),
+ .BR repo (1),
  .BR twhich (1),
  .BR pam.conf (4),

[Radmind-commit] radmind Makefile.in, 1.97, 1.98 command.c, 1.130, 1.131 ktcheck.c, 1.114, 1.115 lapply.c, 1.134, 1.135

From: Andrew M. <fit...@us...> - 2006-11-22 18:36:47

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

Modified Files:
	Makefile.in command.c ktcheck.c lapply.c 
Log Message:
Accepted [ 1443298 ] client status reporting.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/radmind/radmind/Makefile.in,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** Makefile.in	24 May 2006 17:45:15 -0000	1.97
--- Makefile.in	22 Nov 2006 18:36:43 -0000	1.98
***************
*** 43,47 ****
  CFLAGS=		${DEFS} ${OPTOPTS} @CFLAGS@ ${INCPATH}
  
! BINTARGETS=     fsdiff ktcheck lapply lcksum lcreate lmerge lfdiff twhich lsort
  MAN1TARGETS=    fsdiff.1 ktcheck.1 lapply.1 lcksum.1 \
  		lcreate.1 lfdiff.1 lmerge.1 twhich.1 rash.1 lsort.1
--- 43,48 ----
  CFLAGS=		${DEFS} ${OPTOPTS} @CFLAGS@ ${INCPATH}
  
! BINTARGETS=     fsdiff ktcheck lapply lcksum lcreate lmerge lfdiff repo \
! 		twhich lsort
  MAN1TARGETS=    fsdiff.1 ktcheck.1 lapply.1 lcksum.1 \
  		lcreate.1 lfdiff.1 lmerge.1 twhich.1 rash.1 lsort.1
***************
*** 61,69 ****
  KTCHECK_OBJ=    version.o ktcheck.o argcargv.o retr.o base64.o code.o \
                  cksum.o list.o llist.o connect.o applefile.o tls.o pathcmp.o \
! 		progress.o mkdirs.o rmdirs.o
  
  LAPPLY_OBJ=     version.o lapply.o argcargv.o code.o base64.o retr.o \
                  radstat.o update.o cksum.o connect.o pathcmp.o progress.o \
!                 applefile.o tls.o
  
  LCREATE_OBJ=    version.o lcreate.o argcargv.o code.o connect.o progress.o \
--- 62,70 ----
  KTCHECK_OBJ=    version.o ktcheck.o argcargv.o retr.o base64.o code.o \
                  cksum.o list.o llist.o connect.o applefile.o tls.o pathcmp.o \
! 		progress.o mkdirs.o report.o rmdirs.o
  
  LAPPLY_OBJ=     version.o lapply.o argcargv.o code.o base64.o retr.o \
                  radstat.o update.o cksum.o connect.o pathcmp.o progress.o \
!                 applefile.o report.o tls.o
  
  LCREATE_OBJ=    version.o lcreate.o argcargv.o code.o connect.o progress.o \
***************
*** 80,83 ****
--- 81,86 ----
  		transcript.o list.o radstat.o hardlink.o
  
+ REPO_OBJ=	version.o repo.o report.o argcargv.o connect.o code.o tls.o
+ 
  TWHICH_OBJ=     version.o twhich.o argcargv.o transcript.o llist.o code.o \
                  hardlink.o cksum.o base64.o pathcmp.o radstat.o applefile.o \
***************
*** 157,160 ****
--- 160,173 ----
  		-c ${srcdir}/progress.c
  
+ report.o : report.c
+ 	${CC} ${CFLAGS} \
+ 		-c ${srcdir}/report.c
+ 
+ repo.o : repo.c
+ 	${CC} ${CFLAGS} \
+ 		-D_RADMIND_HOST=\"${RADMIND_HOST}\" \
+ 		-D_RADMIND_AUTHLEVEL=${RADMIND_AUTHLEVEL} \
+ 		-c ${srcdir}/repo.c
+ 
  root.o : root.c
  	${CC} ${CFLAGS} \
***************
*** 200,203 ****
--- 213,219 ----
  	${CC} ${CFLAGS} -o lfdiff ${LFDIFF_OBJ} ${LDFLAGS}
  
+ repo : ${REPO_OBJ}
+ 	${CC} ${CFLAGS} -o repo ${REPO_OBJ} ${LDFLAGS}
+ 
  twhich: ${TWHICH_OBJ}
  	${CC} ${CFLAGS} -o twhich ${TWHICH_OBJ} ${LDFLAGS}

Index: lapply.c
===================================================================
RCS file: /cvsroot/radmind/radmind/lapply.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -d -r1.134 -r1.135
*** lapply.c	13 Oct 2006 20:22:26 -0000	1.134
--- lapply.c	22 Nov 2006 18:36:43 -0000	1.135
***************
*** 41,44 ****
--- 41,45 ----
  #include "largefile.h"
  #include "progress.h"
+ #include "report.h"
  
  void		(*logger)( char * ) = NULL;
***************
*** 716,719 ****
--- 717,724 ----
  
      if ( network ) {
+ 	if ( report_event( sn, "lapply",
+                 "Changes applied successfully" ) != 0 ) {
+             fprintf( stderr, "warning: could not report event\n" );
+         }
  	if (( closesn( sn )) != 0 ) {
  	    fprintf( stderr, "cannot close sn\n" );
***************
*** 734,737 ****
--- 739,751 ----
  	if( verbose && zlib_level < 0 ) print_stats(sn);
  #endif /* HAVE_ZLIB */
+ 	if ( change ) {
+ 	    if ( report_event( sn, "lapply", "Error, changes made" ) != 0 ) {
+ 		fprintf( stderr, "warning: could not report event\n" );
+ 	    }
+ 	} else {
+ 	    if ( report_event( sn, "lapply", "Error, no changes made" ) != 0 ) {
+ 		fprintf( stderr, "warning: could not report event\n" );
+ 	    }
+ 	}
  	closesn( sn );
      }

Index: command.c
===================================================================
RCS file: /cvsroot/radmind/radmind/command.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -C2 -d -r1.130 -r1.131
*** command.c	13 Oct 2006 19:39:45 -0000	1.130
--- command.c	22 Nov 2006 18:36:43 -0000	1.131
***************
*** 78,81 ****
--- 78,82 ----
  int		f_notls( SNET *, int, char *[] );
  int		f_starttls( SNET *, int, char *[] );
+ int		f_repo( SNET *, int, char *[] );
  #ifdef HAVE_LIBPAM
  int		f_login( SNET *, int, char *[] );
***************
*** 120,123 ****
--- 121,125 ----
      { "STORe",		f_notls },
      { "STARttls",       f_starttls },
+     { "REPOrt",         f_notls },
  #ifdef HAVE_LIBPAM
      { "LOGIn",       	f_notls },
***************
*** 135,138 ****
--- 137,141 ----
      { "RETRieve",	f_noauth },
      { "STORe",		f_noauth },
+     { "REPOrt",         f_noauth },
  #ifdef HAVE_LIBPAM
      { "LOGIn",       	f_noauth },
***************
*** 151,154 ****
--- 154,158 ----
      { "STORe",		f_stor },
      { "STARttls",       f_starttls },
+     { "REPOrt",         f_repo },
  #ifdef HAVE_LIBPAM
      { "LOGIn",       	f_login },
***************
*** 904,907 ****
--- 908,942 ----
  
      int
+ f_repo( SNET *sn, int ac, char **av )
+ {
+     char			*cn = "-";
+     char			*d_msg;
+ 
+     if ( ac != 3 ) {
+ 	snet_writef( sn, "%d Syntax error (invalid parameters)\r\n", 501 );
+ 	return( 1 );
+     }
+ 
+     if (( d_msg = decode( av[ 2 ] )) == NULL ) {
+ 	syslog( LOG_ERR, "f_repo: decode: buffer too small" );
+ 	snet_writef( sn, "%d Syntax error (invalid parameter)\r\n", 501 );
+ 	return( 1 );
+     }
+ 
+     if ( remote_cn != NULL ) {
+ 	cn = remote_cn;
+     }
+ 
+     syslog( LOG_NOTICE, "report %s %s %s %s %s %s",
+ 		remote_host, remote_addr,
+ 		cn, "-", /* reserve for user specified ID, e.g. sasl */
+ 		av[ 1 ], d_msg );
+ 
+     snet_writef( sn, "%d Report successful\r\n", 215 );
+     
+     return( 0 );
+ }
+ 
+     int
  f_starttls( SNET *sn, int ac, char **av )
  {

Index: ktcheck.c
===================================================================
RCS file: /cvsroot/radmind/radmind/ktcheck.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -d -r1.114 -r1.115
*** ktcheck.c	13 Oct 2006 20:22:25 -0000	1.114
--- ktcheck.c	22 Nov 2006 18:36:43 -0000	1.115
***************
*** 46,49 ****
--- 46,50 ----
  #include "mkdirs.h"
  #include "rmdirs.h"
+ #include "report.h"
  
  int cleandirs( char *path, struct llist *khead );
***************
*** 740,743 ****
--- 741,745 ----
  
      case 2:
+ 	report_event( sn, "ktcheck", "Error" );
  	exit( 2 );
      }
***************
*** 849,856 ****
  
  done:
-     if (( closesn( sn )) !=0 ) {
- 	fprintf( stderr, "can not close sn\n" );
- 	exit( 2 );
-     }
  #ifdef HAVE_ZLIB
      if ( verbose && zlib_level > 0 ) print_stats( sn );
--- 851,854 ----
***************
*** 862,870 ****
  
      if ( change ) {
! 	exit( 1 );
      } else {
! 	if ( !quiet ) printf( "No updates needed\n" );
! 	exit( 0 );
      }
  }
  
--- 860,889 ----
  
      if ( change ) {
! 	if ( update ) {
! 	    if ( report_event( sn, "ktcheck", "Updates retrieved" ) != 0 ) {
! 		fprintf( stderr, "warning: could not report event\n" );
! 	    }
! 	} else {
! 	    if ( report_event( sn, "ktcheck", "Updates available" ) != 0 ) {
! 		fprintf( stderr, "warning: could not report event\n" );
! 	    }
! 	}
      } else {
! 	if ( report_event( sn, "ktcheck", "No updates needed" ) != 0 ) {
! 	    fprintf( stderr, "warning: could not report event\n" );
! 	}
!     }
! 
!     if (( closesn( sn )) != 0 ) {
! 	fprintf( stderr, "cannot close sn\n" );
! 	exit( 2 );
!     }
! 
!     if ( change ) {
! 	exit( 1 );
      }
+ 
+     if ( !quiet ) printf( "No updates needed\n" );
+     exit( 0 );
  }
  
***************
*** 931,934 ****
--- 950,954 ----
  		break;
  	    case 2:
+ 		report_event( sn, "ktcheck", "Error" );
  		goto error;
  	    }
***************
*** 957,960 ****
--- 977,981 ----
  		break;
  	    case 2:
+ 		report_event( sn, "ktcheck", "Error" );
  		exit( 2 );
  	    }
***************
*** 977,980 ****
--- 998,1002 ----
      }
      if ( !update && change ) {
+ 	report_event( sn, "ktcheck", "Updates available" );
  	exit( 1 );
      }

[Radmind-commit] radmind ra.sh,1.33,1.34

From: Andrew M. <fit...@us...> - 2006-11-07 19:35:26

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

Modified Files:
	ra.sh 
Log Message:
Respect TMPDIR environment variable if set. Thanks to Hauke Fath for drawing attention to it.


Index: ra.sh
===================================================================
RCS file: /cvsroot/radmind/radmind/ra.sh,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** ra.sh	7 Nov 2006 19:09:22 -0000	1.33
--- ra.sh	7 Nov 2006 19:35:19 -0000	1.34
***************
*** 26,29 ****
--- 26,30 ----
  EDITOR=${EDITOR:-vi}
  USER=${SUDO_USER:-$USER}
+ TMPDIR="${TMPDIR:=/tmp}"
  DEFAULTS="/etc/defaults/radmind"
  FSDIFFROOT="."
***************
*** 41,47 ****
  MKTEMP="_RADMIND_MKTEMP"
  TEMPFILES=FALSE
! TMPDIR="/tmp/.ra.$$"
! if [ -f "${MKTEMP}" ]; then
!     TMPDIR=`${MKTEMP} -qd /tmp/.ra.$$.XXXXXX`
      if [ $? -ne 0 ]; then
  	echo "mktemp failed"
--- 42,48 ----
  MKTEMP="_RADMIND_MKTEMP"
  TEMPFILES=FALSE
! RASHTMP="${TMPDIR}/.ra.$$"
! if [ -f "${MKTEMP}"  ]; then
!     RASHTMP=`${MKTEMP} -qd "${TMPDIR}/.ra.$$.XXXXXX"`
      if [ $? -ne 0 ]; then
  	echo "mktemp failed"
***************
*** 49,54 ****
      fi
  fi
! LTMP="${TMPDIR}/lapply.out"
! FTMP="${TMPDIR}/fsdiff.out"
  
  # different systems use different default dirs
--- 50,55 ----
      fi
  fi
! LTMP="${RASHTMP}/lapply.out"
! FTMP="${RASHTMP}/fsdiff.out"
  
  # different systems use different default dirs
***************
*** 87,91 ****
  cleanup() {
      if [ "$TEMPFILES" = FALSE ]; then
! 	rm -fr "${TMPDIR}"
      fi
  }
--- 88,92 ----
  cleanup() {
      if [ "$TEMPFILES" = FALSE ]; then
! 	rm -fr "${RASHTMP}"
      fi
  }
***************
*** 324,331 ****
  cd /
  
! if [ ! -d ${TMPDIR} ]; then
!     mkdir -m 700 ${TMPDIR} 
      if [ $? -ne 0 ]; then
!         echo "Cannot create temporary directory $TMPDIR" 
  	exit 1
      fi
--- 325,332 ----
  cd /
  
! if [ ! -d "${RASHTMP}" ]; then
!     mkdir -m 700 "${RASHTMP}"
      if [ $? -ne 0 ]; then
!         echo "Cannot create temporary directory $RASHTMP" 
  	exit 1
      fi
***************
*** 407,411 ****
  	TNAME=`hostname | cut -d. -f1`-`date +%Y%m%d`-${USER}.T
      fi
!     FTMP="${TMPDIR}/${TNAME}"
      fsdiff -C ${CASE} ${FPROGRESS} ${CHECKSUM} -o ${FTMP} ${FSDIFFROOT}
      if [ $? -ne 0 ]; then
--- 408,412 ----
  	TNAME=`hostname | cut -d. -f1`-`date +%Y%m%d`-${USER}.T
      fi
!     FTMP="${RASHTMP}/${TNAME}"
      fsdiff -C ${CASE} ${FPROGRESS} ${CHECKSUM} -o ${FTMP} ${FSDIFFROOT}
      if [ $? -ne 0 ]; then

[Radmind-commit] radmind ra.sh,1.32,1.33

From: Andrew M. <fit...@us...> - 2006-11-07 19:09:35

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

Modified Files:
	ra.sh 
Log Message:
EOF means No.


Index: ra.sh
===================================================================
RCS file: /cvsroot/radmind/radmind/ra.sh,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** ra.sh	7 Nov 2006 16:24:53 -0000	1.32
--- ra.sh	7 Nov 2006 19:09:22 -0000	1.33
***************
*** 63,66 ****
--- 63,69 ----
      echo -n "$*" "[Yn] "
      read ans
+     if [ $? -ne 0 ]; then
+ 	return 0
+     fi
      if [ -z "$ans" -o X"$ans" = Xy -o X"$ans" = XY -o X"$ans" = Xyes ]; then
  	return 1

[Radmind-commit] radmind ra.sh,1.31,1.32

From: Andrew M. <fit...@us...> - 2006-11-07 16:24:58

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

Modified Files:
	ra.sh 
Log Message:
Fixes for Gab's ra.sh update infinite loop. Check return value of read to handle EOF. Fix typo processing postapply scripts.


Index: ra.sh
===================================================================
RCS file: /cvsroot/radmind/radmind/ra.sh,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** ra.sh	19 Jul 2006 20:17:51 -0000	1.31
--- ra.sh	7 Nov 2006 16:24:53 -0000	1.32
***************
*** 88,91 ****
--- 88,96 ----
  }
  
+ cleanup_and_exit() {
+     cleanup
+     exit 1
+ fi
+ 
  dopreapply() {
      if [ -d ${PREAPPLY} ]; then
***************
*** 199,202 ****
--- 204,211 ----
  
  	    read ans
+ 	    if [ $? -ne 0 ]; then
+ 		cleanup_and_exit
+ 	    fi
+ 
  	    case "${ans}" in
  	    a|A)
***************
*** 219,222 ****
--- 228,232 ----
  	    *)
  		;;
+ 
  	    esac
  	done
***************
*** 245,249 ****
  	Yn "Run post-apply scripts on difference transcript?"
          if [ $? -eq 1 ]; then
!             dopostapply ${FMTP}
          fi
      elif [ x"$opt" != x"interactive" ]; then
--- 255,259 ----
  	Yn "Run post-apply scripts on difference transcript?"
          if [ $? -eq 1 ]; then
!             dopostapply ${FTMP}
          fi
      elif [ x"$opt" != x"interactive" ]; then
***************
*** 320,324 ****
  
  # Trap meaningful signals
! trap cleanup HUP INT PIPE QUIT TERM TRAP XCPU XFSZ
  
  case "$1" in
--- 330,334 ----
  
  # Trap meaningful signals
! trap cleanup_and_exit HUP INT PIPE QUIT TERM TRAP XCPU XFSZ
  
  case "$1" in

[Radmind-commit] radmind-assistant/hooks radmind.hook,1.1,1.2

From: Andrew M. <fit...@us...> - 2006-11-01 12:31:52

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

Modified Files:
	radmind.hook 
Log Message:
Fix quoting problem so postapply scripts run. Thanks to Nigel Kersten for drawing attention to it.


Index: radmind.hook
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/hooks/radmind.hook,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** radmind.hook	24 Feb 2006 22:25:27 -0000	1.1
--- radmind.hook	1 Nov 2006 12:31:47 -0000	1.2
***************
*** 187,191 ****
  # run any scripts in the post-apply directory
  if [ -d ${postapply} ]; then
!     for script in "${postapply}/*"; do
  	${script} ${FSDIFFOUTPUT}
      done
--- 187,191 ----
  # run any scripts in the post-apply directory
  if [ -d ${postapply} ]; then
!     for script in "${postapply}"/*; do
  	${script} ${FSDIFFOUTPUT}
      done

Flat | Threaded

<< < 1 .. 9 10 11 12 13 .. 22 > >> (Page 11 of 22)