Menu
▾
▴
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
|
|
From: Andrew M. <fit...@us...> - 2008-01-07 01:52:02
|
Update of /cvsroot/radmind/radmind In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9409 Modified Files: transcript.c Log Message: Fix: [ Bug 1856125 ]: Exclude File Names not escaped. Index: transcript.c =================================================================== RCS file: /cvsroot/radmind/radmind/transcript.c,v retrieving revision 1.123 retrieving revision 1.124 diff -C2 -d -r1.123 -r1.124 *** transcript.c 10 Dec 2007 16:57:04 -0000 1.123 --- transcript.c 7 Jan 2008 01:51:35 -0000 1.124 *************** *** 899,902 **** --- 899,903 ---- char fullpath[ MAXPATHLEN ]; char *subpath; + char *d_pattern; char **av; FILE *fp; *************** *** 1011,1019 **** case 'x': /* exclude */ if ( minus ) { ! list_remove( exclude_list, av[ 1 ] ); } else { ! if ( !list_check( exclude_list, av[ 1 ] )) { ! if ( list_insert( exclude_list, av[ 1 ] ) != 0 ) { perror( "list_insert" ); return( -1 ); --- 1012,1024 ---- case 'x': /* exclude */ + if (( d_pattern = decode( av[ 1 ] )) == NULL ) { + fprintf( stderr, "%s: line %d: decode buffer too small\n", + kfile, linenum ); + } if ( minus ) { ! list_remove( exclude_list, d_pattern ); } else { ! if ( !list_check( exclude_list, d_pattern )) { ! if ( list_insert( exclude_list, d_pattern ) != 0 ) { perror( "list_insert" ); return( -1 ); |
|
From: Patrick M. <ume...@us...> - 2008-01-06 21:31:46
|
Update of /cvsroot/radmind/radmind In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6184 Modified Files: connect.c Log Message: No need to call htons() on ports found by getservbyname as they are returned in network byte order. Index: connect.c =================================================================== RCS file: /cvsroot/radmind/radmind/connect.c,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** connect.c 13 Dec 2007 22:56:12 -0000 1.31 --- connect.c 6 Jan 2008 21:31:39 -0000 1.32 *************** *** 111,115 **** /* maybe radmind's in /etc/services. if not, use default. */ if (( se = getservbyname( "radmind", "tcp" )) != NULL ) { ! sin.sin_port = htons( se->s_port ); } else { sin.sin_port = htons( RADMIND_IANA_PORT ); --- 111,116 ---- /* maybe radmind's in /etc/services. if not, use default. */ if (( se = getservbyname( "radmind", "tcp" )) != NULL ) { ! /* Port numbers are returned in network byte order */ ! sin.sin_port = se->s_port; } else { sin.sin_port = htons( RADMIND_IANA_PORT ); |
|
From: Andrew M. <fit...@us...> - 2007-12-19 20:05:47
|
Update of /cvsroot/radmind/CVSROOT In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21079 Modified Files: avail Log Message: Must use sf.net id, not umich. Index: avail =================================================================== RCS file: /cvsroot/radmind/CVSROOT/avail,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** avail 19 Dec 2007 19:31:49 -0000 1.1 --- avail 19 Dec 2007 20:05:43 -0000 1.2 *************** *** 1,3 **** unavail ! avail|admorten,umeditor,wescraig,umjarod avail|da_king|radmind/radmind-pc --- 1,3 ---- unavail ! avail|fitterhappier,umeditor,wescraig,umjarod avail|da_king|radmind/radmind-pc |
|
From: Andrew M. <fit...@us...> - 2007-12-19 19:31:59
|
Update of /cvsroot/radmind/CVSROOT In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6171 Modified Files: checkoutlist Added Files: avail Log Message: Instituting CVS acls. Index: checkoutlist =================================================================== RCS file: /cvsroot/radmind/CVSROOT/checkoutlist,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** checkoutlist 15 Jun 2005 12:10:33 -0000 1.1 --- checkoutlist 19 Dec 2007 19:31:49 -0000 1.2 *************** *** 12,13 **** --- 12,16 ---- # # comment lines begin with '#' + # + # Developer ACLs -- fitterhappier 19 Dec 2007 + avail --- NEW FILE: avail --- unavail avail|admorten,umeditor,wescraig,umjarod avail|da_king|radmind/radmind-pc |
|
From: Andrew M. <fit...@us...> - 2007-12-14 19:32:13
|
Update of /cvsroot/radmind/radmind In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9515 Modified Files: update.c update.h Log Message: Silence warnings about mkprefix argument pointer types. Index: update.h =================================================================== RCS file: /cvsroot/radmind/radmind/update.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** update.h 10 Jan 2003 17:58:56 -0000 1.7 --- update.h 14 Dec 2007 19:32:10 -0000 1.8 *************** *** 4,7 **** */ ! int update( const char *path, char *displaypath, int present, int newfile, struct stat *st, int tac, char **targv, struct applefileinfo *afinfo ); --- 4,7 ---- */ ! int update( char *path, char *displaypath, int present, int newfile, struct stat *st, int tac, char **targv, struct applefileinfo *afinfo ); Index: update.c =================================================================== RCS file: /cvsroot/radmind/radmind/update.c,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** update.c 29 Jul 2007 17:57:58 -0000 1.48 --- update.c 14 Dec 2007 19:32:10 -0000 1.49 *************** *** 38,42 **** int ! update( const char *path, char *displaypath, int present, int newfile, struct stat *st, int tac, char **targv, struct applefileinfo *afinfo ) { --- 38,42 ---- int ! update( char *path, char *displaypath, int present, int newfile, struct stat *st, int tac, char **targv, struct applefileinfo *afinfo ) { |
|
From: Andrew M. <fit...@us...> - 2007-12-14 18:52:29
|
Update of /cvsroot/radmind/radmind In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26223 Modified Files: ktcheck.c lapply.c lcreate.c lfdiff.c repo.c Log Message: Removed unused variables leftover from getservbyname cleanup. Index: lcreate.c =================================================================== RCS file: /cvsroot/radmind/radmind/lcreate.c,v retrieving revision 1.91 retrieving revision 1.92 diff -C2 -d -r1.91 -r1.92 *** lcreate.c 13 Dec 2007 22:56:12 -0000 1.91 --- lcreate.c 14 Dec 2007 18:52:22 -0000 1.92 *************** *** 79,83 **** unsigned short port = 0; extern int optind; - struct servent *se; SNET *sn = NULL; char type; --- 79,82 ---- Index: lapply.c =================================================================== RCS file: /cvsroot/radmind/radmind/lapply.c,v retrieving revision 1.143 retrieving revision 1.144 diff -C2 -d -r1.143 -r1.144 *** lapply.c 13 Dec 2007 22:56:12 -0000 1.143 --- lapply.c 14 Dec 2007 18:52:22 -0000 1.144 *************** *** 236,240 **** FILE *f = NULL; char *host = _RADMIND_HOST, *d_path; - struct servent *se; char tline[ 2 * MAXPATHLEN ]; char targvline[ 2 * MAXPATHLEN ]; --- 236,239 ---- Index: lfdiff.c =================================================================== RCS file: /cvsroot/radmind/radmind/lfdiff.c,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** lfdiff.c 13 Dec 2007 22:56:12 -0000 1.64 --- lfdiff.c 14 Dec 2007 18:52:22 -0000 1.65 *************** *** 132,137 **** char opt[ 3 ]; char *epath; /* encoded path */ ! char **capa = NULL; /* capabilities */ ! struct servent *se; SNET *sn; int authlevel = _RADMIND_AUTHLEVEL; --- 132,136 ---- char opt[ 3 ]; char *epath; /* encoded path */ ! char **capa = NULL; /* capabilities */ SNET *sn; int authlevel = _RADMIND_AUTHLEVEL; Index: repo.c =================================================================== RCS file: /cvsroot/radmind/radmind/repo.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** repo.c 13 Dec 2007 22:56:12 -0000 1.13 --- repo.c 14 Dec 2007 18:52:22 -0000 1.14 *************** *** 52,56 **** extern int optind; unsigned short port = 0; - struct servent *se; char *host = _RADMIND_HOST; char *event = NULL; --- 52,55 ---- Index: ktcheck.c =================================================================== RCS file: /cvsroot/radmind/radmind/ktcheck.c,v retrieving revision 1.129 retrieving revision 1.130 diff -C2 -d -r1.129 -r1.130 *** ktcheck.c 13 Dec 2007 22:56:12 -0000 1.129 --- ktcheck.c 14 Dec 2007 18:52:22 -0000 1.130 *************** *** 559,563 **** char path[ MAXPATHLEN ]; char tempfile[ MAXPATHLEN ]; - struct servent *se; char **capa = NULL; /* capabilities */ --- 559,562 ---- |
|
From: Andrew M. <fit...@us...> - 2007-12-13 22:56:17
|
Update of /cvsroot/radmind/radmind In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6298 Modified Files: connect.c connect.h ktcheck.c lapply.c lcreate.c lfdiff.c repo.c Log Message: Improved port handling. Index: connect.c =================================================================== RCS file: /cvsroot/radmind/radmind/connect.c,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** connect.c 16 Nov 2007 19:22:08 -0000 1.30 --- connect.c 13 Dec 2007 22:56:12 -0000 1.31 *************** *** 98,111 **** SNET * ! connectsn( char *host, int port ) { int i; struct hostent *he; struct sockaddr_in sin; SNET *sn = NULL; memset( &sin, 0, sizeof( struct sockaddr_in )); sin.sin_family = AF_INET; ! sin.sin_port = port; #ifdef notdef --- 98,119 ---- SNET * ! connectsn( char *host, unsigned short port ) { int i; struct hostent *he; struct sockaddr_in sin; + struct servent *se; SNET *sn = NULL; memset( &sin, 0, sizeof( struct sockaddr_in )); sin.sin_family = AF_INET; ! if (( sin.sin_port = port ) == 0 ) { ! /* maybe radmind's in /etc/services. if not, use default. */ ! if (( se = getservbyname( "radmind", "tcp" )) != NULL ) { ! sin.sin_port = htons( se->s_port ); ! } else { ! sin.sin_port = htons( RADMIND_IANA_PORT ); ! } ! } #ifdef notdef *************** *** 135,140 **** * legacy port if the new port connection fails. */ ! if (( sn = connectsn2( &sin )) == NULL ! && port == htons( RADMIND_IANA_PORT )) { /* try connecting to old non-IANA registered port */ sin.sin_port = htons( RADMIND_LEGACY_PORT ); --- 143,147 ---- * legacy port if the new port connection fails. */ ! if (( sn = connectsn2( &sin )) == NULL && port == 0 ) { /* try connecting to old non-IANA registered port */ sin.sin_port = htons( RADMIND_LEGACY_PORT ); Index: connect.h =================================================================== RCS file: /cvsroot/radmind/radmind/connect.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** connect.h 28 Dec 2006 16:07:18 -0000 1.14 --- connect.h 13 Dec 2007 22:56:12 -0000 1.15 *************** *** 4,8 **** */ ! SNET * connectsn( char *host, int port ); int closesn( SNET *sn ); char **get_capabilities( SNET * ); --- 4,8 ---- */ ! SNET * connectsn( char *host, unsigned short port ); int closesn( SNET *sn ); char **get_capabilities( SNET * ); Index: lcreate.c =================================================================== RCS file: /cvsroot/radmind/radmind/lcreate.c,v retrieving revision 1.90 retrieving revision 1.91 diff -C2 -d -r1.90 -r1.91 *** lcreate.c 28 Nov 2007 21:31:03 -0000 1.90 --- lcreate.c 13 Dec 2007 22:56:12 -0000 1.91 *************** *** 73,80 **** main( int argc, char **argv ) { ! int c, err = 0, port = htons( 6222 ), tac; int network = 1, len = 0, rc; int negative = 0, tran_only = 0; int respcount = 0; extern int optind; struct servent *se; --- 73,81 ---- main( int argc, char **argv ) { ! int c, err = 0, tac; int network = 1, len = 0, rc; int negative = 0, tran_only = 0; int respcount = 0; + unsigned short port = 0; extern int optind; struct servent *se; *************** *** 140,150 **** 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; --- 141,146 ---- case 'p': ! /* connect.c handles things if atoi returns 0 */ ! port = htons( atoi( optarg )); break; Index: repo.c =================================================================== RCS file: /cvsroot/radmind/radmind/repo.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** repo.c 28 Nov 2007 21:31:03 -0000 1.12 --- repo.c 13 Dec 2007 22:56:12 -0000 1.13 *************** *** 47,55 **** { SNET *sn; ! int c, port = htons( 6222 ); ! int i = 0, err = 0, len; int authlevel = _RADMIND_AUTHLEVEL; int use_randfile = 0; extern int optind; struct servent *se; char *host = _RADMIND_HOST; --- 47,55 ---- { SNET *sn; ! int c, i = 0, err = 0, len; int authlevel = _RADMIND_AUTHLEVEL; int use_randfile = 0; extern int optind; + unsigned short port = 0; struct servent *se; char *host = _RADMIND_HOST; *************** *** 69,79 **** 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; --- 69,74 ---- case 'p': ! /* connect.c handles things if atoi returns 0 */ ! port = htons( atoi( optarg )); break; Index: ktcheck.c =================================================================== RCS file: /cvsroot/radmind/radmind/ktcheck.c,v retrieving revision 1.128 retrieving revision 1.129 diff -C2 -d -r1.128 -r1.129 *** ktcheck.c 28 Nov 2007 21:31:03 -0000 1.128 --- ktcheck.c 13 Dec 2007 22:56:12 -0000 1.129 *************** *** 547,554 **** main( int argc, char **argv ) { ! int c, port = htons( 6222 ), err = 0; int authlevel = _RADMIND_AUTHLEVEL; int use_randfile = 0; int clean = 0; char lcksum[ SZ_BASE64_E( EVP_MAX_MD_SIZE ) ]; char tcksum[ SZ_BASE64_E( EVP_MAX_MD_SIZE ) ]; --- 547,555 ---- main( int argc, char **argv ) { ! int c, err = 0; int authlevel = _RADMIND_AUTHLEVEL; int use_randfile = 0; int clean = 0; + unsigned short port = 0; char lcksum[ SZ_BASE64_E( EVP_MAX_MD_SIZE ) ]; char tcksum[ SZ_BASE64_E( EVP_MAX_MD_SIZE ) ]; *************** *** 599,609 **** 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; --- 600,605 ---- case 'p': ! /* connect.c handles things if atoi returns 0 */ ! port = htons( atoi( optarg )); break; Index: lapply.c =================================================================== RCS file: /cvsroot/radmind/radmind/lapply.c,v retrieving revision 1.142 retrieving revision 1.143 diff -C2 -d -r1.142 -r1.143 *** lapply.c 28 Nov 2007 21:31:03 -0000 1.142 --- lapply.c 13 Dec 2007 22:56:12 -0000 1.143 *************** *** 231,235 **** main( int argc, char **argv ) { ! int c, port = htons( 6222 ), err = 0; extern int optind; FILE *f = NULL; --- 231,236 ---- main( int argc, char **argv ) { ! int c, err = 0; ! unsigned short port = 0; extern int optind; FILE *f = NULL; *************** *** 295,305 **** 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; --- 296,301 ---- case 'p': ! /* connect.c handles things if atoi returns 0 */ ! port = htons( atoi( optarg )); break; Index: lfdiff.c =================================================================== RCS file: /cvsroot/radmind/radmind/lfdiff.c,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** lfdiff.c 28 Nov 2007 21:31:03 -0000 1.63 --- lfdiff.c 13 Dec 2007 22:56:12 -0000 1.64 *************** *** 114,120 **** main( int argc, char **argv, char **envp ) { ! int c, i, tac, port = htons( 6222 ), err = 0; int special = 0, diffargc = 0; int fd; extern int optind; extern char *version; --- 114,121 ---- main( int argc, char **argv, char **envp ) { ! int c, i, tac, err = 0; int special = 0, diffargc = 0; int fd; + unsigned short port = 0; extern int optind; extern char *version; *************** *** 162,172 **** 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; --- 163,168 ---- case 'p': ! /* connect.c handles things if atoi returns 0 */ ! port = htons( atoi( optarg )); break; |
|
From: Andrew M. <fit...@us...> - 2007-12-10 16:57:15
|
Update of /cvsroot/radmind/radmind In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30383 Modified Files: transcript.c Log Message: Shouldn't call transcript_parse at all after excluding. Index: transcript.c =================================================================== RCS file: /cvsroot/radmind/radmind/transcript.c,v retrieving revision 1.122 retrieving revision 1.123 diff -C2 -d -r1.122 -r1.123 *** transcript.c 7 Dec 2007 15:33:26 -0000 1.122 --- transcript.c 10 Dec 2007 16:57:04 -0000 1.123 *************** *** 662,669 **** /* move the transcripts ahead */ tran = transcript_select(); - if ( !tran->t_eof ) { - /* only move ahead if we haven't exhausted transcripts */ - transcript_parse( tran ); - } return( 0 ); --- 662,665 ---- |
|
From: Andrew M. <fit...@us...> - 2007-12-07 15:33:29
|
Update of /cvsroot/radmind/radmind In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4409 Modified Files: transcript.c Log Message: When excluding, only move transcript ahead if we're not at t_eof. Index: transcript.c =================================================================== RCS file: /cvsroot/radmind/radmind/transcript.c,v retrieving revision 1.121 retrieving revision 1.122 diff -C2 -d -r1.121 -r1.122 *** transcript.c 3 Nov 2007 15:25:45 -0000 1.121 --- transcript.c 7 Dec 2007 15:33:26 -0000 1.122 *************** *** 662,666 **** /* move the transcripts ahead */ tran = transcript_select(); ! transcript_parse( tran ); return( 0 ); --- 662,669 ---- /* move the transcripts ahead */ tran = transcript_select(); ! if ( !tran->t_eof ) { ! /* only move ahead if we haven't exhausted transcripts */ ! transcript_parse( tran ); ! } return( 0 ); |
|
From: Andrew M. <fit...@us...> - 2007-12-06 21:58:48
|
Update of /cvsroot/radmind/radmind-assistant/rsm/rsm.xcodeproj In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12515 Modified Files: project.pbxproj Log Message: Xcode projects can be ratty. Index: project.pbxproj =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rsm/rsm.xcodeproj/project.pbxproj,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** project.pbxproj 16 Oct 2006 19:33:22 -0000 1.10 --- project.pbxproj 6 Dec 2007 21:58:40 -0000 1.11 *************** *** 134,138 **** containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; proxyType = 1; ! remoteGlobalIDString = 09EFC1B9099CE3A900A7D599 /* rsmauthtool */; remoteInfo = rsmauthtool; }; --- 134,138 ---- containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; proxyType = 1; ! remoteGlobalIDString = 09EFC1B9099CE3A900A7D599; remoteInfo = rsmauthtool; }; |
|
From: Andrew M. <fit...@us...> - 2007-12-06 21:58:11
|
Update of /cvsroot/radmind/radmind-assistant/rsm/English.lproj/Preferences.nib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11728/Preferences.nib Modified Files: info.nib keyedobjects.nib Log Message: Client name is no longer bound to a popup button's list. Index: info.nib =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rsm/English.lproj/Preferences.nib/info.nib,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** info.nib 3 Jun 2007 03:30:24 -0000 1.10 --- info.nib 6 Dec 2007 21:58:07 -0000 1.11 *************** *** 9,17 **** <key>IBOpenObjects</key> <array> - <integer>58</integer> <integer>6</integer> </array> <key>IBSystem Version</key> ! <string>8P2137</string> </dict> </plist> --- 9,17 ---- <key>IBOpenObjects</key> <array> <integer>6</integer> + <integer>58</integer> </array> <key>IBSystem Version</key> ! <string>8S2167</string> </dict> </plist> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rsm/English.lproj/Preferences.nib/keyedobjects.nib,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 Binary files /tmp/cvsZPoWlr and /tmp/cvs3rsceH differ |
|
From: Andrew M. <fit...@us...> - 2007-12-06 21:58:10
|
Update of /cvsroot/radmind/radmind-assistant/rsm/English.lproj/MainMenu.nib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11728/MainMenu.nib Modified Files: classes.nib info.nib objects.nib Log Message: Client name is no longer bound to a popup button's list. Index: info.nib =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rsm/English.lproj/MainMenu.nib/info.nib,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** info.nib 3 Jun 2007 03:30:23 -0000 1.10 --- info.nib 6 Dec 2007 21:58:07 -0000 1.11 *************** *** 26,38 **** <key>IBOpenObjects</key> <array> - <integer>29</integer> - <integer>240</integer> - <integer>284</integer> <integer>567</integer> <integer>211</integer> <integer>294</integer> </array> <key>IBSystem Version</key> ! <string>8P2137</string> </dict> </plist> --- 26,39 ---- <key>IBOpenObjects</key> <array> <integer>567</integer> <integer>211</integer> + <integer>240</integer> <integer>294</integer> + <integer>463</integer> + <integer>284</integer> + <integer>29</integer> </array> <key>IBSystem Version</key> ! <string>8S2167</string> </dict> </plist> Index: objects.nib =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rsm/English.lproj/MainMenu.nib/objects.nib,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 Binary files /tmp/cvsYNypgj and /tmp/cvsUW1POy differ Index: classes.nib =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rsm/English.lproj/MainMenu.nib/classes.nib,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** classes.nib 5 Apr 2005 20:11:49 -0000 1.4 --- classes.nib 6 Dec 2007 21:58:07 -0000 1.5 *************** *** 46,50 **** newCommandFileSheet = NSPanel; serverController = RAServerController; ! specialClientPopUp = NSPopUpButton; specialSheet = NSPanel; specialTranscriptPopUp = NSPopUpButton; --- 46,50 ---- newCommandFileSheet = NSPanel; serverController = RAServerController; ! specialClientName = NSTextField; specialSheet = NSPanel; specialTranscriptPopUp = NSPopUpButton; |
|
From: Andrew M. <fit...@us...> - 2007-12-06 21:56:49
|
Update of /cvsroot/radmind/radmind-assistant/rsm In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11201 Modified Files: addspecial.c Log Message: Report line number when line too long. Index: addspecial.c =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rsm/addspecial.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** addspecial.c 8 Apr 2005 14:02:20 -0000 1.6 --- addspecial.c 6 Dec 2007 21:56:23 -0000 1.7 *************** *** 222,225 **** --- 222,226 ---- char **col; int colcount; + int linenum = 0; struct slist *head = NULL, *new = NULL; *************** *** 254,259 **** int len = strlen( buf ); if ( buf[ len - 1 ] != '\n' ) { ! fprintf( stderr, "%s: line too long\n", loadset ); ( void )fclose( f ); exit( 2 ); --- 255,262 ---- int len = strlen( buf ); + linenum++; + if ( buf[ len - 1 ] != '\n' ) { ! fprintf( stderr, "%s: line %d: line too long\n", linenum, loadset ); ( void )fclose( f ); exit( 2 ); |
|
From: Andrew M. <fit...@us...> - 2007-12-06 21:54:24
|
Update of /cvsroot/radmind/radmind-assistant/rsm In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6131 Modified Files: RSMLoadsetEditor.h RSMLoadsetEditor.m Log Message: Just use a text field for special client names. Index: RSMLoadsetEditor.h =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rsm/RSMLoadsetEditor.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** RSMLoadsetEditor.h 3 Jun 2007 03:23:39 -0000 1.8 --- RSMLoadsetEditor.h 6 Dec 2007 21:54:19 -0000 1.9 *************** *** 45,49 **** IBOutlet NSPanel *specialSheet; IBOutlet NSPopUpButton *specialTranscriptPopUp; ! IBOutlet NSPopUpButton *specialClientPopUp; @private --- 45,49 ---- IBOutlet NSPanel *specialSheet; IBOutlet NSPopUpButton *specialTranscriptPopUp; ! IBOutlet NSTextField *specialClientName; @private Index: RSMLoadsetEditor.m =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rsm/RSMLoadsetEditor.m,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** RSMLoadsetEditor.m 4 Dec 2007 22:07:57 -0000 1.20 --- RSMLoadsetEditor.m 6 Dec 2007 21:54:19 -0000 1.21 *************** *** 693,697 **** - ( void )addSpecialFileToCurrentCommandFile: ( id )sender { ! NSArray *clients = nil, *loadsets = nil; unsigned int i; --- 693,697 ---- - ( void )addSpecialFileToCurrentCommandFile: ( id )sender { ! NSArray *loadsets = nil; unsigned int i; *************** *** 707,716 **** } - [ specialClientPopUp removeAllItems ]; - if (( clients = [[ self delegate ] validClients ] ) == nil ) { - return; - } - [ specialClientPopUp addItemsWithTitles: clients ]; - [ NSApp beginSheet: specialSheet modalForWindow: loadsetWindow --- 707,710 ---- *************** *** 723,727 **** { NSString *specialTranscript = [ specialTranscriptPopUp titleOfSelectedItem ]; ! NSString *clientName = [ specialClientPopUp titleOfSelectedItem ]; [ specialSheet orderOut: nil ]; --- 717,726 ---- { NSString *specialTranscript = [ specialTranscriptPopUp titleOfSelectedItem ]; ! NSString *clientName = [ specialClientName stringValue ]; ! ! if ( !clientName || [ clientName length ] == 0 ) { ! NSBeep(); ! return; ! } [ specialSheet orderOut: nil ]; |
|
From: Andrew M. <fit...@us...> - 2007-12-06 21:43:23
|
Update of /cvsroot/radmind/radmind-assistant/rsm In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5732 Modified Files: RAServerController.h RAServerController.m Log Message: Use current API to remove selected lines from an array. Got rid of _validClients and related accessors. Index: RAServerController.h =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rsm/RAServerController.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RAServerController.h 5 Apr 2005 19:55:16 -0000 1.5 --- RAServerController.h 6 Dec 2007 21:43:18 -0000 1.6 *************** *** 32,42 **** IBOutlet RSMLoadsetManager *loadsetManager; @private RAServerAuth *sa; RSMPreferences *prefs; - NSMutableArray *serverConfig; NSArray *_allCommandFiles; BOOL _isConfigFileEdited; - NSMutableArray *_validClients; int dragOriginRow; int _rsmThreadID; --- 32,42 ---- IBOutlet RSMLoadsetManager *loadsetManager; + NSMutableArray *serverConfig; + @private RAServerAuth *sa; RSMPreferences *prefs; NSArray *_allCommandFiles; BOOL _isConfigFileEdited; int dragOriginRow; int _rsmThreadID; *************** *** 67,74 **** - ( NSArray * )availableCommandFiles; - - ( NSArray * )validClients; - - ( void )addToValidClients: ( NSString * )client; - - ( void )removeFromValidClients: ( NSString * )client; - - ( void )setSessionTmpDirectory: ( NSString * )tmpdir; - ( NSString * )sessionTmpDirectory; --- 67,70 ---- Index: RAServerController.m =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rsm/RAServerController.m,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** RAServerController.m 3 Jun 2007 03:20:47 -0000 1.20 --- RAServerController.m 6 Dec 2007 21:43:18 -0000 1.21 *************** *** 55,59 **** serverConfig = nil; _allCommandFiles = nil; - _validClients = nil; _rsmTmpDirectory = nil; prefs = nil; --- 55,58 ---- *************** *** 117,143 **** } - - ( NSArray * )validClients - { - return( _validClients ); - } - - - ( void )addToValidClients: ( NSString * )client - { - if ( _validClients == nil ) { - _validClients = [[ NSMutableArray alloc ] init ]; - } - - if ( ! [ _validClients containsObject: client ] ) { - [ _validClients addObject: client ]; - } - } - - - ( void )removeFromValidClients: ( NSString * )client - { - if ( [ _validClients containsObject: client ] ) { - [ _validClients removeObject: client ]; - } - } - - ( void )setSessionTmpDirectory: ( NSString * )tmpdir { --- 116,119 ---- *************** *** 397,427 **** - ( IBAction )deleteClientFromConfigFile: ( id )sender { ! NSEnumerator *lineEnumerator = nil; ! NSNumber *lineNumber = nil; ! int count = [ hostsTable numberOfSelectedRows ]; ! unsigned int *lines = NULL, i = 0; ! ! if ( count == 0 ) { ! NSBeep(); ! return; ! } ! ! if (( lines = calloc( count, sizeof( int ))) == NULL ) { ! NSLog( @"malloc: %s", strerror( errno )); ! exit( 2 ); ! } ! ! lineEnumerator = [ hostsTable selectedRowEnumerator ]; ! while (( lineNumber = [ lineEnumerator nextObject ] ) != nil ) { ! lines[ i ] = [ lineNumber intValue ]; ! [ self removeFromValidClients: ! [[ serverConfig objectAtIndex: i ] objectForKey: @"host" ]]; ! i++; } ! [ hostsTable selectRow: *lines byExtendingSelection: NO ]; ! [ serverConfig removeObjectsFromIndices: lines numIndices: count ]; ! free( lines ); [ hostsTable reloadData ]; --- 373,389 ---- - ( IBAction )deleteClientFromConfigFile: ( id )sender { ! NSIndexSet *indexes; ! indexes = [ hostsTable selectedRowIndexes ]; ! if ( [ indexes count ] <= 0 ) { ! NSBeep(); ! return; } ! /* leave the topmost line selected, if possible */ ! [ hostsTable selectRowIndexes: ! [ NSIndexSet indexSetWithIndex: [ indexes firstIndex ]] ! byExtendingSelection: NO ]; ! [ serverConfig removeObjectsAtIndexes: indexes ]; [ hostsTable reloadData ]; *************** *** 657,661 **** [ NSString stringWithUTF8String: targv[ 0 ]], @"host", [ NSString stringWithUTF8String: targv[ 1 ]], @"kfile", nil ]]; - [ self addToValidClients: [ NSString stringWithUTF8String: targv[ 0 ]]]; } else if ( *line == '#' ) { /* display comments */ --- 619,622 ---- *************** *** 847,851 **** [ dict setObject: newstring forKey: @"host" ]; [ serverConfig replaceObjectAtIndex: row withObject: dict ]; - [ self addToValidClients: newstring ]; [ self setConfigFileEdited: YES ]; } --- 808,811 ---- *************** *** 928,933 **** } - [ self removeFromValidClients: old ]; - [ self addToValidClients: theObject ]; [[ serverConfig objectAtIndex: rowIndex ] setObject: theObject forKey: @"host" ]; --- 888,891 ---- |
|
From: Andrew M. <fit...@us...> - 2007-12-04 22:08:07
|
Update of /cvsroot/radmind/radmind-assistant/rsm In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28573 Modified Files: RSMLoadsetEditor.m Log Message: Support for exclude lines and minus entries in command files. Index: RSMLoadsetEditor.m =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rsm/RSMLoadsetEditor.m,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** RSMLoadsetEditor.m 3 Jun 2007 03:23:39 -0000 1.19 --- RSMLoadsetEditor.m 4 Dec 2007 22:07:57 -0000 1.20 *************** *** 22,25 **** --- 22,26 ---- #define RSMLEToolbarDeleteCommandFileEntryIdentifier @"rsmledeleteentry" #define RSMLEToolbarNewFolderIdentifier @"RSMLENewFolder" + #define RSMLEToolbarAddExcludeIdentifier @"RSMLEAddExclude" #define RSMLECommandFileLinePboardType @"RSMLECommandFileLine" *************** *** 137,140 **** --- 138,143 ---- [ self setupKFileEntryTypePopups ]; [ self setupCommandFileNameCells ]; + + [ currentKFileTable setTarget: self ]; [ currentKFileTable setDrawsStripes: YES ]; [ currentKFileTable setRowHeight: 22.0 ]; *************** *** 235,240 **** } else if ( [ itemIdent isEqualToString: RSMLEToolbarNewSpecialFileEntryIdentifier ] ) { ! [ tbarItem setLabel: @"Add Special Entry" ]; ! [ tbarItem setPaletteLabel: @"Add Special Entry" ]; [ tbarItem setToolTip: @"Add special file to command file" ]; [ tbarItem setImage: [ NSImage imageNamed: @"addspecial.png" ]]; --- 238,243 ---- } else if ( [ itemIdent isEqualToString: RSMLEToolbarNewSpecialFileEntryIdentifier ] ) { ! [ tbarItem setLabel: @"Add Special File" ]; ! [ tbarItem setPaletteLabel: @"Add Special File" ]; [ tbarItem setToolTip: @"Add special file to command file" ]; [ tbarItem setImage: [ NSImage imageNamed: @"addspecial.png" ]]; *************** *** 243,249 **** } else if ( [ itemIdent isEqualToString: RSMLEToolbarDeleteCommandFileEntryIdentifier ] ) { ! [ tbarItem setLabel: @"Delete Entry" ]; ! [ tbarItem setPaletteLabel: @"Delete Entry" ]; ! [ tbarItem setToolTip: @"Delete entry from command file" ]; [ tbarItem setImage: [ NSImage imageNamed: @"deletekfile.png" ]]; [ tbarItem setAction: @selector( deleteCommandFileEntry: ) ]; --- 246,252 ---- } else if ( [ itemIdent isEqualToString: RSMLEToolbarDeleteCommandFileEntryIdentifier ] ) { ! [ tbarItem setLabel: @"Delete Line" ]; ! [ tbarItem setPaletteLabel: @"Delete Line" ]; ! [ tbarItem setToolTip: @"Delete selected line from command file" ]; [ tbarItem setImage: [ NSImage imageNamed: @"deletekfile.png" ]]; [ tbarItem setAction: @selector( deleteCommandFileEntry: ) ]; *************** *** 257,260 **** --- 260,271 ---- [ tbarItem setAction: @selector( getNewSubdirectorySheet: ) ]; [ tbarItem setTarget: self ]; + } else if ( [ itemIdent isEqualToString: + RSMLEToolbarAddExcludeIdentifier ] ) { + [ tbarItem setLabel: @"New Exclude" ]; + [ tbarItem setPaletteLabel: @"New Exclude" ]; + [ tbarItem setToolTip: @"Add an exclude pattern to the command file" ]; + [ tbarItem setImage: [ NSImage imageNamed: @"deletekfile.png" ]]; + [ tbarItem setAction: @selector( addExcludeToCommandFile: ) ]; + [ tbarItem setTarget: self ]; } *************** *** 277,280 **** --- 288,293 ---- [[ tItem itemIdentifier ] isEqualToString: RSMLEToolbarDeleteCommandFileIdentifier ] || + [[ tItem itemIdentifier ] isEqualToString: + RSMLEToolbarAddExcludeIdentifier ] || [[ tItem itemIdentifier ] isEqualToString: RSMLEToolbarDeleteCommandFileEntryIdentifier ] ) { *************** *** 307,310 **** --- 320,324 ---- NSToolbarSeparatorItemIdentifier, RSMLEToolbarSaveCommandFileIdentifier, + RSMLEToolbarAddExcludeIdentifier, RSMLEToolbarNewSpecialFileEntryIdentifier, RSMLEToolbarDeleteCommandFileEntryIdentifier, *************** *** 326,330 **** RSMLEToolbarNewSpecialFileEntryIdentifier, RSMLEToolbarDeleteCommandFileEntryIdentifier, ! RSMLEToolbarNewFolderIdentifier, nil ]; return( tmp ); --- 340,345 ---- RSMLEToolbarNewSpecialFileEntryIdentifier, RSMLEToolbarDeleteCommandFileEntryIdentifier, ! RSMLEToolbarNewFolderIdentifier, ! RSMLEToolbarAddExcludeIdentifier, nil ]; return( tmp ); *************** *** 556,563 **** NSTableColumn *kColumn = [ currentKFileTable tableColumnWithIdentifier: @"type" ]; ! [ protoCell insertItemWithTitle: @"p" atIndex: 0 ]; ! [ protoCell insertItemWithTitle: @"n" atIndex: 1 ]; ! [ protoCell insertItemWithTitle: @"s" atIndex: 2 ]; ! [ protoCell insertItemWithTitle: @"k" atIndex: 3 ]; [ protoCell setEditable: YES ]; --- 571,581 ---- NSTableColumn *kColumn = [ currentKFileTable tableColumnWithIdentifier: @"type" ]; ! [ protoCell addItemsWithTitles: ! [ NSArray arrayWithObjects: @"p", /* positive */ ! @"n", /* negative */ ! @"s", /* special */ ! @"x", /* exclude */ ! @"k", /* command file */ ! nil ]]; [ protoCell setEditable: YES ]; *************** *** 574,579 **** NSTableColumn *kColumn = [ currentKFileTable tableColumnWithIdentifier: @"minus" ]; ! [ protoCell insertItemWithTitle: @" " atIndex: 0 ]; ! [ protoCell insertItemWithTitle: @"-" atIndex: 1 ]; [ protoCell setEditable: YES ]; --- 592,597 ---- NSTableColumn *kColumn = [ currentKFileTable tableColumnWithIdentifier: @"minus" ]; ! [ protoCell addItemsWithTitles: ! [ NSArray arrayWithObjects: @" ", @"-", nil ]]; [ protoCell setEditable: YES ]; *************** *** 646,649 **** --- 664,694 ---- } + - ( IBAction )addExcludeToCommandFile: ( id )sender + { + int row; + id cell, column; + + row = [ currentKFileTable selectedRow ]; + if ( row < 0 ) { + row = 0; + } + [ _currentCommandFile insertObject: [ NSMutableDictionary + dictionaryWithObjectsAndKeys: @"x", @"type", + @"NEW_EXCLUDE_PATTERN", @"tname", nil ] + atIndex: row ]; + [ currentKFileTable reloadData ]; + + column = [[ currentKFileTable tableColumns ] objectAtIndex: 2 ]; + cell = [ column dataCellForRow: row ]; + [ cell setEditable: YES ]; + [ cell setScrollable: YES ]; + + [ currentKFileTable selectRow: row byExtendingSelection: NO ]; + [ currentKFileTable editColumn: 2 row: row + withEvent: nil + select: YES ]; + [ self setCommandFileEdited: YES ]; + } + - ( void )addSpecialFileToCurrentCommandFile: ( id )sender { *************** *** 914,917 **** --- 959,963 ---- case 'p': case 's': + case 'x': case 'k': kLine = [ NSMutableDictionary dictionaryWithObjectsAndKeys: *************** *** 1022,1025 **** --- 1068,1072 ---- NSArray *items; NSString *newPath, *oldPath; + NSString *newstring = [ text copy ]; NSRange range; id item; *************** *** 1030,1060 **** } ! if ( ! [ table isKindOfClass: [ NSOutlineView class ]] ) { ! return; ! } ! ! /* if there's a path separator in the new string, fail */ ! range = [ text rangeOfString: @"/" ]; ! if ( range.location != NSNotFound ) { ! NSBeep(); ! return; ! } ! ! items = _allCommandFiles; ! ! if ( row >= [ items count ] ) { ! return; ! } ! ! item = [ table itemAtRow: row ]; ! if ( ! [ item isKindOfClass: [ NSDictionary class ]] ) { ! return; } - - oldPath = [ item objectForKey: @"RadmindServerItemPath" ]; - newPath = [ NSString stringWithFormat: @"%@/%@", - [ oldPath stringByDeletingLastPathComponent ], text ]; - - [ self moveCommandFileAtPath: oldPath toPath: newPath ]; } --- 1077,1120 ---- } ! if ( [ table isEqual: allCommandFilesTable ] ) { ! /* if there's a path separator in the new string, fail */ ! range = [ text rangeOfString: @"/" ]; ! if ( range.location != NSNotFound ) { ! NSBeep(); ! return; ! } ! ! items = _allCommandFiles; ! ! if ( row >= [ items count ] ) { ! return; ! } ! ! item = [ table itemAtRow: row ]; ! if ( ![ item isKindOfClass: [ NSDictionary class ]] ) { ! return; ! } ! ! oldPath = [ item objectForKey: @"RadmindServerItemPath" ]; ! newPath = [ NSString stringWithFormat: @"%@/%@", ! [ oldPath stringByDeletingLastPathComponent ], text ]; ! ! [ self moveCommandFileAtPath: oldPath toPath: newPath ]; ! } else if ( [ table isEqual: currentKFileTable ] ) { ! items = _currentCommandFile; ! if ( row >= [ items count ] ) { ! return; ! } ! ! item = [ items objectAtIndex: row ]; ! if ( ![ item isKindOfClass: [ NSDictionary class ]] ) { ! return; ! } ! ! [ item setObject: newstring forKey: @"tname" ]; ! [ newstring release ]; ! [ self setCommandFileEdited: YES ]; ! [ currentKFileTable reloadData ]; } } *************** *** 1084,1088 **** [ aCell setStringValue: [ obj objectForKey: @"tname" ]]; - [ aCell setEditable: NO ]; } else if ( [[ column identifier ] isEqualToString: @"type" ] ) { [ aCell setEnabled: YES ]; --- 1144,1147 ---- *************** *** 1113,1117 **** --- 1172,1178 ---- forTableColumn: ( NSTableColumn * )tableColumn row: ( int )row { + NSString *old, *new; id item; + int index; if ( row < 0 ) return; *************** *** 1120,1128 **** if ( [[ tableColumn identifier ] isEqualToString: @"type" ] ) { ! int index = [ object intValue ]; ! NSString *oldtype = [ item objectForKey: @"type" ]; ! NSString *newtype; ! if ( [ oldtype characterAtIndex: 0 ] == 's' ) { NSBeep(); return; --- 1181,1188 ---- if ( [[ tableColumn identifier ] isEqualToString: @"type" ] ) { ! index = [ object intValue ]; ! old = [ item objectForKey: @"type" ]; ! if ( [ old characterAtIndex: 0 ] == 's' ) { NSBeep(); return; *************** *** 1132,1156 **** default: case 0: ! newtype = @"p"; break; case 1: ! newtype = @"n"; break; case 2: - /* don't let users set type to special. make them use the button */ - return; case 3: ! newtype = @"k"; break; } ! if ( ! [ newtype isEqualToString: oldtype ] ) { ! [ item setObject: newtype forKey: @"type" ]; [ self setCommandFileEdited: YES ]; } } else if ( [[ tableColumn identifier ] isEqualToString: @"minus" ] ) { ! int index = [ object intValue ]; ! NSString *old = [ item objectForKey: @"minus" ]; ! NSString *new; switch ( index ) { --- 1192,1216 ---- default: case 0: ! new = @"p"; break; case 1: ! new = @"n"; break; case 2: case 3: ! /* specials and excludes require different steps. */ ! return; ! case 4: ! new = @"k"; break; } ! if ( ! [ new isEqualToString: old ] ) { ! [ item setObject: new forKey: @"type" ]; [ self setCommandFileEdited: YES ]; } } else if ( [[ tableColumn identifier ] isEqualToString: @"minus" ] ) { ! index = [ object intValue ]; ! old = [ item objectForKey: @"minus" ]; switch ( index ) { *************** *** 1181,1185 **** row: ( int )rowIndex { ! if ( [ aTableView editedRow ] >= 0 ) return( YES ); return( NO ); } --- 1241,1247 ---- row: ( int )rowIndex { ! if ( [ aTableView editedRow ] >= 0 ) { ! return( YES ); ! } return( NO ); } |
|
From: Andrew M. <fit...@us...> - 2007-12-02 15:36:09
|
Update of /cvsroot/radmind/radmind In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1291 Modified Files: lcksum.c Log Message: [ Bug 1839610 ]: lcksum fails with -a and missing files. Restored -a functionality. Improved some error messages. Cleaned up some formatting. Index: lcksum.c =================================================================== RCS file: /cvsroot/radmind/radmind/lcksum.c,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** lcksum.c 1 Aug 2006 20:13:38 -0000 1.76 --- lcksum.c 2 Dec 2007 15:36:04 -0000 1.77 *************** *** 65,70 **** rr = read( afd, &header, AS_HEADERLEN ); if ( rr < 0 ) { ! perror( "read" ); ! exit( 2 ); } --- 65,70 ---- rr = read( afd, &header, AS_HEADERLEN ); if ( rr < 0 ) { ! fprintf( stderr, "%s: read failed: %s\n", applefile, strerror( errno )); ! return( -1 ); } *************** *** 78,83 **** rr = read( afd, &as_ents, ( 3 * sizeof( struct as_entry ))); if ( rr < 0 ) { ! perror( "read" ); ! exit( 2 ); } if ( rr != ( 3 * sizeof( struct as_entry ))) { --- 78,83 ---- rr = read( afd, &as_ents, ( 3 * sizeof( struct as_entry ))); if ( rr < 0 ) { ! fprintf( stderr, "%s: read failed: %s\n", applefile, strerror( errno )); ! return( -1 ); } if ( rr != ( 3 * sizeof( struct as_entry ))) { *************** *** 252,260 **** if (( tline[ len - 1 ] ) != '\n' ) { fprintf( stderr, "%s: %d: line too long\n", tpath, linenum); ! exitval = 1; ! goto done; } /* save transcript line -- must free */ ! if ( ( line = strdup( tline ) ) == NULL ) { perror( "strdup" ); cleanup( updatetran, upath ); --- 252,259 ---- if (( tline[ len - 1 ] ) != '\n' ) { fprintf( stderr, "%s: %d: line too long\n", tpath, linenum); ! goto badline; } /* save transcript line -- must free */ ! if (( line = strdup( tline )) == NULL ) { perror( "strdup" ); cleanup( updatetran, upath ); *************** *** 273,278 **** if ( tac == 1 ) { fprintf( stderr, "line %d: invalid transcript line\n", linenum ); ! exitval = 1; ! goto done; } --- 272,276 ---- if ( tac == 1 ) { fprintf( stderr, "line %d: invalid transcript line\n", linenum ); ! goto badline; } *************** *** 286,296 **** if (( d_path = decode( targv[ 1 ] )) == NULL ) { fprintf( stderr, "line %d: path too long\n", linenum ); ! exitval = 1; ! goto done; } if ( strlen( d_path ) >= MAXPATHLEN ) { fprintf( stderr, "line %d: path too long\n", linenum ); ! exitval = 1; ! goto done; } strcpy( path, d_path ); --- 284,292 ---- if (( d_path = decode( targv[ 1 ] )) == NULL ) { fprintf( stderr, "line %d: path too long\n", linenum ); ! goto badline; } if ( strlen( d_path ) >= MAXPATHLEN ) { fprintf( stderr, "line %d: path too long\n", linenum ); ! goto badline; } strcpy( path, d_path ); *************** *** 315,324 **** if ( prepath != 0 ) { if ( pathcasecmp( path, prepath, case_sensitive ) < 0 ) { ! if ( updatetran ) { ! fprintf( stderr, "line %d: bad sort order\n", linenum ); ! } else { ! fprintf( stderr, ! "line %d: bad sort order. Not continuing.\n", linenum ); ! } cleanup( updatetran, upath ); exit( 2 ); --- 311,315 ---- if ( prepath != 0 ) { if ( pathcasecmp( path, prepath, case_sensitive ) < 0 ) { ! fprintf( stderr, "line %d: bad sort order\n", linenum ); cleanup( updatetran, upath ); exit( 2 ); *************** *** 328,333 **** if ( strlen( path ) >= MAXPATHLEN ) { fprintf( stderr, "line %d: path too long\n", linenum ); ! exitval = 1; ! goto done; } strcpy( prepath, path ); --- 319,323 ---- if ( strlen( path ) >= MAXPATHLEN ) { fprintf( stderr, "line %d: path too long\n", linenum ); ! goto badline; } strcpy( prepath, path ); *************** *** 344,357 **** fprintf( stderr, "line %d: %d arguments should be 8\n", linenum, tac ); ! exitval = 1; ! goto done; } if ( snprintf( path, MAXPATHLEN, "%s/%s/%s", file_root, tran_name, ! d_path ) > MAXPATHLEN - 1 ) { fprintf( stderr, "%d: %s/%s/%s: path too long\n", linenum, file_root, tran_name, d_path ); ! exitval = 1; ! goto done; } --- 334,345 ---- fprintf( stderr, "line %d: %d arguments should be 8\n", linenum, tac ); ! goto badline; } if ( snprintf( path, MAXPATHLEN, "%s/%s/%s", file_root, tran_name, ! d_path ) >= MAXPATHLEN ) { fprintf( stderr, "%d: %s/%s/%s: path too long\n", linenum, file_root, tran_name, d_path ); ! goto badline; } *************** *** 369,388 **** /* open file here to save us some other open calls */ if (( fd = open( path, O_RDONLY, 0 )) < 0 ) { ! fprintf( stderr, "open %s: %s\n", d_path, strerror( errno )); ! cleanup( updatetran, upath ); ! exit( 2 ); } /* check size */ if ( fstat( fd, &st) != 0 ) { ! perror( path ); ! cleanup( updatetran, upath ); ! exit( 2 ); } if (( cksumsize = do_fcksum( fd, lcksum )) < 0 ) { ! perror( path ); ! cleanup( updatetran, upath ); ! exit( 2 ); } --- 357,376 ---- /* open file here to save us some other open calls */ if (( fd = open( path, O_RDONLY, 0 )) < 0 ) { ! fprintf( stderr, "line %d: open %s: %s\n", ! linenum, d_path, strerror( errno )); ! goto badline; } /* check size */ if ( fstat( fd, &st) != 0 ) { ! fprintf( stderr, "line %d: fstat failed: %s\n", ! linenum, strerror( errno )); ! goto badline; } if (( cksumsize = do_fcksum( fd, lcksum )) < 0 ) { ! fprintf( stderr, "line %d: %s: %s\n", linenum, ! path, strerror( errno )); ! goto badline; } *************** *** 418,436 **** /* rewind the descriptor */ if ( lseek( fd, 0, SEEK_SET ) < 0 ) { ! perror( "lseek" ); ! exitval = 1; ! goto done; } if ( ckapplefile( path, fd ) != st.st_size ) { fprintf( stderr, "%s: corrupted applefile\n", path ); ! exitval = 1; ! goto done; } } if ( close( fd ) != 0 ) { ! perror( "close" ); ! exitval = 1; ! goto done; } --- 406,424 ---- /* rewind the descriptor */ if ( lseek( fd, 0, SEEK_SET ) < 0 ) { ! fprintf( stderr, "%s: lseek failed: %s\n", ! path, strerror( errno )); ! goto badline; } if ( ckapplefile( path, fd ) != st.st_size ) { fprintf( stderr, "%s: corrupted applefile\n", path ); ! goto badline; } } if ( close( fd ) != 0 ) { ! /* unrecoverable error. can't leak descriptors. */ ! fprintf( stderr, "%s: close failed: %s\n", path, strerror( errno )); ! cleanup( updatetran, upath ); ! exit( 2 ); } *************** *** 498,501 **** --- 486,500 ---- } } + + /* this restores -a functionality. can't wait to replace lcksum. */ + badline: + exitval = 1; + + if ( checkall ) { + goto done; + } else { + cleanup( updatetran, upath ); + exit( 2 ); + } } |
|
From: Andrew M. <fit...@us...> - 2007-11-29 17:22:06
|
Update of /cvsroot/radmind/radmind In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30962 Modified Files: daemon.c Log Message: Daemon's default port is now IANA-registered 6222. Index: daemon.c =================================================================== RCS file: /cvsroot/radmind/radmind/daemon.c,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** daemon.c 4 Sep 2007 20:40:00 -0000 1.84 --- daemon.c 29 Nov 2007 17:21:59 -0000 1.85 *************** *** 369,373 **** if ( port == 0 ) { if (( se = getservbyname( "radmind", "tcp" )) == NULL ) { ! port = htons( 6662 ); } else { port = se->s_port; --- 369,373 ---- if ( port == 0 ) { if (( se = getservbyname( "radmind", "tcp" )) == NULL ) { ! port = htons( 6222 ); } else { port = se->s_port; |
|
From: Andrew M. <fit...@us...> - 2007-11-29 17:22:06
|
Update of /cvsroot/radmind/radmind/man In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30962/man Modified Files: radmind.8 Log Message: Daemon's default port is now IANA-registered 6222. Index: radmind.8 =================================================================== RCS file: /cvsroot/radmind/radmind/man/radmind.8,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** radmind.8 24 Aug 2007 03:14:09 -0000 1.42 --- radmind.8 29 Nov 2007 17:21:59 -0000 1.43 *************** *** 43,47 **** command, file, special, tmp, tmp/file, tmp/transcript and transcript ( with permissions 0750 ) if they do not ! exist, and begins listening on the radmind port ( by default 6662 ) for incoming connections. With the --- 43,47 ---- command, file, special, tmp, tmp/file, tmp/transcript and transcript ( with permissions 0750 ) if they do not ! exist, and begins listening on the radmind port ( by default 6222 ) for incoming connections. With the *************** *** 233,237 **** .BI \-p\ port specifies the port of the radmind server, by default ! .BR 6662 . .TP 19 .BI \-P\ ca-directory --- 233,237 ---- .BI \-p\ port specifies the port of the radmind server, by default ! .BR 6222 . .TP 19 .BI \-P\ ca-directory |
|
From: Andrew M. <fit...@us...> - 2007-11-28 21:31:09
|
Update of /cvsroot/radmind/radmind/man In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29195/man Modified Files: ktcheck.1 lapply.1 lcreate.1 lfdiff.1 repo.1 Log Message: Default port is now 6222. Failover in connect.c handles legacy port (6662) servers. Index: lfdiff.1 =================================================================== RCS file: /cvsroot/radmind/radmind/man/lfdiff.1,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** lfdiff.1 31 Jul 2007 02:55:37 -0000 1.15 --- lfdiff.1 28 Nov 2007 21:31:03 -0000 1.16 *************** *** 77,81 **** .BI \-p\ port specifies the port of the radmind server, by default ! .BR 6662 . .TP 19 .BI \-P\ ca-pem-directory --- 77,81 ---- .BI \-p\ port specifies the port of the radmind server, by default ! .BR 6222 . .TP 19 .BI \-P\ ca-pem-directory Index: repo.1 =================================================================== RCS file: /cvsroot/radmind/radmind/man/repo.1,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** repo.1 31 Jul 2007 02:55:37 -0000 1.4 --- repo.1 28 Nov 2007 21:31:03 -0000 1.5 *************** *** 51,55 **** .BI \-p\ port specifies a port, by default ! .B 6662. .TP 19 .BI \-P\ ca-pem-directory --- 51,55 ---- .BI \-p\ port specifies a port, by default ! .B 6222 . .TP 19 .BI \-P\ ca-pem-directory Index: lcreate.1 =================================================================== RCS file: /cvsroot/radmind/radmind/man/lcreate.1,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** lcreate.1 31 Jul 2007 02:55:37 -0000 1.22 --- lcreate.1 28 Nov 2007 21:31:03 -0000 1.23 *************** *** 121,125 **** .BI \-p\ port specifies a port, by default ! .BR 6662 . .TP 19 .BI \-P\ ca-pem-directory --- 121,125 ---- .BI \-p\ port specifies a port, by default ! .BR 6222 . .TP 19 .BI \-P\ ca-pem-directory Index: lapply.1 =================================================================== RCS file: /cvsroot/radmind/radmind/man/lapply.1,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** lapply.1 31 Jul 2007 02:55:37 -0000 1.18 --- lapply.1 28 Nov 2007 21:31:03 -0000 1.19 *************** *** 108,112 **** .BI \-p\ port specifies the port of the radmind server, by default ! .BR 6662 . .TP 19 .BI \-P\ ca-pem-directory --- 108,112 ---- .BI \-p\ port specifies the port of the radmind server, by default ! .BR 6222 . .TP 19 .BI \-P\ ca-pem-directory Index: ktcheck.1 =================================================================== RCS file: /cvsroot/radmind/radmind/man/ktcheck.1,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** ktcheck.1 31 Jul 2007 02:55:37 -0000 1.19 --- ktcheck.1 28 Nov 2007 21:31:03 -0000 1.20 *************** *** 99,103 **** .BI \-p\ port specifies a port, by default ! .B 6662. .TP 19 .BI \-P\ ca-pem-directory --- 99,103 ---- .BI \-p\ port specifies a port, by default ! .B 6222. .TP 19 .BI \-P\ ca-pem-directory |
|
From: Andrew M. <fit...@us...> - 2007-11-28 21:31:08
|
Update of /cvsroot/radmind/radmind In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29195 Modified Files: ktcheck.c lapply.c lcreate.c lfdiff.c repo.c Log Message: Default port is now 6222. Failover in connect.c handles legacy port (6662) servers. Index: lcreate.c =================================================================== RCS file: /cvsroot/radmind/radmind/lcreate.c,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** lcreate.c 31 Jul 2007 02:55:36 -0000 1.89 --- lcreate.c 28 Nov 2007 21:31:03 -0000 1.90 *************** *** 73,77 **** main( int argc, char **argv ) { ! int c, err = 0, port = htons(6662), tac; int network = 1, len = 0, rc; int negative = 0, tran_only = 0; --- 73,77 ---- main( int argc, char **argv ) { ! int c, err = 0, port = htons( 6222 ), tac; int network = 1, len = 0, rc; int negative = 0, tran_only = 0; Index: repo.c =================================================================== RCS file: /cvsroot/radmind/radmind/repo.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** repo.c 31 Jul 2007 02:55:37 -0000 1.11 --- repo.c 28 Nov 2007 21:31:03 -0000 1.12 *************** *** 47,51 **** { SNET *sn; ! int c, port = htons( 6662 ); int i = 0, err = 0, len; int authlevel = _RADMIND_AUTHLEVEL; --- 47,51 ---- { SNET *sn; ! int c, port = htons( 6222 ); int i = 0, err = 0, len; int authlevel = _RADMIND_AUTHLEVEL; Index: ktcheck.c =================================================================== RCS file: /cvsroot/radmind/radmind/ktcheck.c,v retrieving revision 1.127 retrieving revision 1.128 diff -C2 -d -r1.127 -r1.128 *** ktcheck.c 27 Nov 2007 14:01:03 -0000 1.127 --- ktcheck.c 28 Nov 2007 21:31:03 -0000 1.128 *************** *** 547,551 **** main( int argc, char **argv ) { ! int c, port = htons( 6662 ), err = 0; int authlevel = _RADMIND_AUTHLEVEL; int use_randfile = 0; --- 547,551 ---- main( int argc, char **argv ) { ! int c, port = htons( 6222 ), err = 0; int authlevel = _RADMIND_AUTHLEVEL; int use_randfile = 0; Index: lapply.c =================================================================== RCS file: /cvsroot/radmind/radmind/lapply.c,v retrieving revision 1.141 retrieving revision 1.142 diff -C2 -d -r1.141 -r1.142 *** lapply.c 31 Jul 2007 02:55:36 -0000 1.141 --- lapply.c 28 Nov 2007 21:31:03 -0000 1.142 *************** *** 231,235 **** main( int argc, char **argv ) { ! int c, port = htons( 6662 ), err = 0; extern int optind; FILE *f = NULL; --- 231,235 ---- main( int argc, char **argv ) { ! int c, port = htons( 6222 ), err = 0; extern int optind; FILE *f = NULL; Index: lfdiff.c =================================================================== RCS file: /cvsroot/radmind/radmind/lfdiff.c,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** lfdiff.c 3 Nov 2007 15:25:45 -0000 1.62 --- lfdiff.c 28 Nov 2007 21:31:03 -0000 1.63 *************** *** 114,118 **** main( int argc, char **argv, char **envp ) { ! int c, i, tac, port = htons( 6662 ), err = 0; int special = 0, diffargc = 0; int fd; --- 114,118 ---- main( int argc, char **argv, char **envp ) { ! int c, i, tac, port = htons( 6222 ), err = 0; int special = 0, diffargc = 0; int fd; |
|
From: Wes C. <wes...@us...> - 2007-11-28 01:44:17
|
Update of /cvsroot/radmind/radmind In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19255 Modified Files: pathcmp.c Log Message: added undocumented USE_ASCII define for Mac OS X Index: pathcmp.c =================================================================== RCS file: /cvsroot/radmind/radmind/pathcmp.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** pathcmp.c 11 Nov 2005 20:09:40 -0000 1.16 --- pathcmp.c 28 Nov 2007 01:44:14 -0000 1.17 *************** *** 6,9 **** --- 6,13 ---- #include "config.h" + #ifdef __APPLE__ + #define USE_ASCII 1 + #endif /* __APPLE__ */ + #include <sys/param.h> #include <sys/types.h> |
|
From: Andrew M. <fit...@us...> - 2007-11-27 14:01:11
|
Update of /cvsroot/radmind/radmind In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18986 Modified Files: ktcheck.c Log Message: Correct parenthesis location to fix -C. Index: ktcheck.c =================================================================== RCS file: /cvsroot/radmind/radmind/ktcheck.c,v retrieving revision 1.126 retrieving revision 1.127 diff -C2 -d -r1.126 -r1.127 *** ktcheck.c 3 Nov 2007 15:25:45 -0000 1.126 --- ktcheck.c 27 Nov 2007 14:01:03 -0000 1.127 *************** *** 169,173 **** if ( strcmp( fsitem, base_kfile ) == 0 || ( strncmp( kdir, path, strlen( path )) == 0 ! && strcmp( base_kfile, de->d_name )) == 0 ) { continue; } --- 169,173 ---- if ( strcmp( fsitem, base_kfile ) == 0 || ( strncmp( kdir, path, strlen( path )) == 0 ! && strcmp( base_kfile, de->d_name ) == 0 )) { continue; } |
|
From: Andrew M. <fit...@us...> - 2007-11-19 02:46:25
|
Update of /cvsroot/radmind/radmind In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8724 Modified Files: ra.sh Log Message: ra.sh up, shorthand for ra.sh update. Index: ra.sh =================================================================== RCS file: /cvsroot/radmind/radmind/ra.sh,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** ra.sh 23 May 2007 18:33:45 -0000 1.40 --- ra.sh 19 Nov 2007 02:46:18 -0000 1.41 *************** *** 382,386 **** ;; ! update) update interactive cleanup --- 382,386 ---- ;; ! update|up) update interactive cleanup |
|
From: Andrew M. <fit...@us...> - 2007-11-16 19:22:12
|
Update of /cvsroot/radmind/radmind In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31525 Modified Files: connect.c Log Message: [ Patch 1833304 ]: Legacy port failover. Index: connect.c =================================================================== RCS file: /cvsroot/radmind/radmind/connect.c,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** connect.c 28 Dec 2006 16:07:17 -0000 1.29 --- connect.c 16 Nov 2007 19:22:08 -0000 1.30 *************** *** 1,4 **** /* ! * Copyright (c) 2003 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. */ --- 1,4 ---- /* ! * Copyright (c) 2007 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. */ *************** *** 34,37 **** --- 34,40 ---- #include "argcargv.h" + #define RADMIND_IANA_PORT 6222 + #define RADMIND_LEGACY_PORT 6662 + extern void (*logger)( char * ); extern int verbose; *************** *** 40,43 **** --- 43,48 ---- extern SSL_CTX *ctx; + int connectsn2_errno = 0; + #ifdef HAVE_ZLIB int zlib_level = 0; *************** *** 74,83 **** } ! if ( verbose ) printf( "trying %s... ", inet_ntoa( sin->sin_addr )); if ( connect( s, (struct sockaddr *)sin, sizeof( struct sockaddr_in )) != 0 ) { if ( verbose ) printf( "failed: %s\n", strerror( errno )); - fprintf( stderr, "connection to %s failed: %s\n", - inet_ntoa( sin->sin_addr ), strerror( errno )); (void)close( s ); return( NULL ); --- 79,88 ---- } ! if ( verbose ) printf( "trying %s:%u... ", inet_ntoa( sin->sin_addr ), ! ntohs( sin->sin_port )); if ( connect( s, (struct sockaddr *)sin, sizeof( struct sockaddr_in )) != 0 ) { + connectsn2_errno = errno; if ( verbose ) printf( "failed: %s\n", strerror( errno )); (void)close( s ); return( NULL ); *************** *** 122,129 **** memcpy( &sin.sin_addr.s_addr, he->h_addr_list[ i ], (unsigned int)he->h_length ); ! if (( sn = connectsn2( &sin )) != NULL ) { return( sn ); } } fprintf( stderr, "%s: connection failed\n", host ); return( NULL ); --- 127,150 ---- memcpy( &sin.sin_addr.s_addr, he->h_addr_list[ i ], (unsigned int)he->h_length ); ! ! /* ! * radmind's original port was 6662, but got ! * registered as 6222 with IANA, and will show ! * up in future /etc/services as 6222. during ! * the transition, fall back to trying the ! * legacy port if the new port connection fails. ! */ ! if (( sn = connectsn2( &sin )) == NULL ! && port == htons( RADMIND_IANA_PORT )) { ! /* try connecting to old non-IANA registered port */ ! sin.sin_port = htons( RADMIND_LEGACY_PORT ); ! sn = connectsn2( &sin ); ! } ! if ( sn != NULL ) { return( sn ); } } + fprintf( stderr, "connection to %s failed: %s\n", + inet_ntoa( sin.sin_addr ), strerror( connectsn2_errno )); fprintf( stderr, "%s: connection failed\n", host ); return( NULL ); |
