cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to radmind-1.4.0

Browse Source 
from maintainer William Yodlowsky <bsd@openbsd.rutgers.edu>
This commit is contained in:
pvalchev 2005-01-26 00:33:30 +00:00
parent bcac3bab4e
commit 82806daf7d
16 changed files with 309 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sysutils/radmind/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.4 2004/12/20 10:35:35 alek Exp $
# $OpenBSD: Makefile,v 1.5 2005/01/26 00:33:30 pvalchev Exp $
COMMENT= "remote administration software"
DISTNAME= radmind-1.3.0
PKGNAME= ${DISTNAME}p0
DISTNAME= radmind-1.4.0
CATEGORIES= sysutils
HOMEPAGE= http://rsug.itd.umich.edu/software/radmind/

8
sysutils/radmind/distinfo
View File

@ -1,4 +1,4 @@
MD5 (radmind-1.3.0.tgz) = 46ef7b08d8e5304751db9d2e45e2488c
RMD160 (radmind-1.3.0.tgz) = 284e8bbd65958231aeb9731662a7a19cc3102629
SHA1 (radmind-1.3.0.tgz) = bfb45136b6e818ae7b3931bcebed105a93f45994
SIZE (radmind-1.3.0.tgz) = 508114
MD5 (radmind-1.4.0.tgz) = 9e2eb883e5c4cfc6495f169594f4d180
RMD160 (radmind-1.4.0.tgz) = dea3cdc6d54ce91a4b685dcaf1fe93df69a71d59
SHA1 (radmind-1.4.0.tgz) = 68fcb7cf9dba6449cb501f216d510bf4f5badff1
SIZE (radmind-1.4.0.tgz) = 342647

12
sysutils/radmind/patches/patch-Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
--- Makefile.in.orig Mon Mar 15 09:51:43 2004
+++ Makefile.in Sat Jun 26 12:49:04 2004
@@ -209,7 +209,7 @@ man : FRC
${srcdir}/man/$$i > tmp/man/$$i; \
done
-install : all man
+install : all
-mkdir -p ${exec_prefix}
-mkdir -p ${SBINDIR}
${INSTALL} -m 0755 -c radmind ${SBINDIR}/

165
sysutils/radmind/patches/patch-command_c
View File

@ -1,70 +1,7 @@
$OpenBSD: patch-command_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
--- command.c.orig 2004-03-15 11:11:55.000000000 -0500
+++ command.c 2004-06-08 23:09:17.000000000 -0400
@@ -302,7 +302,7 @@ f_retr( sn, ac, av )
switch ( keyword( ac, av )) {
case K_COMMAND:
- sprintf( path, "%s", command_file );
+ (void)snprintf( path, sizeof( path ), "%s", command_file );
break;
case K_TRANSCRIPT:
@@ -324,7 +324,7 @@ f_retr( sn, ac, av )
return( 1 );
}
- sprintf( path, "transcript/%s", d_tran );
+ (void)snprintf( path, sizeof( path ), "transcript/%s", d_tran );
break;
case K_SPECIAL:
@@ -334,7 +334,7 @@ f_retr( sn, ac, av )
return( 1 );
}
- sprintf( path, "%s/%s", special_dir, d_path );
+ (void)snprintf( path, sizeof( path ), "%s/%s", special_dir, d_path );
break;
case K_FILE:
@@ -366,7 +366,7 @@ f_retr( sn, ac, av )
return( 1 );
}
- sprintf( path, "file/%s/%s", d_tran, d_path );
+ (void)snprintf( path, sizeof( path ), "file/%s/%s", d_tran, d_path );
free( d_path );
break;
@@ -478,7 +478,7 @@ f_stat( SNET *sn, int ac, char *av[] )
switch ( key = keyword( ac, av )) {
case K_COMMAND:
- sprintf( path, "%s", command_file );
+ (void)snprintf( path, sizeof( path ), "%s", command_file );
break;
case K_TRANSCRIPT:
@@ -500,7 +500,7 @@ f_stat( SNET *sn, int ac, char *av[] )
return( 1 );
}
- sprintf( path, "transcript/%s", d_tran );
+ (void)snprintf( path, sizeof( path ), "transcript/%s", d_tran );
break;
case K_SPECIAL:
@@ -510,7 +510,7 @@ f_stat( SNET *sn, int ac, char *av[] )
return( 1 );
}
- sprintf( path, "%s/%s", special_dir, d_path);
+ (void)snprintf( path, sizeof( path ), "%s/%s", special_dir, d_path);
break;
default:
@@ -578,7 +578,7 @@ f_stat( SNET *sn, int ac, char *av[] )
$OpenBSD: patch-command_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
--- command.c.orig Tue Dec 14 10:59:27 2004
+++ command.c Thu Jan 20 12:59:08 2005
@@ -635,7 +635,7 @@ f_stat( SNET *sn, int ac, char *av[] )
/* if allowable, check for transcript in the special file directory */
@ -73,36 +10,16 @@ $OpenBSD: patch-command_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
/* store value of av[ 2 ], because argcargv will be called
* from special_t(), and that will blow away the current values
@@ -647,13 +647,13 @@ f_stor( SNET *sn, int ac, char *av[] )
switch ( keyword( ac, av )) {
case K_TRANSCRIPT:
- sprintf( xscriptdir, "tmp/file/%s", d_tran );
- sprintf( upload, "tmp/transcript/%s", d_tran );
+ (void)snprintf( xscriptdir, sizeof( xscriptdir ), "tmp/file/%s", d_tran );
+ (void)snprintf( upload, sizeof( upload ), "tmp/transcript/%s", d_tran );
/* keep encoded transcript name, since it will just be
* used later to compare in a stor file.
*/
@@ -727,7 +727,7 @@ f_stor( SNET *sn, int ac, char *av[] )
snet_writef( sn, "%d Path too long\r\n", 540 );
return( 1 );
}
- strcpy( upload_xscript, av[ 2 ] );
+ (void)strlcpy( upload_xscript, av[ 2 ], sizeof( upload_xscript ) );
/* make the directory for the files of this xscript to live in. */
if ( mkdir( xscriptdir, 0777 ) < 0 ) {
@@ -688,9 +688,9 @@ f_stor( SNET *sn, int ac, char *av[] )
}
if ( d_path[ 0 ] == '/' ) {
- sprintf( upload, "tmp/file/%s%s", d_tran, d_path );
+ (void)snprintf( upload, sizeof( upload ), "tmp/file/%s%s", d_tran, d_path );
} else {
- sprintf( upload, "tmp/file/%s/%s", d_tran, d_path );
+ (void)snprintf( upload, sizeof( upload ), "tmp/file/%s/%s", d_tran, d_path );
}
free( d_path );
free( d_tran );
@@ -1044,7 +1044,7 @@ command_k( char *path_config )
@@ -1123,7 +1123,7 @@ command_k( char *path_config )
}
if (( p = strrchr( av[ 1 ], '/' )) == NULL ) {
@ -111,30 +28,54 @@ $OpenBSD: patch-command_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
} else {
*p = '\0';
if ( snprintf( special_dir, MAXPATHLEN, "special/%s", av[ 1 ] )
@@ -1057,7 +1057,7 @@ command_k( char *path_config )
}
if (( remote_cn != NULL ) && wildcard( av[ 0 ], remote_cn )) {
- sprintf( command_file, "command/%s", av[ 1 ] );
+ (void)snprintf( command_file, sizeof( command_file ), "command/%s", av[ 1 ] );
if ( snprintf( special_dir, MAXPATHLEN, "%s/%s", special_dir,
remote_cn ) > MAXPATHLEN - 1 ) {
@@ -1141,14 +1141,14 @@ command_k( char *path_config )
"config file: line %d: command file too long\n", linenum );
continue;
}
- strcpy( command_file, av[ 1 ] );
+ (void)strlcpy( command_file, av[ 1 ], sizeof( command_file ) );
if ( snprintf( temp, MAXPATHLEN, "%s/%s", special_dir,
remote_cn ) >= MAXPATHLEN ) {
syslog( LOG_ERR, "config file: line %d: special dir too long\n",
@@ -1067,7 +1067,7 @@ command_k( char *path_config )
linenum );
continue;
}
- strcpy( special_dir, temp );
+ (void)strlcpy( special_dir, temp, sizeof( special_dir ) );
return( 0 );
}
if ( wildcard( av[ 0 ], remote_host )) {
- sprintf( command_file, "command/%s", av[ 1 ] );
+ (void)snprintf( command_file, sizeof( command_file ), "command/%s", av[ 1 ] );
if ( snprintf( special_dir, MAXPATHLEN, "%s/%s", special_dir,
remote_host ) > MAXPATHLEN - 1 ) {
if ( wildcard( av[ 0 ], remote_host, 0 )) {
@@ -1157,14 +1157,14 @@ command_k( char *path_config )
"config file: line %d: command file too long\n", linenum );
continue;
}
- strcpy( command_file, av[ 1 ] );
+ (void)strlcpy( command_file, av[ 1 ], sizeof( command_file ) );
if ( snprintf( temp, MAXPATHLEN, "%s/%s", special_dir,
remote_host ) >= MAXPATHLEN ) {
syslog( LOG_ERR, "config file: line %d: special dir too long\n",
@@ -1077,7 +1077,7 @@ command_k( char *path_config )
linenum );
continue;
}
- strcpy( special_dir, temp );
+ (void)strlcpy( special_dir, temp, sizeof( special_dir ) );
return( 0 );
}
if ( wildcard( av[ 0 ], remote_addr )) {
- sprintf( command_file, "command/%s", av[ 1 ] );
+ (void)snprintf( command_file, sizeof( command_file ), "command/%s", av[ 1 ] );
if ( snprintf( special_dir, MAXPATHLEN, "%s/%s", special_dir,
remote_addr ) > MAXPATHLEN - 1 ) {
if ( wildcard( av[ 0 ], remote_addr, 1 )) {
@@ -1173,14 +1173,14 @@ command_k( char *path_config )
"config file: line %d: command file too long\n", linenum );
continue;
}
- strcpy( command_file, av[ 1 ] );
+ (void)strlcpy( command_file, av[ 1 ], sizeof( command_file ) );
if ( snprintf( temp, MAXPATHLEN, "%s/%s", special_dir,
remote_addr ) >= MAXPATHLEN ) {
syslog( LOG_ERR, "config file: line %d: special dir too long\n",
linenum );
continue;
}
- strcpy( special_dir, temp );
+ (void)strlcpy( special_dir, temp, sizeof( special_dir ) );
return( 0 );
}
}

8
sysutils/radmind/patches/patch-fsdiff_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-fsdiff_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
--- fsdiff.c.orig 2004-03-11 14:43:58.000000000 -0500
+++ fsdiff.c 2004-06-08 15:52:01.000000000 -0400
@@ -60,13 +60,7 @@ fs_walk( char *path, int start, int fini
$OpenBSD: patch-fsdiff_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
--- fsdiff.c.orig Tue Sep 28 10:39:14 2004
+++ fsdiff.c Thu Jan 13 08:42:34 2005
@@ -59,13 +59,7 @@ fs_walk( char *path, int start, int fini
}
if ( ischild( tran->t_pinfo.pi_name, path )) {

39
sysutils/radmind/patches/patch-ktcheck_c Normal file
View File

@ -0,0 +1,39 @@
$OpenBSD: patch-ktcheck_c,v 1.1 2005/01/26 00:33:30 pvalchev Exp $
--- ktcheck.c.orig Thu Jan 20 13:09:09 2005
+++ ktcheck.c Thu Jan 20 13:05:02 2005
@@ -95,7 +95,7 @@ getstat( SNET *sn, char *description, ch
fprintf( stderr, "%s: line too long\n", line );
return( -1 );
}
- strcpy( stats, line );
+ (void)strlcpy( stats, line, MAXPATHLEN );
if ( verbose ) printf( "<<< %s\n", stats );
@@ -253,7 +253,7 @@ check( SNET *sn, char *type, char *file
fprintf( stderr, "%s: too long\n", type );
return( 2 );
}
- strcpy( pathdesc, type );
+ (void)strlcpy( pathdesc, type, sizeof( pathdesc ) );
file = base_kfile;
@@ -262,7 +262,7 @@ check( SNET *sn, char *type, char *file
fprintf( stderr, "%s: path too long\n", base_kfile );
return( 2 );
}
- strcpy( path, base_kfile );
+ (void)strlcpy( path, base_kfile, sizeof( path ) );
}
if ( getstat( sn, (char *)&pathdesc, stats ) != 0 ) {
@@ -505,7 +505,7 @@ main( int argc, char **argv )
p++;
*p = (char)'\0';
}
- strcpy( path, base_kfile );
+ (void)strlcpy( path, base_kfile, sizeof( path ) );
if (( sn = connectsn( host, port )) == NULL ) {
exit( 2 );

34
sysutils/radmind/patches/patch-lapply_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lapply_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
--- lapply.c.orig 2004-02-12 14:35:52.000000000 -0500
+++ lapply.c 2004-06-08 16:21:37.000000000 -0400
@@ -72,7 +72,7 @@ create_node( char *path, char *tline )
$OpenBSD: patch-lapply_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
--- lapply.c.orig Thu Dec 16 16:50:35 2004
+++ lapply.c Thu Jan 20 12:57:27 2005
@@ -75,7 +75,7 @@ create_node( char *path, char *tline )
new_node = (struct node *) malloc( sizeof( struct node ));
new_node->path = strdup( path );
if ( tline != NULL ) {
@ -10,7 +10,7 @@ $OpenBSD: patch-lapply_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
new_node->doline = 1;
} else {
new_node->doline = 0;
@@ -123,7 +123,7 @@ do_line( char *tline, int present, struc
@@ -126,7 +126,7 @@ do_line( char *tline, int present, struc
fprintf( stderr, "line %d: too long\n", linenum );
return( 1 );
}
@ -19,7 +19,7 @@ $OpenBSD: patch-lapply_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
/* DOWNLOAD */
if ( *command == '+' ) {
@@ -132,7 +132,7 @@ do_line( char *tline, int present, struc
@@ -135,7 +135,7 @@ do_line( char *tline, int present, struc
linenum, *targv[ 0 ] );
return( 1 );
}
@ -28,7 +28,16 @@ $OpenBSD: patch-lapply_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
if ( special ) {
if ( snprintf( pathdesc, MAXPATHLEN * 2, "SPECIAL %s",
@@ -409,7 +409,7 @@ main( int argc, char **argv )
@@ -415,7 +415,7 @@ main( int argc, char **argv )
fprintf( stderr, "line %d: too long\n", linenum );
goto error2;
}
- strcpy( targvline, tline );
+ (void)strlcpy( targvline, tline, sizeof( targvline ) );
tac = acav_parse( acav, targvline, &targv );
@@ -425,7 +425,7 @@ main( int argc, char **argv )
}
if ( tac == 1 ) {
@ -37,7 +46,7 @@ $OpenBSD: patch-lapply_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
len = strlen( transcript );
if ( transcript[ len - 1 ] != ':' ) {
fprintf( stderr, "%s: line %d: invalid transcript name\n",
@@ -451,7 +451,7 @@ main( int argc, char **argv )
@@ -467,7 +467,7 @@ main( int argc, char **argv )
fprintf( stderr, "line %d: too long\n", linenum );
return( 1 );
}
@ -46,3 +55,12 @@ $OpenBSD: patch-lapply_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
/* Check transcript order */
if ( prepath != 0 ) {
@@ -482,7 +482,7 @@ main( int argc, char **argv )
transcript, linenum );
goto error2;
}
- strcpy( prepath, path );
+ (void)strlcpy( prepath, path, sizeof( prepath ) );
/* Do type check on local file */
switch ( radstat( path, &st, &fstype, &afinfo )) {

42
sysutils/radmind/patches/patch-lcksum_c
View File

@ -1,7 +1,41 @@
$OpenBSD: patch-lcksum_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
--- lcksum.c.orig Sat Jun 26 12:17:00 2004
+++ lcksum.c Sat Jun 26 12:17:47 2004
@@ -345,7 +345,7 @@ main( int argc, char **argv )
$OpenBSD: patch-lcksum_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
--- lcksum.c.orig Thu Jan 6 16:44:25 2005
+++ lcksum.c Thu Jan 20 12:59:55 2005
@@ -228,13 +228,13 @@ main( int argc, char **argv )
fprintf( stderr, "%s: path too long\n", tpath );
exit( 2 );
}
- strcpy( cwd, tpath );
+ (void)strlcpy( cwd, tpath, sizeof( cwd ) );
} else {
if ( snprintf( temp, MAXPATHLEN, "%s/%s", cwd, tpath ) >= MAXPATHLEN ) {
fprintf( stderr, "%s/%s: path too long\n", cwd, tpath );
exit( 2 );
}
- strcpy( cwd, temp );
+ (void)strlcpy( cwd, temp, sizeof( cwd ) );
}
if ( get_root( radmind_path, cwd, file_root, tran_root, tran_name ) != 0 ) {
exit( 2 );
@@ -337,7 +337,7 @@ main( int argc, char **argv )
exitval = 1;
goto done;
}
- strcpy( path, d_path );
+ (void)strlcpy( path, d_path, sizeof( path ) );
/* check to see if file against prefix */
if ( prefix != NULL ) {
@@ -395,7 +395,7 @@ main( int argc, char **argv )
exitval = 1;
goto done;
}
- strcpy( prepath, path );
+ (void)strlcpy( prepath, path, sizeof( prepath ) );
/*
* Since this tool is run on the server, all files can be treated
@@ -479,7 +479,7 @@ main( int argc, char **argv )
fprintf( ufs, "%s %-37s %4s %5s %5s %9ld "
"%7" PRIofft "d %s\n",
targv[ 0 ], targv[ 1 ], targv[ 2 ], targv[ 3 ],

12
sysutils/radmind/patches/patch-list_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-list_c,v 1.1 2005/01/26 00:33:30 pvalchev Exp $
--- list.c.orig Thu Jan 13 09:57:58 2005
+++ list.c Thu Jan 13 09:59:15 2005
@@ -30,7 +30,7 @@ _list_create_node( char *path )
return( NULL );
}
memset( new_node, 0, sizeof( struct node ));
- sprintf( new_node->n_path, "%s", path );
+ (void)snprintf( new_node->n_path, sizeof( new_node->n_path ), "%s", path );
return( new_node );
}

69
sysutils/radmind/patches/patch-lmerge_c Normal file
View File

@ -0,0 +1,69 @@
$OpenBSD: patch-lmerge_c,v 1.1 2005/01/26 00:33:30 pvalchev Exp $
--- lmerge.c.orig Thu Jan 20 13:05:15 2005
+++ lmerge.c Thu Jan 20 13:07:16 2005
@@ -47,7 +47,7 @@ create_node( char *path )
fprintf( stderr, "%s: path too long\n", path );
return( NULL );
}
- strcpy( new_node->path, path );
+ (void)strlcpy( new_node->path, path, sizeof( new_node->path ) );
return( new_node );
}
@@ -143,7 +143,7 @@ getline:
tran->t_tran_name, tran->t_linenum, d_path );
return( 1 );
}
- strcpy( tran->t_filepath, d_path );
+ (void)strlcpy( tran->t_filepath, d_path, sizeof( tran->t_filepath ) );
/* Check transcript order */
if ( tran->t_prepath != 0 ) {
@@ -158,7 +158,7 @@ getline:
tran->t_tran_name, tran->t_linenum, tran->t_filepath );
return( 1 );
}
- strcpy( tran->t_prepath, tran->t_filepath );
+ (void)strlcpy( tran->t_prepath, tran->t_filepath, sizeof( tran->t_prepath ) );
return( 0 );
@@ -310,17 +310,17 @@ main( int argc, char **argv )
fprintf( stderr, "%s: path too long\n", trans[ 1 ]->t_file_root );
exit( 2 );
}
- strcpy( file_root, trans[ 1 ]->t_file_root );
+ (void)strlcpy( file_root, trans[ 1 ]->t_file_root, sizeof( file_root ) );
if ( strlen( trans[ 1 ]->t_tran_root ) >= MAXPATHLEN ) {
fprintf( stderr, "%s: path too long\n", trans[ 1 ]->t_tran_root );
exit( 2 );
}
- strcpy( tran_root, trans[ 1 ]->t_tran_root );
+ (void)strlcpy( tran_root, trans[ 1 ]->t_tran_root, sizeof( tran_root ) );
if ( strlen( trans[ 1 ]->t_tran_name ) >= MAXPATHLEN ) {
fprintf( stderr, "%s: path too long\n", trans[ 1 ]->t_tran_name );
exit( 2 );
}
- strcpy( tran_name, trans[ 1 ]->t_tran_name );
+ (void)strlcpy( tran_name, trans[ 1 ]->t_tran_name, sizeof( tran_name ) );
} else {
/* Create tran if missing */
if (( ofd = open( argv[ argc - 1 ], O_WRONLY | O_CREAT, 0666 ) ) < 0 ) {
@@ -338,7 +338,7 @@ main( int argc, char **argv )
fprintf( stderr, "%s: path too long\n", argv[ argc - 1 ] );
exit( 2 );
}
- strcpy( cwd, argv[ argc - 1 ] );
+ (void)strlcpy( cwd, argv[ argc - 1 ], sizeof( cwd ) );
} else {
if ( snprintf( temp, MAXPATHLEN, "%s/%s", cwd, argv[ argc - 1 ] )
> MAXPATHLEN - 1 ) {
@@ -346,7 +346,7 @@ main( int argc, char **argv )
argv[ argc - 1 ] );
exit( 2 );
}
- strcpy( cwd, temp );
+ (void)strlcpy( cwd, temp, sizeof( cwd ) );
}
if ( get_root( radmind_path, cwd, file_root, tran_root, tran_name ) != 0 ) {
exit( 2 );

30
sysutils/radmind/patches/patch-progress_c Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-progress_c,v 1.1 2005/01/26 00:33:30 pvalchev Exp $
--- progress.c.orig Thu Jan 20 13:07:27 2005
+++ progress.c Thu Jan 20 13:08:00 2005
@@ -39,7 +39,7 @@ loadsetsize( FILE *tran )
while ( fgets( tline, LINE_MAX, tran ) != NULL ) {
linenum++;
- strcpy( line, tline );
+ (void)strlcpy( line, tline, sizeof( line ) );
if (( tac = argcargv( tline, &targv )) == 0 ) {
continue;
}
@@ -72,7 +72,7 @@ applyloadsetsize( FILE *tran )
while ( fgets( tline, LINE_MAX, tran ) != NULL ) {
linenum++;
- strcpy( line, tline );
+ (void)strlcpy( line, tline, sizeof( line ) );
/* skip empty lines and transcript marker lines */
if (( tac = argcargv( tline, &targv )) <= 1 ) {
continue;
@@ -113,7 +113,7 @@ lcksum_loadsetsize( FILE *tran, char *pr
while ( fgets( tline, LINE_MAX, tran ) != NULL ) {
linenum++;
- strcpy( line, tline );
+ (void)strlcpy( line, tline, sizeof( line ) );
if (( tac = argcargv( tline, &targv )) <= 1 ) {
continue;
}

17
sysutils/radmind/patches/patch-root_c
View File

@ -1,7 +1,16 @@
$OpenBSD: patch-root_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
--- root.c.orig 2004-03-08 12:52:35.000000000 -0500
+++ root.c 2004-06-12 23:05:03.000000000 -0400
@@ -80,8 +80,8 @@ get_root( char *path, char *file_root, c
$OpenBSD: patch-root_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
--- root.c.orig Thu Jan 6 16:31:49 2005
+++ root.c Thu Jan 20 12:57:28 2005
@@ -33,7 +33,7 @@ get_root( char *radmind_path, char *path
fprintf( stderr, "%s: path too long\n", p );
return( -1 );
}
- strcpy( tran_name, p );
+ (void)strlcpy( tran_name, p, MAXPATHLEN );
if ( snprintf( test_path, MAXPATHLEN, "%s/tmp/transcript",
radmind_real_path ) > MAXPATHLEN - 1 ) {
@@ -81,8 +81,8 @@ get_root( char *radmind_path, char *path
return( -1 );
}
} else {

8
sysutils/radmind/patches/patch-stor_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-stor_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
--- stor.c.orig 2004-06-08 16:21:48.000000000 -0400
+++ stor.c 2004-06-08 16:41:13.000000000 -0400
@@ -449,11 +449,13 @@ n_stor_applefile( SNET *sn, char *pathde
$OpenBSD: patch-stor_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
--- stor.c.orig Thu Sep 23 13:46:22 2004
+++ stor.c Thu Jan 13 08:42:35 2005
@@ -464,11 +464,13 @@ n_stor_applefile( SNET *sn, char *pathde
struct timeval tv;
struct applefileinfo afinfo;
off_t size;

33
sysutils/radmind/patches/patch-transcript_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-transcript_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
--- transcript.c.orig 2004-03-25 12:45:41.000000000 -0500
+++ transcript.c 2004-06-08 16:29:21.000000000 -0400
@@ -92,7 +92,7 @@ transcript_parse( struct transcript *tra
$OpenBSD: patch-transcript_c,v 1.2 2005/01/26 00:33:30 pvalchev Exp $
--- transcript.c.orig Thu Jan 6 08:37:55 2005
+++ transcript.c Thu Jan 20 13:02:32 2005
@@ -99,7 +99,7 @@ transcript_parse( struct transcript *tra
exit( 2 );
}
@ -10,7 +10,7 @@ $OpenBSD: patch-transcript_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
/* reading and parsing the line */
switch( *argv[ 0 ] ) {
@@ -162,7 +162,7 @@ transcript_parse( struct transcript *tra
@@ -169,7 +169,7 @@ transcript_parse( struct transcript *tra
tran->t_fullname, tran->t_linenum );
exit( 2 );
}
@ -19,7 +19,7 @@ $OpenBSD: patch-transcript_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
break;
case 'a': /* hfs applefile */
@@ -184,7 +184,7 @@ transcript_parse( struct transcript *tra
@@ -191,7 +191,7 @@ transcript_parse( struct transcript *tra
exit( 2 );
}
}
@ -28,7 +28,7 @@ $OpenBSD: patch-transcript_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
break;
default:
@@ -581,17 +581,17 @@ transcript( char *path )
@@ -598,17 +598,17 @@ transcript( char *path )
}
}
@ -49,7 +49,7 @@ $OpenBSD: patch-transcript_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
}
/* By default, go into directories */
@@ -602,7 +602,7 @@ transcript( char *path )
@@ -619,7 +619,7 @@ transcript( char *path )
}
/* initialize cksum field. */
@ -58,32 +58,25 @@ $OpenBSD: patch-transcript_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
}
for (;;) {
@@ -651,8 +651,8 @@ t_new( int type, char *fullname, char *s
@@ -668,9 +668,9 @@ t_new( int type, char *fullname, char *s
} else {
new->t_eof = 0;
new->t_linenum = 0;
- strcpy( new->t_shortname, shortname );
- strcpy( new->t_fullname, fullname );
- strcpy( new->t_kfile, kfile );
+ (void)strlcpy( new->t_shortname, shortname, sizeof( new->t_shortname ) );
+ (void)strlcpy( new->t_fullname, fullname, sizeof( new->t_fullname ) );
+ (void)strlcpy( new->t_kfile, kfile, sizeof( new->t_kfile ) );
if (( new->t_in = fopen( fullname, "r" )) == NULL ) {
perror( fullname );
exit( 2 );
@@ -735,7 +735,7 @@ transcript_init( char *kfile, int kfilem
linenum, kdir, av[ 1 ] );
exit( 2 );
}
- sprintf( fullpath, "%s%s", kdir, av[ 1 ] );
+ (void)snprintf( fullpath, sizeof( fullpath ), "%s%s", kdir, av[ 1 ] );
switch( *av[ 0 ] ) {
case 'p': /* positive */
@@ -763,7 +763,7 @@ transcript_init( char *kfile, int kfilem
@@ -735,7 +735,7 @@ transcript_init( char *kfile, int locati
"special path too long: %s%s\n", kdir, special );
exit( 2 );
}
- sprintf( fullpath, "%s%s", kdir, special );
+ (void)snprintf( fullpath, sizeof( fullpath ), "%s%s", kdir, special );
t_new( T_SPECIAL, fullpath, special );
t_new( T_SPECIAL, fullpath, special, "special" );
}

12
sysutils/radmind/patches/patch-twhich_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-twhich_c,v 1.1.1.1 2004/06/26 19:00:48 sturm Exp $
--- twhich.c.orig 2004-06-08 16:29:27.000000000 -0400
+++ twhich.c 2004-06-08 16:29:40.000000000 -0400
@@ -239,7 +239,7 @@ main( int argc, char **argv )
}
linenum = 0;
- sprintf( prepath, "%s", "" );
+ (void)snprintf( prepath, sizeof( prepath ), "%s", "" );
while( fgets( line, sizeof( line ), f ) != NULL ) {
remove = 0;

3
sysutils/radmind/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2004/09/15 18:39:33 espie Exp $
@comment $OpenBSD: PLIST,v 1.3 2005/01/26 00:33:30 pvalchev Exp $
bin/fsdiff
bin/ktcheck
bin/lapply
@ -6,6 +6,7 @@ bin/lcksum
bin/lcreate
bin/lfdiff
bin/lmerge
bin/ra.sh
bin/twhich
@man man/man1/fsdiff.1
@man man/man1/ktcheck.1