radmind-commit — CVS commit messages.

[Radmind-commit] radmind-assistant/rsm RSMPreferences.h,1.10,1.11 RSMPreferences.m,1.12,1.13

[Andrew M. <fit...@us...>]

Update of /cvsroot/radmind/radmind-assistant/rsm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv683

Modified Files:
	RSMPreferences.h RSMPreferences.m 
Log Message:
Removed unnecessary "Enable Compression" switch in favor of pop-up.


Index: RSMPreferences.m
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/rsm/RSMPreferences.m,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** RSMPreferences.m	24 Feb 2006 22:10:42 -0000	1.12
--- RSMPreferences.m	8 Mar 2006 18:03:11 -0000	1.13
***************
*** 309,313 ****
          arglist = [ arglist arrayByAddingObject: @"-U" ];
      }
!     if ( [ rsmPrefEnableCompressionSwitch state ] == NSOnState ) {
  	arglist = [ arglist arrayByAddingObjectsFromArray:
  		    [ NSArray arrayWithObjects: @"-Z",
--- 309,313 ----
          arglist = [ arglist arrayByAddingObject: @"-U" ];
      }
!     if ( zlevel > 0 && zlevel < 10 ) {
  	arglist = [ arglist arrayByAddingObjectsFromArray:
  		    [ NSArray arrayWithObjects: @"-Z",
***************
*** 556,578 ****
  }
  
- - ( IBAction )toggleCompression: ( id )sender
- {
-     BOOL	compress = NO;
-     
-     if ( [ sender state ] == NSOnState ) {
- 	compress = YES;
- 	[[ NSUserDefaults standardUserDefaults ]
- 		setInteger: [ rsmPrefCompressionLevelPopUp indexOfSelectedItem ]
- 		forKey: @"RadmindServerCompressionLevel" ];
-     } else {
- 	[[ NSUserDefaults standardUserDefaults ]
- 		removeObjectForKey: @"RadmindServerCompressionLevel" ];
-     }
-     
-     [ rsmPrefCompressionLevelPopUp setEnabled: compress ];
-     [[ NSUserDefaults standardUserDefaults ]
- 	    setBool: compress forKey: @"RadmindServerCompressionEnabled" ];
- }
- 
  - ( IBAction )setCompressionLevel: ( id )sender
  {
--- 556,559 ----
***************
*** 716,720 ****
      NSUserDefaults              *d = [ NSUserDefaults standardUserDefaults ];
      NSString                    *path, *port, *u, *max;
!     BOOL                        userauth, caseInsensitive, compress;
      int                         level = 0, zlevel = 0;
      
--- 697,701 ----
      NSUserDefaults              *d = [ NSUserDefaults standardUserDefaults ];
      NSString                    *path, *port, *u, *max;
!     BOOL                        userauth, caseInsensitive;
      int                         level = 0, zlevel = 0;
      
***************
*** 737,747 ****
  	    column: 0 ];
      
!     compress = [ d boolForKey: @"RadmindServerCompressionEnabled" ];
!     [ rsmPrefEnableCompressionSwitch setState: compress ];
!     if ( compress ) {
! 	zlevel = [ d integerForKey: @"RadmindServerCompressionLevel" ];
! 	[ rsmPrefCompressionLevelPopUp selectItemAtIndex: zlevel ];
! 	[ rsmPrefCompressionLevelPopUp setEnabled: YES ];
!     }
      
      userauth = [ d boolForKey: @"RadmindServerUserAuthentication" ];
--- 718,723 ----
  	    column: 0 ];
      
!     zlevel = [ d integerForKey: @"RadmindServerCompressionLevel" ];
!     [ rsmPrefCompressionLevelPopUp selectItemAtIndex: zlevel ];
      
      userauth = [ d boolForKey: @"RadmindServerUserAuthentication" ];

Index: RSMPreferences.h
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/rsm/RSMPreferences.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** RSMPreferences.h	24 Feb 2006 22:10:42 -0000	1.10
--- RSMPreferences.h	8 Mar 2006 18:03:11 -0000	1.11
***************
*** 18,22 ****
  	IBOutlet RASTableView   *rsmPrefAllowedUsersTable;
  	IBOutlet NSPopUpButton	*rsmPrefCompressionLevelPopUp;
- 	IBOutlet NSButton	*rsmPrefEnableCompressionSwitch;
  	IBOutlet NSTextField    *rsmPrefMaxConnections;
  	IBOutlet NSTextField    *rsmPrefRadmindDirectory;
--- 18,21 ----
***************
*** 61,65 ****
  - ( IBAction )setUmask: ( id )sender;
  - ( IBAction )setCaseSensitivity: ( id )sender;
- - ( IBAction )toggleCompression: ( id )sender;
  - ( IBAction )setCompressionLevel: ( id )sender;
  
--- 60,63 ----

[Radmind-commit] radmind-assistant/rsm/rsm.xcodeproj project.pbxproj,1.7,1.8

[Andrew M. <fit...@us...>]

Update of /cvsroot/radmind/radmind-assistant/rsm/rsm.xcodeproj
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32708/rsm.xcodeproj

Modified Files:
	project.pbxproj 
Log Message:
Removed unused prebinding settings.


Index: project.pbxproj
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/rsm/rsm.xcodeproj/project.pbxproj,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** project.pbxproj	24 Feb 2006 22:12:56 -0000	1.7
--- project.pbxproj	8 Mar 2006 18:01:55 -0000	1.8
***************
*** 792,795 ****
--- 792,796 ----
  				LIBRARY_SEARCH_PATHS = "";
  				OTHER_LDFLAGS = "";
+ 				PREBINDING = NO;
  				PRODUCT_NAME = "Radmind Server Manager";
  				SECTORDER_FLAGS = "";
***************
*** 822,825 ****
--- 823,827 ----
  				LIBRARY_SEARCH_PATHS = "";
  				OTHER_LDFLAGS = "";
+ 				PREBINDING = NO;
  				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES;
  				PRODUCT_NAME = "Radmind Server Manager";
***************
*** 850,853 ****
--- 852,856 ----
  				LIBRARY_SEARCH_PATHS = "";
  				OTHER_LDFLAGS = "";
+ 				PREBINDING = NO;
  				PRODUCT_NAME = "Radmind Server Manager";
  				SECTORDER_FLAGS = "";

[Radmind-commit] radmind connect.h,1.11,1.11.2.1 ktcheck.c,1.109,1.109.2.1 lapply.c,1.129,1.129.2.1 lfdiff.c,1.55,1.55.2.1 retr.c,1.53.2.2,1.53.2.3

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

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

Modified Files:
      Tag: radmind-1-6-0-branch
	connect.h ktcheck.c lapply.c lfdiff.c retr.c 
Log Message:
retr() and retr_applefile() take an additional value mode_t tempmode to
specify how temp files are created.  This allows lapply to work around broken
OS X symlinks by not setting a process wide umask by default.  ( Bug #1441965 )


Index: lapply.c
===================================================================
RCS file: /cvsroot/radmind/radmind/lapply.c,v
retrieving revision 1.129
retrieving revision 1.129.2.1
diff -C2 -d -r1.129 -r1.129.2.1
*** lapply.c	24 Jan 2006 20:45:50 -0000	1.129
--- lapply.c	3 Mar 2006 14:40:02 -0000	1.129.2.1
***************
*** 159,163 ****
  	}
  	if ( *targv[ 0 ] == 'a' ) {
! 	    switch ( retr_applefile( sn, pathdesc, path, temppath,
  		strtoofft( targv[ 6 ], NULL, 10 ), cksum_b64 )) {
  	    case -1:
--- 159,163 ----
  	}
  	if ( *targv[ 0 ] == 'a' ) {
! 	    switch ( retr_applefile( sn, pathdesc, path, temppath, 0600,
  		strtoofft( targv[ 6 ], NULL, 10 ), cksum_b64 )) {
  	    case -1:
***************
*** 171,175 ****
  	    }
  	} else {
! 	    switch ( retr( sn, pathdesc, path, (char *)&temppath,
  		strtoofft( targv[ 6 ], NULL, 10 ), cksum_b64 ) != 0 ) {
  	    case -1:
--- 171,175 ----
  	    }
  	} else {
! 	    switch ( retr( sn, pathdesc, path, (char *)&temppath, 0600,
  		strtoofft( targv[ 6 ], NULL, 10 ), cksum_b64 ) != 0 ) {
  	    case -1:
***************
*** 256,267 ****
  	char        **capa = NULL; /* capabilities */
  
-     /*
-      * retr() uses a default mode of 0644 for downloaded files.  Since
-      * some of them might be sensitive, we change the umask here
-      * so only the user can see the temp files before they are set
-      * with the correct permissions.  -u can change this umask.
-      */
-     umask( S_IRWXG | S_IRWXO );
- 
      while (( c = getopt ( argc, argv, "%c:Fh:iInp:qru:Vvw:x:y:z:Z:" )) != EOF ) {
  	switch( c ) {
--- 256,259 ----

Index: lfdiff.c
===================================================================
RCS file: /cvsroot/radmind/radmind/lfdiff.c,v
retrieving revision 1.55
retrieving revision 1.55.2.1
diff -C2 -d -r1.55 -r1.55.2.1
*** lfdiff.c	24 Jan 2006 20:44:55 -0000	1.55
--- lfdiff.c	3 Mar 2006 14:40:02 -0000	1.55.2.1
***************
*** 154,165 ****
      struct transcript	*tran;
  
-     /*
-      * retr() uses a default mode of 0644 for downloaded files.  Since
-      * some of them might be sensitive, we change the umask here
-      * so only the user can see the temp files before they are set
-      * with the correct permissions.  -u can change this umask.
-      */
-     umask( S_IRWXG | S_IRWXO );
- 
      /* create argv to pass to diff */
      if (( diffargv = (char **)malloc( 1  * sizeof( char * ))) == NULL ) {
--- 154,157 ----
***************
*** 407,411 ****
      }
  
!     if ( retr( sn, pathdesc, path, (char *)&temppath, -1, "-" ) != 0 ) {
  	exit( 2 );
      }
--- 399,403 ----
      }
  
!     if ( retr( sn, pathdesc, path, (char *)&temppath, 0600, -1, "-" ) != 0 ) {
  	exit( 2 );
      }

Index: connect.h
===================================================================
RCS file: /cvsroot/radmind/radmind/connect.h,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** connect.h	24 Jan 2006 20:47:01 -0000	1.11
--- connect.h	3 Mar 2006 14:40:02 -0000	1.11.2.1
***************
*** 14,20 ****
  
  int retr( SNET *sn, char *pathdesc, char *path, char *temppath,
!     off_t transize, char *trancksum );
  int retr_applefile( SNET *sn, char *pathdesc, char *path, char *temppath,
!     off_t transize, char *trancksum );
  
  int n_stor_file( SNET *sn, char *pathdesc, char *path );
--- 14,20 ----
  
  int retr( SNET *sn, char *pathdesc, char *path, char *temppath,
!     mode_t tempmode, off_t transize, char *trancksum );
  int retr_applefile( SNET *sn, char *pathdesc, char *path, char *temppath,
!     mode_t tempmode, off_t transize, char *trancksum );
  
  int n_stor_file( SNET *sn, char *pathdesc, char *path );

Index: retr.c
===================================================================
RCS file: /cvsroot/radmind/radmind/retr.c,v
retrieving revision 1.53.2.2
retrieving revision 1.53.2.3
diff -C2 -d -r1.53.2.2 -r1.53.2.3
*** retr.c	1 Mar 2006 00:14:27 -0000	1.53.2.2
--- retr.c	3 Mar 2006 14:40:02 -0000	1.53.2.3
***************
*** 61,66 ****
  
      int 
! retr( SNET *sn, char *pathdesc, char *path, char *temppath, off_t transize,
!     char *trancksum )
  {
      struct timeval	tv;
--- 61,66 ----
  
      int 
! retr( SNET *sn, char *pathdesc, char *path, char *temppath, mode_t tempmode,
!     off_t transize, char *trancksum )
  {
      struct timeval	tv;
***************
*** 130,134 ****
      }
      /* Open file */
!     if (( fd = open( temppath, O_WRONLY | O_CREAT, 0644 )) < 0 ) {
  	perror( temppath );
  	return( -1 );
--- 130,134 ----
      }
      /* Open file */
!     if (( fd = open( temppath, O_WRONLY | O_CREAT, tempmode )) < 0 ) {
  	perror( temppath );
  	return( -1 );
***************
*** 214,218 ****
      int
  retr_applefile( SNET *sn, char *pathdesc, char *path, char *temppath,
!     off_t transize, char *trancksum )
  {
      int				dfd, rfd;
--- 214,218 ----
      int
  retr_applefile( SNET *sn, char *pathdesc, char *path, char *temppath,
!     mode_t tempmode, off_t transize, char *trancksum )
  {
      int				dfd, rfd;
***************
*** 368,372 ****
  
      /* data fork must exist to write to rsrc fork */        
!     if (( dfd = open( temppath, O_CREAT | O_EXCL | O_WRONLY, 0644 )) < 0 ) {
  	perror( temppath );
  	return( -1 );
--- 368,372 ----
  
      /* data fork must exist to write to rsrc fork */        
!     if (( dfd = open( temppath, O_CREAT | O_EXCL | O_WRONLY, tempmode )) < 0 ) {
  	perror( temppath );
  	return( -1 );

Index: ktcheck.c
===================================================================
RCS file: /cvsroot/radmind/radmind/ktcheck.c,v
retrieving revision 1.109
retrieving revision 1.109.2.1
diff -C2 -d -r1.109 -r1.109.2.1
*** ktcheck.c	10 Feb 2006 19:31:38 -0000	1.109
--- ktcheck.c	3 Mar 2006 14:40:02 -0000	1.109.2.1
***************
*** 459,463 ****
  	    if ( update ) {
  		if ( !quiet ) { printf( "%s:", path ); fflush( stdout ); }
! 		if ( retr( sn, pathdesc, path, (char *)&tempfile,
  			strtoofft( targv[ 6 ], NULL, 10 ), targv[ 7 ] ) != 0 ) {
  		    return( 2 );
--- 459,463 ----
  	    if ( update ) {
  		if ( !quiet ) { printf( "%s:", path ); fflush( stdout ); }
! 		if ( retr( sn, pathdesc, path, (char *)&tempfile, 0666, 
  			strtoofft( targv[ 6 ], NULL, 10 ), targv[ 7 ] ) != 0 ) {
  		    return( 2 );
***************
*** 507,511 ****
  		return( 2 );
  	    }
! 	    if ( retr( sn, pathdesc, path, (char *)&tempfile,
  		    strtoofft( targv[ 6 ], NULL, 10 ), targv[ 7 ] ) != 0 ) {
  		return( 2 );
--- 507,511 ----
  		return( 2 );
  	    }
! 	    if ( retr( sn, pathdesc, path, (char *)&tempfile, 0666, 
  		    strtoofft( targv[ 6 ], NULL, 10 ), targv[ 7 ] ) != 0 ) {
  		return( 2 );

[Radmind-commit] radmind applefile.c,1.25,1.26 applefile.h,1.20,1.21 cksum.c,1.17,1.18 lcksum.c,1.70,1.71 retr.c,1.54,1.55 stor.c,1.46,1.47

[Andrew M. <fit...@us...>]

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

Modified Files:
	applefile.c applefile.h cksum.c lcksum.c retr.c stor.c 
Log Message:
[Bug 1438290] Fixes for AppleSingle support on i386.


Index: applefile.c
===================================================================
RCS file: /cvsroot/radmind/radmind/applefile.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** applefile.c	20 Sep 2004 21:22:28 -0000	1.25
--- applefile.c	1 Mar 2006 04:58:40 -0000	1.26
***************
*** 6,9 ****
--- 6,11 ----
  #include "config.h"
  #include "applefile.h"
+ #include <arpa/inet.h>
+ #include <stdio.h>
  
  #ifdef __APPLE__
***************
*** 52,53 ****
--- 54,80 ----
  
  extern struct as_header as_header;
+ 
+ /* endian handlers for x86 Macs */
+     void
+ as_entry_netswap( struct as_entry *e )
+ {
+ #ifdef __BIG_ENDIAN__
+     return;
+ #else /* __BIG_ENDIAN__ */
+      e->ae_id = htonl( e->ae_id );
+      e->ae_offset = htonl( e->ae_offset );
+      e->ae_length = htonl( e->ae_length );
+ #endif /* __BIG_ENDIAN__ */
+ }
+ 
+     void
+ as_entry_hostswap( struct as_entry *e )
+ {
+ #ifdef __BIG_ENDIAN__
+     return;
+ #else /* __BIG_ENDIAN__ */
+      e->ae_id = ntohl( e->ae_id );
+      e->ae_offset = ntohl( e->ae_offset );
+      e->ae_length = ntohl( e->ae_length );
+ #endif /* __BIG_ENDIAN__ */
+ }

Index: cksum.c
===================================================================
RCS file: /cvsroot/radmind/radmind/cksum.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** cksum.c	17 Feb 2006 20:30:01 -0000	1.17
--- cksum.c	1 Mar 2006 04:58:40 -0000	1.18
***************
*** 15,18 ****
--- 15,19 ----
  #include <stdlib.h>
  #include <stdio.h>
+ #include <string.h>
  #include <fcntl.h>
  #include <unistd.h>
***************
*** 100,103 ****
--- 101,105 ----
      off_t			size = 0;
      extern struct as_header	as_header;
+     struct as_entry		as_entries_endian[ 3 ];
      unsigned int		md_len;
      extern EVP_MD		*md;
***************
*** 111,116 ****
      size += (size_t)AS_HEADERLEN;
  
      /* checksum header entries */
!     EVP_DigestUpdate( &mdctx, (char *)&afinfo->as_ents,
  		(unsigned int)( 3 * sizeof( struct as_entry )));
      size += sizeof( 3 * sizeof( struct as_entry ));
--- 113,125 ----
      size += (size_t)AS_HEADERLEN;
  
+     /* endian handling, sum big-endian header entries */
+     memcpy( &as_entries_endian, &afinfo->as_ents,
+ 		( 3 * sizeof( struct as_entry )));
+     as_entry_netswap( &as_entries_endian[ AS_FIE ] );
+     as_entry_netswap( &as_entries_endian[ AS_RFE ] );
+     as_entry_netswap( &as_entries_endian[ AS_DFE ] );
+ 
      /* checksum header entries */
!     EVP_DigestUpdate( &mdctx, (char *)&as_entries_endian,
  		(unsigned int)( 3 * sizeof( struct as_entry )));
      size += sizeof( 3 * sizeof( struct as_entry ));

Index: applefile.h
===================================================================
RCS file: /cvsroot/radmind/radmind/applefile.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** applefile.h	17 Feb 2006 20:30:01 -0000	1.20
--- applefile.h	1 Mar 2006 04:58:40 -0000	1.21
***************
*** 26,36 ****
  
  #define AS_HEADERLEN	26
- #define AS_MAGIC	0x00051600
- #define AS_VERSION	0x00020000
- #define AS_NENTRIES	3
  
! #define ASEID_DFORK	1
! #define ASEID_RFORK	2
! #define ASEID_FINFO	9
  
  #define AS_FIE		0	/* for array of ae_entry structs */
--- 26,47 ----
  
  #define AS_HEADERLEN	26
  
! #ifdef __BIG_ENDIAN__
! 
! #define AS_MAGIC       0x00051600
! #define AS_VERSION     0x00020000
! #define AS_NENTRIES    0x0003
! 
! #else /* __BIG_ENDIAN__ */
! 
! #define AS_MAGIC       0x00160500
! #define AS_VERSION     0x00000200
! #define AS_NENTRIES    0x0300
! 
! #endif /* __BIG_ENDIAN__ */
! 
! #define ASEID_DFORK    1
! #define ASEID_RFORK    2
! #define ASEID_FINFO    9
  
  #define AS_FIE		0	/* for array of ae_entry structs */
***************
*** 70,72 ****
--- 81,85 ----
  };
  
+ void as_entry_netswap( struct as_entry *e );
+ void as_entry_hostswap( struct as_entry *e );
  off_t ckapplefile( char *applefile, int afd );

Index: stor.c
===================================================================
RCS file: /cvsroot/radmind/radmind/stor.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** stor.c	17 Feb 2006 20:30:01 -0000	1.46
--- stor.c	1 Mar 2006 04:58:40 -0000	1.47
***************
*** 261,267 ****
      struct timeval   	tv;
      unsigned int      	md_len;
      extern EVP_MD      	*md;
      EVP_MD_CTX         	mdctx;
!     unsigned char 	     	md_value[ EVP_MAX_MD_SIZE ];
      char		cksum_b64[ EVP_MAX_MD_SIZE ];
  
--- 261,268 ----
      struct timeval   	tv;
      unsigned int      	md_len;
+     unsigned int	rsrc_len;
      extern EVP_MD      	*md;
      EVP_MD_CTX         	mdctx;
!     unsigned char 	md_value[ EVP_MAX_MD_SIZE ];
      char		cksum_b64[ EVP_MAX_MD_SIZE ];
  
***************
*** 288,291 ****
--- 289,298 ----
      size = afinfo->as_size;
  
+     /* endian handling, swap header entries if necessary */
+     rsrc_len = afinfo->as_ents[ AS_RFE ].ae_length;
+     as_entry_netswap( &afinfo->as_ents[ AS_FIE ] );
+     as_entry_netswap( &afinfo->as_ents[ AS_RFE ] );
+     as_entry_netswap( &afinfo->as_ents[ AS_DFE ] );
+ 
      /* open data and rsrc fork */
      if (( dfd = open( path, O_RDONLY )) < 0 ) {
***************
*** 293,297 ****
  	exit( 2 );
      }
!     if ( afinfo->as_ents[ AS_RFE ].ae_length > 0 ) {
          if ( snprintf( rsrc_path, MAXPATHLEN, "%s%s",
  		path, _PATH_RSRCFORKSPEC ) >= MAXPATHLEN ) {
--- 300,304 ----
  	exit( 2 );
      }
!     if ( rsrc_len > 0 ) {
          if ( snprintf( rsrc_path, MAXPATHLEN, "%s%s",
  		path, _PATH_RSRCFORKSPEC ) >= MAXPATHLEN ) {
***************
*** 377,381 ****
  
      /* write rsrc fork data to server */
!     if ( afinfo->as_ents[ AS_RFE ].ae_length > 0 ) {
  	while (( rc = read( rfd, buf, sizeof( buf ))) > 0 ) {
  	    tv = timeout;
--- 384,388 ----
  
      /* write rsrc fork data to server */
!     if ( rsrc_len > 0 ) {
  	while (( rc = read( rfd, buf, sizeof( buf ))) > 0 ) {
  	    tv = timeout;
***************
*** 532,535 ****
--- 539,547 ----
      if ( dodots ) { putc( '.', stdout ); fflush( stdout ); }
  
+     /* endian handling, convert to valid AppleSingle format, if necessary */
+     as_entry_netswap( &afinfo.as_ents[ AS_FIE ] );
+     as_entry_netswap( &afinfo.as_ents[ AS_RFE ] );
+     as_entry_netswap( &afinfo.as_ents[ AS_DFE ] );
+ 
      /* write header entries to server */
      tv = timeout;

Index: retr.c
===================================================================
RCS file: /cvsroot/radmind/radmind/retr.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** retr.c	17 Feb 2006 17:19:38 -0000	1.54
--- retr.c	1 Mar 2006 04:58:40 -0000	1.55
***************
*** 373,376 ****
--- 373,385 ----
      }
  
+     /*
+      * endian handling: swap bytes to architecture
+      * native from AppleSingle big-endian.
+      *
+      * This doesn't affect the checksum, since we
+      * already summed the header entries above.
+      */
+     as_entry_hostswap( &ae_ents[ AS_RFE ] );
+ 
      if ( ae_ents[ AS_RFE ].ae_length > 0 ) {
  	/* make rsrc fork name */
***************
*** 389,393 ****
  	};  
  
! 	for ( rsize = ae_ents[ AS_RFE ].ae_length; rsize > 0; rsize -= rc ) {
  	    tv = timeout;
  	    if (( rc = snet_read( sn, buf, ( int )MIN( sizeof( buf ), rsize ),
--- 398,403 ----
  	};  
  
! 	for ( rsize = ae_ents[ AS_RFE ].ae_length;
! 					rsize > 0; rsize -= rc ) {
  	    tv = timeout;
  	    if (( rc = snet_read( sn, buf, ( int )MIN( sizeof( buf ), rsize ),

Index: lcksum.c
===================================================================
RCS file: /cvsroot/radmind/radmind/lcksum.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** lcksum.c	5 Oct 2005 14:53:00 -0000	1.70
--- lcksum.c	1 Mar 2006 04:58:40 -0000	1.71
***************
*** 9,12 ****
--- 9,13 ----
  #include <sys/stat.h>
  #include <sys/param.h>
+ #include <arpa/inet.h>
  #include <errno.h>
  #include <fcntl.h>
***************
*** 62,65 ****
--- 63,67 ----
  	exit( 2 );
      }
+ 
      if ( rr != AS_HEADERLEN ||
  		memcmp( &as_header, &header, AS_HEADERLEN ) != 0 ) {
***************
*** 79,82 ****
--- 81,88 ----
      size += rr;
  
+     as_entry_netswap( &as_ents[ AS_FIE ] );
+     as_entry_netswap( &as_ents[ AS_RFE ] );
+     as_entry_netswap( &as_ents[ AS_DFE ] );
+ 
      /* check entry IDs */
      if ( as_ents[ AS_FIE ].ae_id != ASEID_FINFO ||
***************
*** 93,102 ****
      }
      if ( as_ents[ AS_RFE ].ae_offset != 
! 		( as_ents[ AS_FIE ].ae_offset + as_ents[ AS_FIE ].ae_length )) {
  	fprintf( stderr, "%s: incorrect rsrc fork offset\n", applefile );
  	return( -1 );
      }
      if ( as_ents[ AS_DFE ].ae_offset !=
! 		( as_ents[ AS_RFE ].ae_offset + as_ents[ AS_RFE ].ae_length )) {
  	fprintf( stderr, "%s: incorrect data fork offset\n", applefile );
  	return( -1 );
--- 99,110 ----
      }
      if ( as_ents[ AS_RFE ].ae_offset != 
! 	    	( as_ents[ AS_FIE ].ae_offset +
! 		as_ents[ AS_FIE ].ae_length )) {
  	fprintf( stderr, "%s: incorrect rsrc fork offset\n", applefile );
  	return( -1 );
      }
      if ( as_ents[ AS_DFE ].ae_offset !=
! 		( as_ents[ AS_RFE ].ae_offset +
! 		as_ents[ AS_RFE ].ae_length )) {
  	fprintf( stderr, "%s: incorrect data fork offset\n", applefile );
  	return( -1 );

[Radmind-commit] radmind applefile.c,1.25,1.25.4.1 applefile.h,1.19,1.19.4.1 cksum.c,1.16,1.16.2.1 lcksum.c,1.70,1.70.2.1 retr.c,1.53.2.1,1.53.2.2 stor.c,1.45,1.45.2.1

[Andrew M. <fit...@us...>]

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

Modified Files:
      Tag: radmind-1-6-0-branch
	applefile.c applefile.h cksum.c lcksum.c retr.c stor.c 
Log Message:
[Bug 1438290]: AppleSingle support on i386 hardware.


Index: applefile.c
===================================================================
RCS file: /cvsroot/radmind/radmind/applefile.c,v
retrieving revision 1.25
retrieving revision 1.25.4.1
diff -C2 -d -r1.25 -r1.25.4.1
*** applefile.c	20 Sep 2004 21:22:28 -0000	1.25
--- applefile.c	1 Mar 2006 00:14:27 -0000	1.25.4.1
***************
*** 6,9 ****
--- 6,11 ----
  #include "config.h"
  #include "applefile.h"
+ #include <arpa/inet.h>
+ #include <stdio.h>
  
  #ifdef __APPLE__
***************
*** 52,53 ****
--- 54,80 ----
  
  extern struct as_header as_header;
+ 
+ /* endian handlers for x86 Macs */
+     void
+ as_entry_netswap( struct as_entry *e )
+ {
+ #ifdef __BIG_ENDIAN__
+     return;
+ #else /* __BIG_ENDIAN__ */
+      e->ae_id = htonl( e->ae_id );
+      e->ae_offset = htonl( e->ae_offset );
+      e->ae_length = htonl( e->ae_length );
+ #endif /* __BIG_ENDIAN__ */
+ }
+ 
+     void
+ as_entry_hostswap( struct as_entry *e )
+ {
+ #ifdef __BIG_ENDIAN__
+     return;
+ #else /* __BIG_ENDIAN__ */
+      e->ae_id = ntohl( e->ae_id );
+      e->ae_offset = ntohl( e->ae_offset );
+      e->ae_length = ntohl( e->ae_length );
+ #endif /* __BIG_ENDIAN__ */
+ }

Index: cksum.c
===================================================================
RCS file: /cvsroot/radmind/radmind/cksum.c,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -d -r1.16 -r1.16.2.1
*** cksum.c	3 Oct 2005 17:02:21 -0000	1.16
--- cksum.c	1 Mar 2006 00:14:27 -0000	1.16.2.1
***************
*** 15,18 ****
--- 15,19 ----
  #include <stdlib.h>
  #include <stdio.h>
+ #include <string.h>
  #include <fcntl.h>
  #include <unistd.h>
***************
*** 100,103 ****
--- 101,105 ----
      off_t			size = 0;
      extern struct as_header	as_header;
+     struct as_entry		as_entries_endian[ 3 ];
      unsigned int		md_len;
      extern EVP_MD		*md;
***************
*** 111,116 ****
      size += (size_t)AS_HEADERLEN;
  
      /* checksum header entries */
!     EVP_DigestUpdate( &mdctx, (char *)&afinfo->as_ents,
  		(unsigned int)( 3 * sizeof( struct as_entry )));
      size += sizeof( 3 * sizeof( struct as_entry ));
--- 113,125 ----
      size += (size_t)AS_HEADERLEN;
  
+     /* endian handling, sum big-endian header entries */
+     memcpy( &as_entries_endian, &afinfo->as_ents,
+ 		( 3 * sizeof( struct as_entry )));
+     as_entry_netswap( &as_entries_endian[ AS_FIE ] );
+     as_entry_netswap( &as_entries_endian[ AS_RFE ] );
+     as_entry_netswap( &as_entries_endian[ AS_DFE ] );
+ 
      /* checksum header entries */
!     EVP_DigestUpdate( &mdctx, (char *)&as_entries_endian,
  		(unsigned int)( 3 * sizeof( struct as_entry )));
      size += sizeof( 3 * sizeof( struct as_entry ));

Index: applefile.h
===================================================================
RCS file: /cvsroot/radmind/radmind/applefile.h,v
retrieving revision 1.19
retrieving revision 1.19.4.1
diff -C2 -d -r1.19 -r1.19.4.1
*** applefile.h	20 Sep 2004 21:22:28 -0000	1.19
--- applefile.h	1 Mar 2006 00:14:27 -0000	1.19.4.1
***************
*** 26,36 ****
  
  #define AS_HEADERLEN	26
- #define AS_MAGIC	0x00051600
- #define AS_VERSION	0x00020000
- #define AS_NENTRIES	3
  
! #define ASEID_DFORK	1
! #define ASEID_RFORK	2
! #define ASEID_FINFO	9
  
  #define AS_FIE		0	/* for array of ae_entry structs */
--- 26,47 ----
  
  #define AS_HEADERLEN	26
  
! #ifdef __BIG_ENDIAN__
! 
! #define AS_MAGIC       0x00051600
! #define AS_VERSION     0x00020000
! #define AS_NENTRIES    0x0003
! 
! #else /* __BIG_ENDIAN__ */
! 
! #define AS_MAGIC       0x00160500
! #define AS_VERSION     0x00000200
! #define AS_NENTRIES    0x0300
! 
! #endif /* __BIG_ENDIAN__ */
! 
! #define ASEID_DFORK    1
! #define ASEID_RFORK    2
! #define ASEID_FINFO    9
  
  #define AS_FIE		0	/* for array of ae_entry structs */
***************
*** 73,75 ****
--- 84,88 ----
  };
  
+ void as_entry_netswap( struct as_entry *e );
+ void as_entry_hostswap( struct as_entry *e );
  off_t ckapplefile( char *applefile, int afd );

Index: stor.c
===================================================================
RCS file: /cvsroot/radmind/radmind/stor.c,v
retrieving revision 1.45
retrieving revision 1.45.2.1
diff -C2 -d -r1.45 -r1.45.2.1
*** stor.c	24 Jan 2006 20:44:14 -0000	1.45
--- stor.c	1 Mar 2006 00:14:27 -0000	1.45.2.1
***************
*** 261,267 ****
      struct timeval   	tv;
      unsigned int      	md_len;
      extern EVP_MD      	*md;
      EVP_MD_CTX         	mdctx;
!     unsigned char 	     	md_value[ EVP_MAX_MD_SIZE ];
      char		cksum_b64[ EVP_MAX_MD_SIZE ];
  
--- 261,268 ----
      struct timeval   	tv;
      unsigned int      	md_len;
+     unsigned int	rsrc_len;
      extern EVP_MD      	*md;
      EVP_MD_CTX         	mdctx;
!     unsigned char 	md_value[ EVP_MAX_MD_SIZE ];
      char		cksum_b64[ EVP_MAX_MD_SIZE ];
  
***************
*** 288,291 ****
--- 289,298 ----
      size = afinfo->as_size;
  
+      /* endian handling, swap header entries if necessary */
+      rsrc_len = afinfo->as_ents[ AS_RFE ].ae_length;
+      as_entry_netswap( &afinfo->as_ents[ AS_FIE ] );
+      as_entry_netswap( &afinfo->as_ents[ AS_RFE ] );
+      as_entry_netswap( &afinfo->as_ents[ AS_DFE ] );
+ 
      /* open data and rsrc fork */
      if (( dfd = open( path, O_RDONLY )) < 0 ) {
***************
*** 293,297 ****
  	exit( 2 );
      }
!     if ( afinfo->as_ents[ AS_RFE ].ae_length > 0 ) {
  	if (( rfd = open( afinfo->rsrc_path, O_RDONLY )) < 0 ) {
  	    perror( afinfo->rsrc_path );
--- 300,304 ----
  	exit( 2 );
      }
!     if ( rsrc_len > 0 ) {
  	if (( rfd = open( afinfo->rsrc_path, O_RDONLY )) < 0 ) {
  	    perror( afinfo->rsrc_path );
***************
*** 372,376 ****
  
      /* write rsrc fork data to server */
!     if ( afinfo->as_ents[ AS_RFE ].ae_length > 0 ) {
  	while (( rc = read( rfd, buf, sizeof( buf ))) > 0 ) {
  	    tv = timeout;
--- 379,383 ----
  
      /* write rsrc fork data to server */
!     if ( rsrc_len > 0 ) {
  	while (( rc = read( rfd, buf, sizeof( buf ))) > 0 ) {
  	    tv = timeout;
***************
*** 527,530 ****
--- 534,542 ----
      if ( dodots ) { putc( '.', stdout ); fflush( stdout ); }
  
+     /* endian handling, convert to valid AppleSingle format, if necessary */
+     as_entry_netswap( &afinfo.as_ents[ AS_FIE ] );
+     as_entry_netswap( &afinfo.as_ents[ AS_RFE ] );
+     as_entry_netswap( &afinfo.as_ents[ AS_DFE ] );
+ 
      /* write header entries to server */
      tv = timeout;

Index: retr.c
===================================================================
RCS file: /cvsroot/radmind/radmind/retr.c,v
retrieving revision 1.53.2.1
retrieving revision 1.53.2.2
diff -C2 -d -r1.53.2.1 -r1.53.2.2
*** retr.c	21 Feb 2006 21:23:03 -0000	1.53.2.1
--- retr.c	1 Mar 2006 00:14:27 -0000	1.53.2.2
***************
*** 373,376 ****
--- 373,385 ----
      }
  
+     /*
+      * endian handling: swap bytes to architecture
+      * native from AppleSingle big-endian.
+      *
+      * This doesn't affect the checksum, since we
+      * already summed the header entries above.
+      */
+     as_entry_hostswap( &ae_ents[ AS_RFE ] );
+ 
      if ( ae_ents[ AS_RFE ].ae_length > 0 ) {
  	/* make rsrc fork name */
***************
*** 389,393 ****
  	};  
  
! 	for ( rsize = ae_ents[ AS_RFE ].ae_length; rsize > 0; rsize -= rc ) {
  	    tv = timeout;
  	    if (( rc = snet_read( sn, buf, ( int )MIN( sizeof( buf ), rsize ),
--- 398,403 ----
  	};  
  
! 	for ( rsize = ae_ents[ AS_RFE ].ae_length;
! 					rsize > 0; rsize -= rc ) {
  	    tv = timeout;
  	    if (( rc = snet_read( sn, buf, ( int )MIN( sizeof( buf ), rsize ),

Index: lcksum.c
===================================================================
RCS file: /cvsroot/radmind/radmind/lcksum.c,v
retrieving revision 1.70
retrieving revision 1.70.2.1
diff -C2 -d -r1.70 -r1.70.2.1
*** lcksum.c	5 Oct 2005 14:53:00 -0000	1.70
--- lcksum.c	1 Mar 2006 00:14:27 -0000	1.70.2.1
***************
*** 9,12 ****
--- 9,13 ----
  #include <sys/stat.h>
  #include <sys/param.h>
+ #include <arpa/inet.h>
  #include <errno.h>
  #include <fcntl.h>
***************
*** 62,65 ****
--- 63,67 ----
  	exit( 2 );
      }
+ 
      if ( rr != AS_HEADERLEN ||
  		memcmp( &as_header, &header, AS_HEADERLEN ) != 0 ) {
***************
*** 79,82 ****
--- 81,88 ----
      size += rr;
  
+     as_entry_netswap( &as_ents[ AS_FIE ] );
+     as_entry_netswap( &as_ents[ AS_RFE ] );
+     as_entry_netswap( &as_ents[ AS_DFE ] );
+ 
      /* check entry IDs */
      if ( as_ents[ AS_FIE ].ae_id != ASEID_FINFO ||
***************
*** 93,102 ****
      }
      if ( as_ents[ AS_RFE ].ae_offset != 
! 		( as_ents[ AS_FIE ].ae_offset + as_ents[ AS_FIE ].ae_length )) {
  	fprintf( stderr, "%s: incorrect rsrc fork offset\n", applefile );
  	return( -1 );
      }
      if ( as_ents[ AS_DFE ].ae_offset !=
! 		( as_ents[ AS_RFE ].ae_offset + as_ents[ AS_RFE ].ae_length )) {
  	fprintf( stderr, "%s: incorrect data fork offset\n", applefile );
  	return( -1 );
--- 99,110 ----
      }
      if ( as_ents[ AS_RFE ].ae_offset != 
! 	    	( as_ents[ AS_FIE ].ae_offset +
! 		as_ents[ AS_FIE ].ae_length )) {
  	fprintf( stderr, "%s: incorrect rsrc fork offset\n", applefile );
  	return( -1 );
      }
      if ( as_ents[ AS_DFE ].ae_offset !=
! 		( as_ents[ AS_RFE ].ae_offset +
! 		as_ents[ AS_RFE ].ae_length )) {
  	fprintf( stderr, "%s: incorrect data fork offset\n", applefile );
  	return( -1 );

[Radmind-commit] radmind/man rash.1,1.3,1.4

[Andrew M. <fit...@us...>]

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

Modified Files:
	rash.1 
Log Message:
Added -r usage.
Stripped carriage returns from line endings.


Index: rash.1
===================================================================
RCS file: /cvsroot/radmind/radmind/man/rash.1,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rash.1	21 Feb 2006 21:59:22 -0000	1.3
--- rash.1	27 Feb 2006 14:17:45 -0000	1.4
***************
*** 1,142 ****
! .TH rash "1" "_RADMIND_BUILD_DATE" "RSUG" "User Commands"
! .SH NAME
! .B rash 
! \- Radmind Assistant
! .SH SYNOPSIS
! .B ra
! [
! .BI -%cltV 
! ] [ 
! .BI \-h\ server 
! ] [ 
! .BI \-U\ user 
! ] [ 
! .BI \-w\ authlevel 
! ] {
! .B trip
! |
! .B update
! |
! .B create
! |
! .B auto
! |
! .B force
! |
! .B checkout
! |
! .B checkin
! } 
! .sp 
! .SH DESCRIPTION 
! .B rash 
! is a command line application for running the Radmind
! tool set.  It can be used to run the entire radmind process including
! updating a client, running a tripwire and creating loadsets.  On
! machines with multiple administrators, 
! .B rash 
! can be used to limit
! conflicts from multiple administrators simultaneously using the tool.
! 
! .B rash 
! is run with a required option telling it what process to run:
! update, auto, force, create, trip, checkout or checkin.
! 
! A machine can be updated by using either the update, auto or force
! option.  update will prompt the user at each step in the process.  auto
! will update the machine without any input, looping when possible to
! handle temporary problems such as networking issues or a busy server. 
! auto is suitable to be run as an automated process.  force updates
! a machine without looping or prompting for input and is handy for quick,
! manual updates.
! 
! create is used to store a loadset on the radmind server in an
! interactive fashion.  Before creating a transcript, 
! .B rash 
! first checks to
! see if the command file and transcripts are correct and prompts the uses
! to update them if needed.  The user can also edit the transcript before
! it is stored on the server.
! 
! trip is used to run a tripwire on the system.  If the command file and
! transcripts are correct, a full tripwire is run with checksums.  Any
! differences are printed to the screen in a format suitable for e-mailed
! machine reporting.
! 
! checkout is used to prevent other users from concurrently running 
! .BR rash . 
! It is helpful when an administrator is installing new software or
! configuring a client and does not want their work removed.  Only the
! user who checked out a machine can run 
! .B rash 
! unless a new checkout is
! forced from an interactive 
! .B rash 
! session.  An e-mail is sent to the
! previous users when a checkout is overridden.  As trip does not modify
! the system, it can be run at any time, regardless of who has checked out
! the machine.  checkin is used to release a machine.  Only the user who
! checked out a machine may check it back in.
! 
! checkin and checkout both use $USER to determine who is performing
! the command.  $USER can be overridden using the -U option.
! 
! The -c option can be used to turn on checksums for fsdiff.  The only
! supported checksum SHA1.
! 
! .B rash 
! supports running arbitrary scripts before and after lapply. 
! Preapply scripts located in PREAPPLY are run before lapply, and
! postapply scripts located in POSTAPPLY are run after.  The first
! argument passed to each script is the full path to apply-able
! transcript.
! .SH OPTIONS
! .TP 19
! .B \-%
! percentage done progress output.
! .TP 19
! .B \-c
! use sha1 checksums.
! .TP 19
! .BI \-h\  hostname
! specifies the radmind server, by default
! .BR _RADMIND_HOST .
! .TP 19
! .B \-l
! Prompt for remote user name.  The -U option disables this prompt.
! .TP 19
! .B \-t
! use tempfiles
! .TP 19
! .BI \-U\  user
! specifies the user.  By default, $USER 
! will be used.
! .TP 19
! .B \-V
! displays the version of 
! .B rash
! and exits.
! .TP 19
! .BI \-w\  auth-level
! TLS authorization level, by default _RADMIND_AUTHLEVEL.
! 0 = no TLS, 1 = server verification, 2 = server and client verification.
! .SH EXIT STATUS
! The following exit values are returned:
! .TP 5
! 0
! successful.
! .TP 5
! >1
! An error occurred.
! .sp
! .SH SEE ALSO
! .BR fsdiff (1),
! .BR ktcheck (1),
! .BR lapply (1),
! .BR lcksum (1),
! .BR lcreate (1),
! .BR lfdiff (1),
! .BR lmerge (1),
! .BR lsort (1),
! .BR twhich (1),
! .BR radmind (8).
--- 1,148 ----
! .TH rash "1" "_RADMIND_BUILD_DATE" "RSUG" "User Commands"
! .SH NAME
! .B rash 
! \- Radmind Assistant
! .SH SYNOPSIS
! .B ra
! [
! .BI -%cltV 
! ] [ 
! .BI \-h\ server 
! ] [ 
! .BI \-r\ path 
! ] [ 
! .BI \-U\ user 
! ] [ 
! .BI \-w\ authlevel 
! ] {
! .B trip
! |
! .B update
! |
! .B create
! |
! .B auto
! |
! .B force
! |
! .B checkout
! |
! .B checkin
! } 
! .sp 
! .SH DESCRIPTION 
! .B rash 
! is a command line application for running the Radmind
! tool set.  It can be used to run the entire radmind process including
! updating a client, running a tripwire and creating loadsets.  On
! machines with multiple administrators, 
! .B rash 
! can be used to limit
! conflicts from multiple administrators simultaneously using the tool.
! 
! .B rash 
! is run with a required option telling it what process to run:
! update, auto, force, create, trip, checkout or checkin.
! 
! A machine can be updated by using either the update, auto or force
! option.  update will prompt the user at each step in the process.  auto
! will update the machine without any input, looping when possible to
! handle temporary problems such as networking issues or a busy server. 
! auto is suitable to be run as an automated process.  force updates
! a machine without looping or prompting for input and is handy for quick,
! manual updates.
! 
! create is used to store a loadset on the radmind server in an
! interactive fashion.  Before creating a transcript, 
! .B rash 
! first checks to
! see if the command file and transcripts are correct and prompts the uses
! to update them if needed.  The user can also edit the transcript before
! it is stored on the server.
! 
! trip is used to run a tripwire on the system.  If the command file and
! transcripts are correct, a full tripwire is run with checksums.  Any
! differences are printed to the screen in a format suitable for e-mailed
! machine reporting.
! 
! checkout is used to prevent other users from concurrently running 
! .BR rash . 
! It is helpful when an administrator is installing new software or
! configuring a client and does not want their work removed.  Only the
! user who checked out a machine can run 
! .B rash 
! unless a new checkout is
! forced from an interactive 
! .B rash 
! session.  An e-mail is sent to the
! previous users when a checkout is overridden.  As trip does not modify
! the system, it can be run at any time, regardless of who has checked out
! the machine.  checkin is used to release a machine.  Only the user who
! checked out a machine may check it back in.
! 
! checkin and checkout both use $USER to determine who is performing
! the command.  $USER can be overridden using the -U option.
! 
! The -c option can be used to turn on checksums for fsdiff.  The only
! supported checksum is SHA1.
! 
! .B rash 
! supports running arbitrary scripts before and after lapply. 
! Preapply scripts located in PREAPPLY are run before lapply, and
! postapply scripts located in POSTAPPLY are run after.  The first
! argument passed to each script is the full path to apply-able
! transcript.
! .SH OPTIONS
! .TP 19
! .B \-%
! percentage done progress output.
! .TP 19
! .B \-c
! use sha1 checksums.
! .TP 19
! .BI \-h\  hostname
! specifies the radmind server, by default
! .BR _RADMIND_HOST .
! .TP 19
! .B \-l
! Prompt for remote user name.  The -U option disables this prompt.
! .TP 19
! .BI \-r\  path
! specifies root path from which fsdiff will start its scan of the
! filesystem
! .TP 19
! .B \-t
! use tempfiles
! .TP 19
! .BI \-U\  user
! specifies the user.  By default, $USER 
! will be used.
! .TP 19
! .B \-V
! displays the version of 
! .B rash
! and exits.
! .TP 19
! .BI \-w\  auth-level
! TLS authorization level, by default _RADMIND_AUTHLEVEL.
! 0 = no TLS, 1 = server verification, 2 = server and client verification.
! .SH EXIT STATUS
! The following exit values are returned:
! .TP 5
! 0
! successful.
! .TP 5
! >1
! An error occurred.
! .sp
! .SH SEE ALSO
! .BR fsdiff (1),
! .BR ktcheck (1),
! .BR lapply (1),
! .BR lcksum (1),
! .BR lcreate (1),
! .BR lfdiff (1),
! .BR lmerge (1),
! .BR lsort (1),
! .BR twhich (1),
! .BR radmind (8).

[Radmind-commit] radmind ra.sh,1.28,1.29

[Andrew M. <fit...@us...>]

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

Modified Files:
	ra.sh 
Log Message:
Support for alternative fsdiff root paths (thanks to Jeremy Reichman).


Index: ra.sh
===================================================================
RCS file: /cvsroot/radmind/radmind/ra.sh,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** ra.sh	21 Feb 2006 21:59:22 -0000	1.28
--- ra.sh	24 Feb 2006 22:42:01 -0000	1.29
***************
*** 261,265 ****
  fi
  
! while getopts %ch:lqtU:Vw: opt; do
      case $opt in
      %)  PROGRESS="-%"
--- 261,265 ----
  fi
  
! while getopts %ch:lqr:tU:Vw: opt; do
      case $opt in
      %)  PROGRESS="-%"
***************
*** 279,282 ****
--- 279,285 ----
  	;;
  
+     r)  FSDIFFROOT="$OPTARG"
+ 	;;
+ 
      t)	TEMPFILES="TRUE"
      	;;

[Radmind-commit] radmind-assistant/hooks/Resources Description.plist,NONE,1.1 Info.plist,NONE,1.1 License.rtf,NONE,1.1 ReadMe.rtf,NONE,1.1 Welcome.rtf,NONE,1.1 postflight,NONE,1.1

[Andrew M. <fit...@us...>]

Update of /cvsroot/radmind/radmind-assistant/hooks/Resources
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29579

Added Files:
	Description.plist Info.plist License.rtf ReadMe.rtf 
	Welcome.rtf postflight 
Log Message:
PackageMaker support for MacOSXHooks target.


--- NEW FILE: License.rtf ---
{\rtf1\mac\ansicpg10000\cocoartf102
{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\margl359\margr359\vieww9000\viewh9000\viewkind0
\deftab720
\pard\pardeftab720\ql\qnatural

\f0\b\fs24 \cf0 Copyright (c) 2004 Regents of The University of Michigan\
All Rights Reserved
\f1\b0 \
\
Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appears in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of The University of Michigan not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. This software is supplied as is without expressed or implied warranties of any kind.\
\
Research Systems Unix Group\
The University of Michigan\
c/o Wesley Craig\
4251 Plymouth Road B1F2, #2600\
Ann Arbor, MI 48105-2785\
rsu...@um...\
http://rsug.itd.umich.edu/software/radmind\
}
--- NEW FILE: Info.plist ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
	<key>CFBundleGetInfoString</key>
	<string>Mac OS X Login and Logout Hook Installer</string>
	<key>CFBundleIdentifier</key>
	<string>edu.umich.macosxhooks</string>
	<key>CFBundleName</key>
	<string>MacOSXHooks</string>
	<key>CFBundleShortVersionString</key>
	<string>20040312</string>
	<key>IFMajorVersion</key>
	<integer>0</integer>
	<key>IFMinorVersion</key>
	<integer>0</integer>
	<key>IFPkgFlagAllowBackRev</key>
	<false/>
	<key>IFPkgFlagAuthorizationAction</key>
	<string>RootAuthorization</string>
	<key>IFPkgFlagDefaultLocation</key>
	<string>/</string>
	<key>IFPkgFlagInstallFat</key>
	<false/>
	<key>IFPkgFlagIsRequired</key>
	<false/>
	<key>IFPkgFlagRelocatable</key>
	<true/>
	<key>IFPkgFlagRestartAction</key>
	<string>NoRestart</string>
	<key>IFPkgFlagRootVolumeOnly</key>
	<false/>
	<key>IFPkgFlagUpdateInstalledLanguages</key>
	<false/>
	<key>IFPkgFormatVersion</key>
	<real>0.10000000149011612</real>
</dict>
</plist>

--- NEW FILE: postflight ---
#! /bin/sh

LOGINWINDOW="$3/Library/Preferences/com.apple.loginwindow"
DEFAULTS="/usr/bin/defaults"
LIHOOK="/etc/login.hook"
LOHOOK="/etc/logout.hook"

${DEFAULTS} write "${LOGINWINDOW}" LoginHook ${LIHOOK}
${DEFAULTS} write "${LOGINWINDOW}" LogoutHook ${LOHOOK}

exit 0

--- NEW FILE: Description.plist ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
        <key>IFPkgDescriptionDeleteWarning</key>
        <string></string>
        <key>IFPkgDescriptionDescription</key>
        <string>Mac OS X Hooks</string>
        <key>IFPkgDescriptionTitle</key>
        <string>Mac OS X Hooks</string>
        <key>IFPkgDescriptionVersion</key>
        <string>1.0</string>
</dict>
</plist>



--- NEW FILE: ReadMe.rtf ---
{\rtf1\mac\ansicpg10000\cocoartf102
{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\vieww8640\viewh9000\viewkind0
\pard\ql\qnatural

\f0\b\fs24 \cf0 About Mac OS X Hooks\

\f1\b0 The Mac OS X Login Window has a built-in mechanism for running scripts or applications during the login or logout process. To enable this mechanism, the Login Window must have two entries added to its preferences, LoginHook and LogoutHook. This package installs four scripts:\
\
/private/etc/login.hook\
/private/etc/logout.hook\
/private/etc/hooks/masterlogin.sh\
/private/etc/hooks/masterlogout.sh\
\
The package also runs a script following installation that sets two preferences in /Library/Preferences/com.apple.loginwindow.plist:\
\
<key>LoginHook</key>\
<string>/etc/login.hook</string>\
\
and\
\
<key>LogoutHook</key>\
<string>/etc/logout.hook</string>\
\
This tells the Login Window which items should be run on login and logout.\
\
\

\f0\b How Mac OS X Hooks works\

\f1\b0 The login.hook and logout.hook check to see if iHook is installed. If it is, iHook runs either masterlogin.sh or masterlogout.sh, depending on whether the user is logging in or out. Otherwise, the scripts are executed without an interface.\
\
When masterlogin.sh is executed, it runs everything in /etc/hooks beginning with LI. For example:\
\
LI00CheckUsername.hook\
LI10MountNFS.hook\
LI99WelcomeUser.hook\
\
masterlogout.sh runs everything in /etc/hooks beginning with LO. For example:\
\
LO10ClearCaches.hook\
LO10UnmountNFS.hook\
LO99Radmind.hook\
\
This allows the administrator to add a script to the login or logout process simply by naming the script according to the above conventions, and placing it in /etc/hooks.\
\
To disable individual scripts in /etc/hooks, the administrator can either remove the LI or LO prefix, or delete them from the directory. To disable the login or logout hook in the Login Window, the administrator can execute the following commands:\
\
sudo defaults delete /Library/Preferences/com.apple.loginwindow LoginHook\
sudo defaults delete /Library/Preferences/com.apple.loginwindow LogoutHook\
\
Copyright (c) 2004 Regents of The University of Michigan\
All Rights Reserved}
--- NEW FILE: Welcome.rtf ---
{\rtf1\mac\ansicpg10000\cocoartf102
{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\vieww9000\viewh9000\viewkind0
\pard\qc

\f0\fs36 \cf0 Welcome to the Mac OS X Hooks installer.  You will be guided through the necessary steps.
\fs24 \
}

[Radmind-commit] radmind-assistant/hooks/Resources - New directory

[Andrew M. <fit...@us...>]

Update of /cvsroot/radmind/radmind-assistant/hooks/Resources
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29260/Resources

Log Message:
Directory /cvsroot/radmind/radmind-assistant/hooks/Resources added to the repository

[Radmind-commit] radmind-assistant/hooks Makefile,NONE,1.1 README.txt,NONE,1.1 ejectexclude,NONE,1.1 masterlogin.sh,NONE,1.1 masterlogout.sh,NONE,1.1

[Andrew M. <fit...@us...>]

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

Added Files:
	Makefile README.txt ejectexclude masterlogin.sh 
	masterlogout.sh 
Log Message:
Support scripts, build settings and documentation for Radmind automation.


--- NEW FILE: Makefile ---
# Copyright (c) 2003 Regents of The University of Michigan.
# All Rights Reserved.  See COPYRIGHT.

SHELL = /bin/sh

srcdir = .

prefix=/private/etc
exec_prefix=${prefix}
HOOKDIR=${exec_prefix}/hooks

INSTALL=	/usr/bin/install -c

HOOKTARGETS=    login.hook logout.hook
TARGETS=	masterlogin.sh masterlogout.sh
DEFAULTS=	/usr/bin/defaults
LOGINWINDOW=	/Library/Preferences/com.apple.loginwindow

install	: 
	-mkdir -p ${exec_prefix}
	-mkdir -p -m 0755 ${HOOKDIR}
	for i in ${HOOKTARGETS}; do \
	    ${INSTALL} -m 0755 -c $$i ${exec_prefix}/; \
	done
	for i in ${TARGETS}; do \
	    ${INSTALL} -m 0755 -c $$i ${HOOKDIR}/; \
	done
	${DEFAULTS} write ${LOGINWINDOW} LoginHook /etc/login.hook
	${DEFAULTS} write ${LOGINWINDOW} LogoutHook /etc/logout.hook

PKGNAME=MacOSXHooks
PKGDIR=tmp/MacOSXHooks
PKGRSRCDIR=Resources
PKGSRCDIR=`pwd`
PKGMAKER=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker

package	: 
	-mkdir -p ${PKGDIR}/${HOOKDIR}
	for i in ${PKGSRCDIR}/${HOOKTARGETS}; do \
	    ${INSTALL} -m 0755 -c $$i ${PKGDIR}/${exec_prefix}; \
	done
	for i in ${PKGSRCDIR}/${TARGETS}; do \
	    ${INSTALL} -m 0755 -c $$i ${PKGDIR}/${HOOKDIR}; \
	done
	${PKGMAKER} -build -p ${PKGSRCDIR}/${PKGNAME}.pkg \
		-f ${PKGSRCDIR}/${PKGDIR} \
		-r ${PKGSRCDIR}/${PKGRSRCDIR} \
		-i ${PKGSRCDIR}/Resources/Info.plist \
		-d ${PKGSRCDIR}/Resources/Description.plist

clean :
	-rm -rf tmp

--- NEW FILE: masterlogin.sh ---
#! /bin/sh

# generic iHook login script
#
# runs everything in /etc/hooks beginning with LI (for LogIn),
# similar in design to the SysV rc scripts.

export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin

HOOKSDIR="/etc/hooks"

# become front application, disable UI and show barberpole
echo %BACKGROUND ${RAIHOOKBACKGROUND}
echo %WINDOWLEVEL HIGH
echo %BECOMEKEY
echo %UIMODE AUTOCRATIC
echo %BEGINPOLE

if [ -d ${HOOKSDIR} ]; then
    for hook in ${HOOKSDIR}/LI*; do
	if [ -s ${hook} -a -x ${hook} ]; then
	    logger -s -t LoginHook -p user.info Executing ${hook}... 1>&2

	    # run the item
	    ${hook} $*
	    exit_value=$?

	    if [ ${exit_value} -ne 0 ]; then
		logger -s -t LoginHook -p user.info ${hook} failed! 1>&2
		exit $exit_value
	    fi
	fi
    done
fi

echo LoginHook complete.
echo %ENDPOLE

sleep 1

exit 0

--- NEW FILE: ejectexclude ---
^/dev/disk0
^/dev/disk[0-9][0-9]*[a-zA-Z]

--- NEW FILE: masterlogout.sh ---
#! /bin/sh

# generic iHook logout script
#
# runs everything in /etc/hooks beginning with LO (for LogOut),
# similar in design to the SysV rc scripts.

export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin

HOOKSDIR="/etc/hooks"

# become front application, disable UI and show barberpole
echo %BACKGROUND ${RAIHOOKBACKGROUND}
echo %WINDOWLEVEL HIGH
echo %BECOMEKEY
echo %UIMODE AUTOCRATIC
echo %BEGINPOLE

if [ -d ${HOOKSDIR} ]; then
    for hook in ${HOOKSDIR}/LO*; do
	if [ -s ${hook} -a -x ${hook} ]; then
	    logger -s -t LogoutHook -p user.info Executing ${hook}... 1>&2

	    # run the item
	    ${hook} $*

	    if [ $? -ne 0 ]; then
		exit_value=$?
		logger -s -t LogoutHook -p user.info ${hook} failed! 1>&2
		exit $exit_value
	    fi
	fi
    done
fi

echo LogoutHook complete.
echo %ENDPOLE

sleep 1

exit 0

--- NEW FILE: README.txt ---
About Mac OS X Hooks
The Mac OS X Login Window has a built-in mechanism for running scripts or applications during the login or logout process. To enable this mechanism, the Login Window must have two entries added to its preferences, LoginHook and LogoutHook. Mac OS X Hooks does this for you.


Building
Because Mac OS X Hooks is just a collection of scripts, there's nothing to build.

Installing
To install the login and logout hooks, run 'make install' as root. The following scripts will be installed:

/private/etc/login.hook
/private/etc/logout.hook
/private/etc/hooks/masterlogin.sh
/private/etc/hooks/masterlogout.sh

make install also sets two preferences in /Library/Preferences/com.apple.loginwindow.plist:

<key>LoginHook</key>
<string>/etc/login.hook</string>

and

<key>LogoutHook</key>
<string>/etc/logout.hook</string>

This tells the Login Window which items should be run on login and logout.


Building an Installer Package
'make package' as root will build a Mac OS X Installer Package called MacOSXHooks.pkg in the hooks directory. This package can then be installed with Apple's Installer.app or installer command line tool.


How Mac OS X Hooks works
The login.hook and logout.hook check to see if iHook is installed. If it is, iHook runs either masterlogin.sh or masterlogout.sh, depending on whether the user is logging in or out. Otherwise, the scripts are executed without an interface.

When masterlogin.sh is executed, it runs everything in /etc/hooks beginning with LI. For example:

LI00CheckUsername.hook
LI10MountNFS.hook
LI99WelcomeUser.hook

masterlogout.sh runs everything in /etc/hooks beginning with LO. For example:

LO10ClearCaches.hook
LO10UnmountNFS.hook
LO99Radmind.hook

This allows the administrator to add a script to the login or logout process simply by naming the script according to the above conventions, and placing it in /etc/hooks.

To disable individual scripts in /etc/hooks, the administrator can either remove the LI or LO prefix, or delete them from the directory. To disable the login or logout hook in the Login Window, the administrator can execute the following commands:

sudo defaults delete /Library/Preferences/com.apple.loginwindow LoginHook
sudo defaults delete /Library/Preferences/com.apple.loginwindow LogoutHook


Copyright (c) 2004 Regents of The University of Michigan
All Rights Reserved

[Radmind-commit] radmind-assistant/hooks LI00CheckUsername.hook,NONE,1.1 LI10SetupUserEnvironment.hook,NONE,1.1 LO00EjectDisks.hook,NONE,1.1 LO10CreateTemplateHomeCopy.hook,NONE,1.1 LO20UserAccounting.hook,NONE,1.1 login.hook,NONE,1.1 logout.hook,NONE,1.1 radmind.hook,NONE,1.1

[Andrew M. <fit...@us...>]

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

Added Files:
	LI00CheckUsername.hook LI10SetupUserEnvironment.hook 
	LO00EjectDisks.hook LO10CreateTemplateHomeCopy.hook 
	LO20UserAccounting.hook login.hook logout.hook radmind.hook 
Log Message:
Support scripts for Radmind automation.


--- NEW FILE: LO10CreateTemplateHomeCopy.hook ---
#! /bin/sh

# create a copy of the template home directory for the next user

export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin

# get the location of the template home directory
. /etc/radmind.defaults

# default system user template
SYSHOMETEMPLATE="/System/Library/User Template/English.lproj"

echo Creating template user copy...
echo %BEGINPOLE

mkdir -m 0700 -p ${TMPHOME}

if [ ! -d ${HOMETEMPLATE} ]; then
    logger -is ${HOMETEMPLATE} does not exist, using ${SYSHOMETEMPLATE}
    HOMETEMPLATE=${SYSHOMETEMPLATE}
fi

ditto --rsrc "${HOMETEMPLATE}" ${TMPHOME}

if [ $? -ne 0 ]; then
    logger -is Failed to copy ${HOMETEMPLATE} to ${TMPHOME}
    exit 2
fi

echo %ENDPOLE

exit 0

--- NEW FILE: LO00EjectDisks.hook ---
#! /bin/sh

# Eject removable media for the logging out user

export PATH=/bin:/usr/bin:/usr/sbin

# ejectexclude must exist. It lists which disks to ignore.
ejectexclude="/etc/hooks/ejectexclude"

if [ ! -f $ejectexclude ]; then
    logger -is Exclude file ${ejectexclude} not found.
    exit 1
fi

echo %BEGINPOLE
echo Ejecting removable media...

# enumerate mounted disks in /dev, and eject those not in ejectexclude
for disk in `ls /dev/disk* | egrep -v -f ${ejectexclude}`; do
    echo Ejecting ${disk}
    hdiutil eject -quiet -force ${disk}
done

exit 0

--- NEW FILE: logout.hook ---
#! /bin/sh

# calls iHook with the path to the real script

export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin

ihook="/Applications/Utilities/iHook.app/Contents/MacOS/iHook"
script="/etc/hooks/masterlogout.sh"
hookdir="/etc/hooks"
hooks=`find ${hookdir} -name \*.hook | head -1`
useihook=yes

if [ ! -x ${ihook} -o -z "$hooks" ]; then
    logger -si -t $0 Not using iHook.
    useihook=""
fi

if [ ${useihook} ]; then
    # run iHook without a titlebar and pass all parameters to the script   
    ${ihook} --no-titlebar --script=${script} $*
else
    # run the scripts without iHook
    ${script} $*
fi

rc=$?

if [ $rc -ne 0 ]; then
    logger -si -t $0 Abnormal exit status $rc.
fi

exit $rc

--- NEW FILE: LI10SetupUserEnvironment.hook ---
#! /bin/sh

# moves a copy of the template user home directory
# to the appropriate location, and changes the 
# owner to the logging in user

export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin

kill_login_window() {
    local lwpid=`ps xcO command | grep loginwindow | awk '{ print $1 }'`

    kill ${lwpid}
    exit 0	# shouldn't get here
}


LIUSER="$1"

if [ -z ${LIUSER} ]; then
    logger -is Username is zero-length
    exit 0
fi

USERDIR="/Users/${LIUSER}"
PREVUSERDIR="/Users/.old/${LIUSER}"
SYSHOMETEMPLATE="/System/Library/User Template/English.lproj"

# get location of template copy
. /etc/radmind.defaults

if [ ! -d ${HOMETEMPLATE} ]; then
    HOMETEMPLATE=${SYSHOMETEMPLATE}
fi

# the last file copied. If it exists, the home directory 
# can be considered valid, as all components are there.
cd "${HOMETEMPLATE}"
LASTFILE=`find . | tail -1`

if [ -d ${USERDIR} ]; then
    chown -R ${LIUSER}:staff ${USERDIR}
    chmod -R go-rwx ${USERDIR}
    exit 0
fi

# if they've logged in recently, restore their home
if [ -d ${PREVUSERDIR} ]; then
    if [ -f ${PREVUSERDIR}/${LASTFILE} ]; then
	logger -is Restoring ${USERDIR}...
	mv ${PREVUSERDIR} ${USERDIR}
    else
	logger -is ${PREVUSERDIR} is incomplete
	rm -rf ${PREVUSERDIR}	# give them a clean copy
    fi
fi

if [ ! -d ${USERDIR} ]; then
    if [ ! -d ${TMPHOME} ]; then
	mkdir ${USERDIR}
	ditto -rsrcFork ${HOMETEMPLATE} ${USERDIR}
	if [ $? -ne 0 ]; then
	    logger -is Failed to create a home directory for ${LIUSER}\!
	fi
    else
	mv ${TMPHOME} ${USERDIR}
	if [ $? -ne 0 ]; then
	    logger -is Failed to move ${TMPHOME} to ${USERDIR}
	    kill_login_window
	fi
    fi
fi

if [ ! -f ${USERDIR}/${LASTFILE} ]; then
    logger -is Creation of ${USERDIR} incomplete
fi

chown -R ${LIUSER}:staff ${USERDIR}

if [ $? -ne 0 ]; then
    logger -is Failed to change owner of ${USERDIR} to ${LIUSER}
    kill_login_window
fi

chmod -R go-rwx ${USERDIR}

if [ $? -ne 0 ]; then
    logger -is Failed to make ${USERDIR} readable by ${LIUSER} only
    kill_login_window
fi

exit 0

--- NEW FILE: radmind.hook ---
#! /bin/sh

export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin
preapply="/var/radmind/preapply"
postapply="/var/radmind/postapply"
logfile="/var/log/ihook-radmind.log"

echo %BECOMEKEY    
echo %UIMODE AUTOCRATIC    
echo %WINDOWLEVEL HIGH
echo %LOG OPEN ${logfile}

# Uncomment the following line if you want 
# the cancel button to be enabled during
# the check for updates.

# echo %CANCEL ENABLE

trap "exit 0" 15

if [ -f /var/radmind/client/.DoNotRadmind ]; then
    echo Bypassing radmind.
    sleep 2
    exit 0   
fi    

# Source config file to get default values
. /etc/radmind.defaults

if [ -f /var/radmind/client/.RadmindWithChecksums ]; then
    # force use of checksums
    CHECKSUM="-c sha1"
fi

cd /

echo %BEGINPOLE
echo Checking for changes on the server...

KTFILE=`mktemp -q ${RMTMPDIR}/.radmind-ktcheck.$$.XXXXXX` || \
		(logger -si -t $0 mktemp failed && exit 2)

ktcheck -c sha1 -i -w ${TLSLEVEL} -h ${SERVER} > "${KTFILE}" 2>&1 
rc="$?"

while [ ${rc} -ge 2 ]; do
    output=`head -n 1 "${KTFILE}"`
    if test "`echo ${output} | egrep 'STARTTLS|handshake'`"; then
	# TLSLEVEL needs to be upped
	TLSLEVEL=`expr $TLSLEVEL + 1`
	if [ $TLSLEVEL -gt 2 ]; then
	    # we've reached the limit of sanity
	    echo TLS handling failed.
	    exit 2
	fi
    elif test "`echo ${output} | egrep 'unknown protocol|cert.pem'`"; then
	# TLSLEVEL needs to be lowered
	TLSLEVEL=`expr $TLSLEVEL - 1`
	if [ $TLSLEVEL -lt 0 ]; then
	    # we've reached the limit of sanity
	    echo TLS handling failed.
	    exit 2
	fi
    else
	# another error occurred
	echo An error occurred checking for updates.
	exit 2
    fi

    # display the error and run the check again
    echo ${output}
    echo Setting TLS level to $TLSLEVEL and trying again...

    ktcheck -c sha1 -i -w ${TLSLEVEL} -h ${SERVER} > "${KTFILE}" 2>&1 
    rc="$?"
done

cat "${KTFILE}" 1>&2

if [ -f "${KTFILE}" ]; then
    rm -f "${KTFILE}"
fi

case "$rc" in
    0)
        echo No updates.
        sleep 2

        if [ -f /var/radmind/client/.RadmindRunning ]; then
            echo Continuing with Radmind session...
	    sleep 1
        else  
	    exit 0
	fi
        ;;

    1)
        echo Updates found.
        sleep 5
        ;;

    *)
	
        echo An error occurred while checking for updates.
        exit $rc
        ;;
esac

echo %CANCEL REMOVE

# Touch a file to indicate that the radmind session has begun.
touch /var/radmind/client/.RadmindRunning

# Create a temp file that fsdiff will use for its output.
template="${RMTMPDIR}/.radmind.$$.XXXXXX"
DIFFDIR=`mktemp -qd ${template}` || exit 1
FSDIFFOUTPUT="${DIFFDIR}/diff.T"

# check to see if we should run fsdiff case-insensitively
version=`fsdiff -V | head -1 | sed -e 's/rc.$//g' -e 's/\.//g'`
if [ ${version} -ge 151 ]; then
    # versions 1.5.1 and above support -I
    #
    # this if block is intended to allow changing from
    # case-sensitive to -insensitive scans. Once it's
    # in place, the setting should be enabled in
    # the defaults file.
    grep -i "case-insensitive" /var/radmind/client/command.K > /dev/null 2>&1
    if [ $? -eq 0 ]; then
	CASE="-I"
    fi
fi

while true; do

    echo Examining the filesystem for differences...

    fsdiff ${CASE} ${CHECKSUM} -o ${FSDIFFOUTPUT} -% -A ${FSDIFFPATH}

    case "$?" in
        0)
            ;;

        *)
            echo An error occurred while checking for filesystem differences.
            exit 1
            ;;
    esac

    # Check the output file size. If 0, skip the lapply step.
    if [ -s ${FSDIFFOUTPUT} ]; then
	# run any scripts in the pre-apply directory
	if [ -d ${preapply} ]; then
	    for script in "${preapply}/*"; do
		${script} ${FSDIFFOUTPUT}
	    done
	fi

	echo %70
        echo Applying changes from server...
        lapply ${CASE} ${CHECKSUM} -i -% -h ${SERVER} \
		 -w ${TLSLEVEL} ${FSDIFFOUTPUT}

        case "$?" in
        0)
            break
            ;;

        *)
	    logger -is -t $0 An error occurred. Trying again...
            echo An error occurred while applying changes. Trying again...
            echo %OPENDRAWER
            sleep 2
            echo %BEGINPOLE
            echo Checking for changes on the server...
            ktcheck -c sha1 -i -w ${TLSLEVEL} -h ${SERVER} 1>&2
            continue
            ;;

        esac
    else
        echo No changes necessary.
        break
    fi
done

# run any scripts in the post-apply directory
if [ -d ${postapply} ]; then
    for script in "${postapply}/*"; do
	${script} ${FSDIFFOUTPUT}
    done
fi

# remove the temporary file we used with fsdiff
rm -f ${FSDIFFOUTPUT}

logger -i -s -t $0 Radmind update complete at `date`
echo %100
echo Update complete, rebooting the system.
sleep 2

# Remove the flag to indicate that the radmind session is complete.
rm -f /var/radmind/client/.RadmindRunning
rm -f /var/radmind/client/.RadmindWithChecksums

# Remove the Extensions caches, if necessary
if [ -f /System/Library/Extensions.mkext \
             -a -n "`find /System/Library/Extensions \
                        -newer /System/Library/Extensions.mkext`" ]; then
    rm -f /System/Library/Extensions.mkext
    rm -f /System/Library/Extensions.kextcache
fi

# clear the OS Caches
rm -f /System/Library/Caches/*
rm -f /Library/Caches/*

echo %LOG CLOSE

/bin/sync; /bin/sync; /bin/sync
/sbin/shutdown -r now

--- NEW FILE: login.hook ---
#! /bin/sh

# calls iHook with the path to the real script

export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin

ihook="/Applications/Utilities/iHook.app/Contents/MacOS/iHook"
script="/etc/hooks/masterlogin.sh"
hookdir="/etc/hooks"
hooks=`find ${hookdir} -name \*.hook | head -1`
useihook=yes

if [ ! -x ${ihook} -o -z "$hooks" ]; then
    logger -si -t $0 Not using iHook.
    useihook=""
fi

if [ ${useihook} ]; then
    # run iHook without a titlebar and pass all parameters to the script   
    ${ihook} --no-titlebar --script=${script} $*
else
    # run the scripts without iHook
    ${script} $*
fi

rc=$?

if [ $rc -ne 0 ]; then
    logger -si -t $0 Abnormal exit status $rc.
fi

exit $rc

--- NEW FILE: LO20UserAccounting.hook ---
#! /bin/sh

# check disk space and modification time of user directories
# to determine if they should be removed.

export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin

remove_item() {
    # remove immutable flags
    chflags -R noschg,nouchg "$1"
    rm -rf "$1"
}

# get the max disk usage and time limit
. /etc/radmind.defaults

CURRENTUSER="/Users/$1"
OLDUSERS="/Users/.old"
DELETABLE=1

if [ x"$1" = x"$IGNOREDUSER" ]; then
    logger -is Ignored user ${IGNOREDUSER} logging out
    DELETABLE=0
fi

# kill all processes owned by user
killall -KILL -u $1 2>/dev/null

# touch the logging out user's folder so it's
# not removed if the user was on for more than
# MAXHOMELIFE
if [ -d ${CURRENTUSER} ]; then
    touch ${CURRENTUSER}
fi

# move user directory to old users directory
mkdir -p -m 0700 ${OLDUSERS}

if [ -d ${OLDUSERS} ]; then
    if [ ${DELETABLE} -eq 1 ]; then
	chown root:wheel ${OLDUSERS}
	mv ${CURRENTUSER} ${OLDUSERS}
    fi
else
    logger -is Failed to create ${OLDUSERS}
    exit 1
fi

echo Doing user accounting...

echo %0

for item in ${OLDUSERS}/*; do
    echo Checking modification date of ${item}...
    logger -is Checking modification date of ${item}...

    echo %30 Checking date of ${item}...

    # delete the directory if it's older than MAXHOMELIFE
    if test `find ${item} -prune ! -newermt "${MAXHOMELIFE}" -print0`; then
	logger -is ${item} is too old. Deleting...
	echo ${item} is too old. Deleting...
	remove_item ${item}
	echo %99 ${item} deleted
    fi
done

# if disk usage exceeds limit, delete old user folders, oldest first
for item in `ls -rt ${OLDUSERS}`; do
    diskusage=`df / | sed '/Filesystem/d' | awk '{ print $5 }' | sed 's/%//'`

    if [ $diskusage -lt ${MAXDISKUSAGE} ]; then
	break
    fi

    logger -is "Disk usage ($diskusage\%) exceeds limit. Deleting ${item}..."
    echo Disk usage exceeds limit. Deleting ${item}...
    remove_item ${OLDUSERS}/${item}
    echo %99 ${OLDUSERS}/${item} deleted
done

diskusage=`df / | sed '/Filesystem/d' | awk '{ print $5 }' | sed 's/%//'`

if [ $diskusage -gt ${MAXDISKUSAGE} ]; then
    logger -is Disk usage limit exceed after removing temporary home folders\!
    logger -is $diskusage\% exceeds limit of ${MAXDISKUSAGE}\%.
    logger -is Aborting logout.
    exit 1
fi

echo %99

exit 0

--- NEW FILE: LI00CheckUsername.hook ---
#! /bin/sh

# Check the name of the logging in user.
# If the name is "radmind", begin
# a radmind session and reboot when done.

export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin

user="$1"
radmindhook="/etc/hooks/radmind.hook"

if [ x"$user" = x"radmind" ]; then

    # touch file to force full update
    touch /var/radmind/client/.RadmindRunning 
    
    # run radmind hook
    if [ -f ${radmindhook} -a -x ${radmindhook} ]; then
	${radmindhook} $*
    fi

    rm -f /var/radmind/client/.RadmindRunning
    /bin/sync; /bin/sync; /bin/sync
    /sbin/reboot
fi

exit 0

[Radmind-commit] radmind-assistant/hooks - New directory

[Andrew M. <fit...@us...>]

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

Log Message:
Directory /cvsroot/radmind/radmind-assistant/hooks added to the repository

[Radmind-commit] radmind-assistant/Radmind Assistant.xcodeproj project.pbxproj,1.4,1.5

[Andrew M. <fit...@us...>]

Update of /cvsroot/radmind/radmind-assistant/Radmind Assistant.xcodeproj
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27880/Radmind Assistant.xcodeproj

Modified Files:
	project.pbxproj 
Log Message:
Xcode native.
Universal binary build settings.
sub-project targets: rmauthexec, RadmindUpdateMonitor, rumd


Index: project.pbxproj
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/Radmind Assistant.xcodeproj/project.pbxproj,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** project.pbxproj	18 Nov 2005 15:23:39 -0000	1.4
--- project.pbxproj	24 Feb 2006 22:24:31 -0000	1.5
***************
*** 38,41 ****
--- 38,59 ----
  		096042A2089C103A00141CA2 /* libssl.0.9.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 096042A0089C103A00141CA2 /* libssl.0.9.7.dylib */; };
  		09604396089D8B4400141CA2 /* certificate.png in Resources */ = {isa = PBXBuildFile; fileRef = 09604395089D8B4400141CA2 /* certificate.png */; };
+ 		097B78D009A61AAA00427C2C /* pidforname.c in Sources */ = {isa = PBXBuildFile; fileRef = 09485C61063077550019D70B /* pidforname.c */; };
+ 		097B78D109A61AAF00427C2C /* argcargv.c in Sources */ = {isa = PBXBuildFile; fileRef = 237A1BAE039E8C40FED5EA79 /* argcargv.c */; };
+ 		097B78D209A61AB400427C2C /* rumd.c in Sources */ = {isa = PBXBuildFile; fileRef = 097B78CE09A61A9000427C2C /* rumd.c */; };
+ 		097B78D309A61AC100427C2C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 095A1DC2092A4AA40094056D /* CoreFoundation.framework */; };
+ 		097B790909A61B0E00427C2C /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 097B790809A61B0E00427C2C /* SystemConfiguration.framework */; };
+ 		097B797009A632AA00427C2C /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 097B795F09A6327100427C2C /* main.m */; };
+ 		097B797109A632B000427C2C /* RUMController.m in Sources */ = {isa = PBXBuildFile; fileRef = 097B796209A6327100427C2C /* RUMController.m */; };
+ 		097B798409A6506600427C2C /* RUMController.h in Headers */ = {isa = PBXBuildFile; fileRef = 097B796109A6327100427C2C /* RUMController.h */; };
+ 		097B798809A650B500427C2C /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
+ 		097B799309A6525600427C2C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 097B798F09A6525600427C2C /* InfoPlist.strings */; };
+ 		097B799409A6525600427C2C /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 097B799109A6525600427C2C /* MainMenu.nib */; };
+ 		097B799609A652D900427C2C /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 097B799509A652D900427C2C /* Info.plist */; };
+ 		097B79A809A6537800427C2C /* BrightNuclearBrain.png in Resources */ = {isa = PBXBuildFile; fileRef = 097B79A209A6537800427C2C /* BrightNuclearBrain.png */; };
+ 		097B79A909A6537800427C2C /* NuclearBrain.png in Resources */ = {isa = PBXBuildFile; fileRef = 097B79A309A6537800427C2C /* NuclearBrain.png */; };
+ 		097B79AA09A6537800427C2C /* RUMError.png in Resources */ = {isa = PBXBuildFile; fileRef = 097B79A409A6537800427C2C /* RUMError.png */; };
+ 		097B79AB09A6537800427C2C /* RUMUpdateFrame1.png in Resources */ = {isa = PBXBuildFile; fileRef = 097B79A509A6537800427C2C /* RUMUpdateFrame1.png */; };
+ 		097B79AC09A6537800427C2C /* RUMUpdateFrame2.png in Resources */ = {isa = PBXBuildFile; fileRef = 097B79A609A6537800427C2C /* RUMUpdateFrame2.png */; };
+ 		097B79AD09A6537800427C2C /* RUMUpdateFrame3.png in Resources */ = {isa = PBXBuildFile; fileRef = 097B79A709A6537800427C2C /* RUMUpdateFrame3.png */; };
  		09998417082BB2B300D082B8 /* 10.4-desktop-negative.T in Resources */ = {isa = PBXBuildFile; fileRef = 09998415082BB2B300D082B8 /* 10.4-desktop-negative.T */; };
  		09998418082BB2B300D082B8 /* 10.4-lab-negative.T in Resources */ = {isa = PBXBuildFile; fileRef = 09998416082BB2B300D082B8 /* 10.4-lab-negative.T */; };
***************
*** 58,64 ****
  		09B3F06E054D917300D8F843 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
  		09B3F06F054D917300D8F843 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
- 		09B3F071054D917300D8F843 /* template.term in Resources */ = {isa = PBXBuildFile; fileRef = F5F3146B030209D901A8002B /* template.term */; };
  		09B3F072054D917300D8F843 /* background.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F538D7AB030D627601A8002B /* background.tiff */; };
- 		09B3F074054D917300D8F843 /* rmauthexec in Resources */ = {isa = PBXBuildFile; fileRef = F55C2363035F57A301F73991 /* rmauthexec */; };
  		09B3F075054D917300D8F843 /* errorbrain.png in Resources */ = {isa = PBXBuildFile; fileRef = 23405C150383366AFE7F0047 /* errorbrain.png */; };
  		09B3F076054D917300D8F843 /* 10.2-desktop-negative.T in Resources */ = {isa = PBXBuildFile; fileRef = 09496FBD044F47A7002B5F5A /* 10.2-desktop-negative.T */; };
--- 76,80 ----
***************
*** 103,110 ****
  		09B68D1C057F95220005EA41 /* usermanagement.png in Resources */ = {isa = PBXBuildFile; fileRef = 09B68D1B057F95220005EA41 /* usermanagement.png */; };
  		09C8AB5D092E2578009189DB /* RadmindUpdateMonitor in Resources */ = {isa = PBXBuildFile; fileRef = 09C8AB5A092E2578009189DB /* RadmindUpdateMonitor */; };
- 		09C8AB5E092E2578009189DB /* rumd in Resources */ = {isa = PBXBuildFile; fileRef = 09C8AB5B092E2578009189DB /* rumd */; };
  		09C8AB5F092E2578009189DB /* rumd-StartupParamenters.plist in Resources */ = {isa = PBXBuildFile; fileRef = 09C8AB5C092E2578009189DB /* rumd-StartupParamenters.plist */; };
  		09E0A32708AD39CC00F026EC /* RAAuthKiller.h in Headers */ = {isa = PBXBuildFile; fileRef = 09E0A32508AD39CC00F026EC /* RAAuthKiller.h */; };
  		09E0A32808AD39CC00F026EC /* RAAuthKiller.m in Sources */ = {isa = PBXBuildFile; fileRef = 09E0A32608AD39CC00F026EC /* RAAuthKiller.m */; };
  /* End PBXBuildFile section */
  
--- 119,138 ----
  		09B68D1C057F95220005EA41 /* usermanagement.png in Resources */ = {isa = PBXBuildFile; fileRef = 09B68D1B057F95220005EA41 /* usermanagement.png */; };
  		09C8AB5D092E2578009189DB /* RadmindUpdateMonitor in Resources */ = {isa = PBXBuildFile; fileRef = 09C8AB5A092E2578009189DB /* RadmindUpdateMonitor */; };
  		09C8AB5F092E2578009189DB /* rumd-StartupParamenters.plist in Resources */ = {isa = PBXBuildFile; fileRef = 09C8AB5C092E2578009189DB /* rumd-StartupParamenters.plist */; };
  		09E0A32708AD39CC00F026EC /* RAAuthKiller.h in Headers */ = {isa = PBXBuildFile; fileRef = 09E0A32508AD39CC00F026EC /* RAAuthKiller.h */; };
  		09E0A32808AD39CC00F026EC /* RAAuthKiller.m in Sources */ = {isa = PBXBuildFile; fileRef = 09E0A32608AD39CC00F026EC /* RAAuthKiller.m */; };
+ 		09EFC3A6099D150A00A7D599 /* pidforname.c in Sources */ = {isa = PBXBuildFile; fileRef = 09485C61063077550019D70B /* pidforname.c */; };
+ 		09EFC3A8099D150A00A7D599 /* rmauthexec.c in Sources */ = {isa = PBXBuildFile; fileRef = F5FBE074031341B501A8002B /* rmauthexec.c */; };
+ 		09EFC3A9099D150A00A7D599 /* selfrepair.c in Sources */ = {isa = PBXBuildFile; fileRef = 09A1051F04BC70C6001177FB /* selfrepair.c */; };
+ 		09EFC3AB099D150A00A7D599 /* defaults.c in Sources */ = {isa = PBXBuildFile; fileRef = 09AD2A89053DEB4D00D5EACC /* defaults.c */; };
+ 		09EFC3AD099D150A00A7D599 /* automator.c in Sources */ = {isa = PBXBuildFile; fileRef = 0907B6B00544360C00037946 /* automator.c */; };
+ 		09EFC3AF099D150A00A7D599 /* copy.c in Sources */ = {isa = PBXBuildFile; fileRef = 0907B6B20544360C00037946 /* copy.c */; };
+ 		09EFC3B1099D150A00A7D599 /* makedir.c in Sources */ = {isa = PBXBuildFile; fileRef = 0907B6B40544360C00037946 /* makedir.c */; };
+ 		09EFC3B3099D152700A7D599 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 095A1DC2092A4AA40094056D /* CoreFoundation.framework */; };
+ 		09EFC3B4099D152B00A7D599 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5C109BB02DF678001D5EA79 /* Security.framework */; };
+ 		09EFC3B7099D157D00A7D599 /* kvalid.c in Sources */ = {isa = PBXBuildFile; fileRef = 09EFC3B6099D157D00A7D599 /* kvalid.c */; };
+ 		09EFC3BE099D15A300A7D599 /* prepost.c in Sources */ = {isa = PBXBuildFile; fileRef = 09EFC3B9099D15A300A7D599 /* prepost.c */; };
+ 		09EFC3BF099D15A300A7D599 /* rummgmt.c in Sources */ = {isa = PBXBuildFile; fileRef = 09EFC3BC099D15A300A7D599 /* rummgmt.c */; };
+ 		09EFC3C1099D15C600A7D599 /* argcargv.c in Sources */ = {isa = PBXBuildFile; fileRef = 237A1BAE039E8C40FED5EA79 /* argcargv.c */; };
  /* End PBXBuildFile section */
  
***************
*** 134,137 ****
--- 162,189 ----
  /* End PBXBuildStyle section */
  
+ /* Begin PBXContainerItemProxy section */
+ 		097B791D09A61B2500427C2C /* PBXContainerItemProxy */ = {
+ 			isa = PBXContainerItemProxy;
+ 			containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+ 			proxyType = 1;
+ 			remoteGlobalIDString = 097B78C009A61A4600427C2C;
+ 			remoteInfo = rumd;
+ 		};
+ 		097B79DB09A6594400427C2C /* PBXContainerItemProxy */ = {
+ 			isa = PBXContainerItemProxy;
+ 			containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+ 			proxyType = 1;
+ 			remoteGlobalIDString = 097B796809A6329C00427C2C;
+ 			remoteInfo = "Radmind Update Monitor";
+ 		};
+ 		09EFC39F099D14CC00A7D599 /* PBXContainerItemProxy */ = {
+ 			isa = PBXContainerItemProxy;
+ 			containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+ 			proxyType = 1;
+ 			remoteGlobalIDString = 09EFC39A099D14BD00A7D599;
+ 			remoteInfo = rmauthexec;
+ 		};
+ /* End PBXContainerItemProxy section */
+ 
  /* Begin PBXFileReference section */
  		089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
***************
*** 188,191 ****
--- 240,260 ----
  		09718ADB0466D72D003C81A3 /* NSString(ComparisonExtensions).h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString(ComparisonExtensions).h"; sourceTree = "<group>"; };
  		09718ADC0466D72D003C81A3 /* NSString(ComparisonExtensions).m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString(ComparisonExtensions).m"; sourceTree = "<group>"; };
+ 		097B78C109A61A4600427C2C /* rumd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = rumd; sourceTree = BUILT_PRODUCTS_DIR; };
+ 		097B78CE09A61A9000427C2C /* rumd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rumd.c; sourceTree = "<group>"; };
+ 		097B790809A61B0E00427C2C /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = /System/Library/Frameworks/SystemConfiguration.framework; sourceTree = "<absolute>"; };
+ 		097B795F09A6327100427C2C /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = rum/main.m; sourceTree = "<group>"; };
+ 		097B796009A6327100427C2C /* rum_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rum_Prefix.pch; path = rum/rum_Prefix.pch; sourceTree = "<group>"; };
+ 		097B796109A6327100427C2C /* RUMController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RUMController.h; path = rum/RUMController.h; sourceTree = "<group>"; };
+ 		097B796209A6327100427C2C /* RUMController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RUMController.m; path = rum/RUMController.m; sourceTree = "<group>"; };
+ 		097B796909A6329C00427C2C /* RadmindUpdateMonitor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RadmindUpdateMonitor.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ 		097B799009A6525600427C2C /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = rum/English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+ 		097B799209A6525600427C2C /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = rum/English.lproj/MainMenu.nib; sourceTree = "<group>"; };
+ 		097B799509A652D900427C2C /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = Info.plist; path = rum/Info.plist; sourceTree = "<group>"; };
+ 		097B79A209A6537800427C2C /* BrightNuclearBrain.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = BrightNuclearBrain.png; path = rum/BrightNuclearBrain.png; sourceTree = "<group>"; };
+ 		097B79A309A6537800427C2C /* NuclearBrain.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = NuclearBrain.png; path = rum/NuclearBrain.png; sourceTree = "<group>"; };
+ 		097B79A409A6537800427C2C /* RUMError.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RUMError.png; path = rum/RUMError.png; sourceTree = "<group>"; };
+ 		097B79A509A6537800427C2C /* RUMUpdateFrame1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RUMUpdateFrame1.png; path = rum/RUMUpdateFrame1.png; sourceTree = "<group>"; };
+ 		097B79A609A6537800427C2C /* RUMUpdateFrame2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RUMUpdateFrame2.png; path = rum/RUMUpdateFrame2.png; sourceTree = "<group>"; };
+ 		097B79A709A6537800427C2C /* RUMUpdateFrame3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RUMUpdateFrame3.png; path = rum/RUMUpdateFrame3.png; sourceTree = "<group>"; };
  		0981941A044DF0FA002B5F5A /* RASplitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RASplitView.h; sourceTree = "<group>"; };
  		0981941B044DF0FA002B5F5A /* RASplitView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RASplitView.m; sourceTree = "<group>"; };
***************
*** 213,217 ****
  		09B68D1B057F95220005EA41 /* usermanagement.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = usermanagement.png; sourceTree = "<group>"; };
  		09C8AB5A092E2578009189DB /* RadmindUpdateMonitor */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = RadmindUpdateMonitor; sourceTree = "<group>"; };
- 		09C8AB5B092E2578009189DB /* rumd */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = rumd; sourceTree = "<group>"; };
  		09C8AB5C092E2578009189DB /* rumd-StartupParamenters.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = "rumd-StartupParamenters.plist"; sourceTree = "<group>"; };
  		09CBBB9204F2D3D200D5E7CB /* NSWorkspace(QuitOtherApplications).h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSWorkspace(QuitOtherApplications).h"; sourceTree = "<group>"; };
--- 282,285 ----
***************
*** 221,224 ****
--- 289,300 ----
  		09E40638054995DD001EE69A /* 10.3-desktop-negative.T */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "10.3-desktop-negative.T"; sourceTree = "<group>"; };
  		09E4063A054995DD001EE69A /* 10.3-lab-negative.T */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "10.3-lab-negative.T"; sourceTree = "<group>"; };
+ 		09EFC39B099D14BD00A7D599 /* rmauthexec */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = rmauthexec; sourceTree = BUILT_PRODUCTS_DIR; };
+ 		09EFC3B6099D157D00A7D599 /* kvalid.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = kvalid.c; sourceTree = "<group>"; };
+ 		09EFC3B8099D15A300A7D599 /* kvalid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kvalid.h; sourceTree = "<group>"; };
+ 		09EFC3B9099D15A300A7D599 /* prepost.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = prepost.c; sourceTree = "<group>"; };
+ 		09EFC3BA099D15A300A7D599 /* prepost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = prepost.h; sourceTree = "<group>"; };
+ 		09EFC3BB099D15A300A7D599 /* rmauthexec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rmauthexec.h; sourceTree = "<group>"; };
+ 		09EFC3BC099D15A300A7D599 /* rummgmt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rummgmt.c; sourceTree = "<group>"; };
+ 		09EFC3BD099D15A300A7D599 /* rummgmt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rummgmt.h; sourceTree = "<group>"; };
  		09F12F4B0494ED5600A8022B /* 10.2-lab-negative.T */ = {isa = PBXFileReference; lastKnownFileType = text; path = "10.2-lab-negative.T"; sourceTree = "<group>"; };
  		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
***************
*** 243,255 ****
  		F501DF9A02F5B0A201A8002B /* RAAuthExec.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = RAAuthExec.m; sourceTree = "<group>"; };
  		F538D7AB030D627601A8002B /* background.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = background.tiff; sourceTree = "<group>"; };
- 		F55C2363035F57A301F73991 /* rmauthexec */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = rmauthexec; sourceTree = "<group>"; };
  		F5C109BB02DF678001D5EA79 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
  		F5F31467030208D301A8002B /* RAEditorLauncher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RAEditorLauncher.h; sourceTree = "<group>"; };
  		F5F31468030208D301A8002B /* RAEditorLauncher.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = RAEditorLauncher.m; sourceTree = "<group>"; };
- 		F5F3146B030209D901A8002B /* template.term */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = template.term; sourceTree = "<group>"; };
  		F5FBE074031341B501A8002B /* rmauthexec.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = rmauthexec.c; sourceTree = "<group>"; };
  /* End PBXFileReference section */
  
  /* Begin PBXFrameworksBuildPhase section */
  		09B3F0A1054D917300D8F843 /* Frameworks */ = {
  			isa = PBXFrameworksBuildPhase;
--- 319,346 ----
  		F501DF9A02F5B0A201A8002B /* RAAuthExec.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = RAAuthExec.m; sourceTree = "<group>"; };
  		F538D7AB030D627601A8002B /* background.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = background.tiff; sourceTree = "<group>"; };
  		F5C109BB02DF678001D5EA79 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
  		F5F31467030208D301A8002B /* RAEditorLauncher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RAEditorLauncher.h; sourceTree = "<group>"; };
  		F5F31468030208D301A8002B /* RAEditorLauncher.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = RAEditorLauncher.m; sourceTree = "<group>"; };
  		F5FBE074031341B501A8002B /* rmauthexec.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = rmauthexec.c; sourceTree = "<group>"; };
  /* End PBXFileReference section */
  
  /* Begin PBXFrameworksBuildPhase section */
+ 		097B78BF09A61A4600427C2C /* Frameworks */ = {
+ 			isa = PBXFrameworksBuildPhase;
+ 			buildActionMask = 2147483647;
+ 			files = (
+ 				097B78D309A61AC100427C2C /* CoreFoundation.framework in Frameworks */,
+ 				097B790909A61B0E00427C2C /* SystemConfiguration.framework in Frameworks */,
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+ 		};
+ 		097B796709A6329C00427C2C /* Frameworks */ = {
+ 			isa = PBXFrameworksBuildPhase;
+ 			buildActionMask = 2147483647;
+ 			files = (
+ 				097B798809A650B500427C2C /* Cocoa.framework in Frameworks */,
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+ 		};
  		09B3F0A1054D917300D8F843 /* Frameworks */ = {
  			isa = PBXFrameworksBuildPhase;
***************
*** 266,269 ****
--- 357,369 ----
  			runOnlyForDeploymentPostprocessing = 0;
  		};
+ 		09EFC399099D14BD00A7D599 /* Frameworks */ = {
+ 			isa = PBXFrameworksBuildPhase;
+ 			buildActionMask = 2147483647;
+ 			files = (
+ 				09EFC3B4099D152B00A7D599 /* Security.framework in Frameworks */,
+ 				09EFC3B3099D152700A7D599 /* CoreFoundation.framework in Frameworks */,
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+ 		};
  /* End PBXFrameworksBuildPhase section */
  
***************
*** 317,326 ****
  			sourceTree = "<group>";
  		};
! 		09A1052304BC70D4001177FB /* Authorized Tool */ = {
  			isa = PBXGroup;
  			children = (
! 				09485C61063077550019D70B /* pidforname.c */,
! 				09485C62063077550019D70B /* pidforname.h */,
  				F5FBE074031341B501A8002B /* rmauthexec.c */,
  				09A1051F04BC70C6001177FB /* selfrepair.c */,
  				09A1052004BC70C6001177FB /* selfrepair.h */,
--- 417,474 ----
  			sourceTree = "<group>";
  		};
! 		097B78C909A61A7100427C2C /* rumd */ = {
  			isa = PBXGroup;
  			children = (
! 				097B78CE09A61A9000427C2C /* rumd.c */,
! 			);
! 			name = rumd;
! 			sourceTree = "<group>";
! 		};
! 		097B795E09A6323200427C2C /* RUM */ = {
! 			isa = PBXGroup;
! 			children = (
! 				097B795F09A6327100427C2C /* main.m */,
! 				097B796009A6327100427C2C /* rum_Prefix.pch */,
! 				097B796109A6327100427C2C /* RUMController.h */,
! 				097B796209A6327100427C2C /* RUMController.m */,
! 			);
! 			name = RUM;
! 			sourceTree = "<group>";
! 		};
! 		097B798E09A6522900427C2C /* RUM */ = {
! 			isa = PBXGroup;
! 			children = (
! 				097B79A109A6534F00427C2C /* Images */,
! 				097B799509A652D900427C2C /* Info.plist */,
! 				097B798F09A6525600427C2C /* InfoPlist.strings */,
! 				097B799109A6525600427C2C /* MainMenu.nib */,
! 			);
! 			name = RUM;
! 			sourceTree = "<group>";
! 		};
! 		097B79A109A6534F00427C2C /* Images */ = {
! 			isa = PBXGroup;
! 			children = (
! 				097B79A209A6537800427C2C /* BrightNuclearBrain.png */,
! 				097B79A309A6537800427C2C /* NuclearBrain.png */,
! 				097B79A409A6537800427C2C /* RUMError.png */,
! 				097B79A509A6537800427C2C /* RUMUpdateFrame1.png */,
! 				097B79A609A6537800427C2C /* RUMUpdateFrame2.png */,
! 				097B79A709A6537800427C2C /* RUMUpdateFrame3.png */,
! 			);
! 			name = Images;
! 			sourceTree = "<group>";
! 		};
! 		09A1052304BC70D4001177FB /* rmauthexec */ = {
! 			isa = PBXGroup;
! 			children = (
! 				09EFC3B9099D15A300A7D599 /* prepost.c */,
! 				09EFC3BA099D15A300A7D599 /* prepost.h */,
! 				09EFC3BC099D15A300A7D599 /* rummgmt.c */,
! 				09EFC3BD099D15A300A7D599 /* rummgmt.h */,
! 				09EFC3B6099D157D00A7D599 /* kvalid.c */,
! 				09EFC3B8099D15A300A7D599 /* kvalid.h */,
  				F5FBE074031341B501A8002B /* rmauthexec.c */,
+ 				09EFC3BB099D15A300A7D599 /* rmauthexec.h */,
  				09A1051F04BC70C6001177FB /* selfrepair.c */,
  				09A1052004BC70C6001177FB /* selfrepair.h */,
***************
*** 334,338 ****
  				0907B6B50544360C00037946 /* makedir.h */,
  			);
! 			name = "Authorized Tool";
  			sourceTree = "<group>";
  		};
--- 482,486 ----
  				0907B6B50544360C00037946 /* makedir.h */,
  			);
! 			name = rmauthexec;
  			sourceTree = "<group>";
  		};
***************
*** 392,395 ****
--- 540,544 ----
  				29B97325FDCFA39411CA2CEA /* Foundation.framework */,
  				29B97324FDCFA39411CA2CEA /* AppKit.framework */,
+ 				097B790809A61B0E00427C2C /* SystemConfiguration.framework */,
  			);
  			name = "Other Frameworks";
***************
*** 400,403 ****
--- 549,555 ----
  			children = (
  				09B3F0A7054D917300D8F843 /* Radmind Assistant.app */,
+ 				09EFC39B099D14BD00A7D599 /* rmauthexec */,
+ 				097B78C109A61A4600427C2C /* rumd */,
+ 				097B796909A6329C00427C2C /* RadmindUpdateMonitor.app */,
  			);
  			name = Products;
***************
*** 456,459 ****
--- 608,614 ----
  				2342EA4803A00A3FFED5EA79 /* Subclasses */,
  				080E96DDFE201D6D7F000001 /* Classes */,
+ 				09A1052304BC70D4001177FB /* rmauthexec */,
+ 				097B78C909A61A7100427C2C /* rumd */,
+ 				097B795E09A6323200427C2C /* RUM */,
  				29B97315FDCFA39411CA2CEA /* Other Sources */,
  				29B97317FDCFA39411CA2CEA /* Resources */,
***************
*** 468,472 ****
  			isa = PBXGroup;
  			children = (
! 				09A1052304BC70D4001177FB /* Authorized Tool */,
  				2321DE3102B11447FED5EA67 /* authtools.c */,
  				2321DE3202B11447FED5EA67 /* authtools.h */,
--- 623,628 ----
  			isa = PBXGroup;
  			children = (
! 				09485C61063077550019D70B /* pidforname.c */,
! 				09485C62063077550019D70B /* pidforname.h */,
  				2321DE3102B11447FED5EA67 /* authtools.c */,
  				2321DE3202B11447FED5EA67 /* authtools.h */,
***************
*** 481,490 ****
  			isa = PBXGroup;
  			children = (
  				09C8AB59092E2526009189DB /* StartupItems */,
  				095A1EF8092AC0490094056D /* Transcripts */,
- 				F55C2363035F57A301F73991 /* rmauthexec */,
- 				09C8AB5B092E2578009189DB /* rumd */,
  				F5F9F52502A5A7B701D5EA79 /* Images */,
- 				F5F3146B030209D901A8002B /* template.term */,
  				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
  				09AD996B04EACAD900D5E7E3 /* COPYRIGHT.txt */,
--- 637,644 ----
  			isa = PBXGroup;
  			children = (
+ 				097B798E09A6522900427C2C /* RUM */,
  				09C8AB59092E2526009189DB /* StartupItems */,
  				095A1EF8092AC0490094056D /* Transcripts */,
  				F5F9F52502A5A7B701D5EA79 /* Images */,
  				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
  				09AD996B04EACAD900D5E7E3 /* COPYRIGHT.txt */,
***************
*** 529,532 ****
--- 683,694 ----
  
  /* Begin PBXHeadersBuildPhase section */
+ 		097B798209A6503B00427C2C /* Headers */ = {
+ 			isa = PBXHeadersBuildPhase;
+ 			buildActionMask = 2147483647;
+ 			files = (
+ 				097B798409A6506600427C2C /* RUMController.h in Headers */,
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+ 		};
  		09B3F05A054D917300D8F843 /* Headers */ = {
  			isa = PBXHeadersBuildPhase;
***************
*** 560,563 ****
--- 722,810 ----
  
  /* Begin PBXNativeTarget section */
+ 		097B78C009A61A4600427C2C /* rumd */ = {
+ 			isa = PBXNativeTarget;
+ 			buildConfigurationList = 097B78CA09A61A7100427C2C /* Build configuration list for PBXNativeTarget "rumd" */;
+ 			buildPhases = (
+ 				097B78BE09A61A4600427C2C /* Sources */,
+ 				097B78BF09A61A4600427C2C /* Frameworks */,
+ 			);
+ 			buildRules = (
+ 			);
+ 			buildSettings = {
+ 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ 				GCC_MODEL_TUNING = G5;
+ 				INSTALL_PATH = "$(HOME)/bin";
+ 				PREBINDING = NO;
+ 				PRODUCT_NAME = rumd;
+ 				ZERO_LINK = YES;
+ 			};
+ 			dependencies = (
+ 			);
+ 			name = rumd;
+ 			productName = rumd;
+ 			productReference = 097B78C109A61A4600427C2C /* rumd */;
+ 			productType = "com.apple.product-type.tool";
+ 		};
+ 		097B796809A6329C00427C2C /* Radmind Update Monitor */ = {
+ 			isa = PBXNativeTarget;
+ 			buildConfigurationList = 097B796C09A6329D00427C2C /* Build configuration list for PBXNativeTarget "Radmind Update Monitor" */;
+ 			buildPhases = (
+ 				097B798209A6503B00427C2C /* Headers */,
+ 				097B796509A6329C00427C2C /* Resources */,
+ 				097B796609A6329C00427C2C /* Sources */,
+ 				097B796709A6329C00427C2C /* Frameworks */,
+ 			);
+ 			buildRules = (
+ 			);
+ 			buildSettings = {
+ 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ 				GCC_MODEL_TUNING = G5;
+ 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+ 				INFOPLIST_FILE = "Radmind Update Monitor-Info.plist";
+ 				INSTALL_PATH = "$(HOME)/Applications";
+ 				OTHER_LDFLAGS = (
+ 					"-framework",
+ 					Foundation,
+ 					"-framework",
+ 					AppKit,
+ 				);
+ 				PREBINDING = NO;
+ 				PRODUCT_NAME = "Radmind Update Monitor";
+ 				WRAPPER_EXTENSION = app;
+ 				ZERO_LINK = YES;
+ 			};
+ 			dependencies = (
+ 			);
+ 			name = "Radmind Update Monitor";
+ 			productName = "Radmind Update Monitor";
+ 			productReference = 097B796909A6329C00427C2C /* RadmindUpdateMonitor.app */;
+ 			productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+ <!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
+ <plist version=\"1.0\">
+ <dict>
+ 	<key>CFBundleDevelopmentRegion</key>
+ 	<string>English</string>
+ 	<key>CFBundleExecutable</key>
+ 	<string>${EXECUTABLE_NAME}</string>
+ 	<key>CFBundleIdentifier</key>
+ 	<string>com.yourcompany.Radmind Update Monitor</string>
+ 	<key>CFBundleInfoDictionaryVersion</key>
+ 	<string>6.0</string>
+ 	<key>CFBundlePackageType</key>
+ 	<string>APPL</string>
+ 	<key>CFBundleSignature</key>
+ 	<string>????</string>
+ 	<key>CFBundleVersion</key>
+ 	<string>1.0</string>
+ 	<key>NSMainNibFile</key>
+ 	<string>MainMenu</string>
+ 	<key>NSPrincipalClass</key>
+ 	<string>NSApplication</string>
+ </dict>
+ </plist>
+ ";
+ 			productType = "com.apple.product-type.application";
+ 		};
  		09B3F059054D917300D8F843 /* Radmind Assistant */ = {
  			isa = PBXNativeTarget;
***************
*** 568,571 ****
--- 815,821 ----
  				09B3F08D054D917300D8F843 /* Sources */,
  				09B3F0A1054D917300D8F843 /* Frameworks */,
+ 				09EFC3C5099D176500A7D599 /* ShellScript */,
+ 				097B791F09A61B3300427C2C /* ShellScript */,
+ 				097B79B009A6544E00427C2C /* ShellScript */,
  			);
  			buildRules = (
***************
*** 600,603 ****
--- 850,856 ----
  			};
  			dependencies = (
+ 				09EFC3A0099D14CC00A7D599 /* PBXTargetDependency */,
+ 				097B791E09A61B2500427C2C /* PBXTargetDependency */,
+ 				097B79DC09A6594400427C2C /* PBXTargetDependency */,
  			);
  			name = "Radmind Assistant";
***************
*** 607,610 ****
--- 860,887 ----
  			productType = "com.apple.product-type.application";
  		};
+ 		09EFC39A099D14BD00A7D599 /* rmauthexec */ = {
+ 			isa = PBXNativeTarget;
+ 			buildConfigurationList = 09EFC3A2099D150900A7D599 /* Build configuration list for PBXNativeTarget "rmauthexec" */;
+ 			buildPhases = (
+ 				09EFC398099D14BD00A7D599 /* Sources */,
+ 				09EFC399099D14BD00A7D599 /* Frameworks */,
+ 			);
+ 			buildRules = (
+ 			);
+ 			buildSettings = {
+ 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ 				GCC_MODEL_TUNING = G5;
+ 				INSTALL_PATH = "$(HOME)/bin";
+ 				PREBINDING = NO;
+ 				PRODUCT_NAME = rmauthexec;
+ 				ZERO_LINK = YES;
+ 			};
+ 			dependencies = (
+ 			);
+ 			name = rmauthexec;
+ 			productName = rmauthexec;
+ 			productReference = 09EFC39B099D14BD00A7D599 /* rmauthexec */;
+ 			productType = "com.apple.product-type.tool";
+ 		};
  /* End PBXNativeTarget section */
  
***************
*** 624,627 ****
--- 901,907 ----
  			targets = (
  				09B3F059054D917300D8F843 /* Radmind Assistant */,
+ 				097B796809A6329C00427C2C /* Radmind Update Monitor */,
+ 				09EFC39A099D14BD00A7D599 /* rmauthexec */,
+ 				097B78C009A61A4600427C2C /* rumd */,
  			);
  		};
***************
*** 629,632 ****
--- 909,928 ----
  
  /* Begin PBXResourcesBuildPhase section */
+ 		097B796509A6329C00427C2C /* Resources */ = {
+ 			isa = PBXResourcesBuildPhase;
+ 			buildActionMask = 2147483647;
+ 			files = (
+ 				097B799309A6525600427C2C /* InfoPlist.strings in Resources */,
+ 				097B799409A6525600427C2C /* MainMenu.nib in Resources */,
+ 				097B799609A652D900427C2C /* Info.plist in Resources */,
+ 				097B79A809A6537800427C2C /* BrightNuclearBrain.png in Resources */,
+ 				097B79A909A6537800427C2C /* NuclearBrain.png in Resources */,
+ 				097B79AA09A6537800427C2C /* RUMError.png in Resources */,
+ 				097B79AB09A6537800427C2C /* RUMUpdateFrame1.png in Resources */,
+ 				097B79AC09A6537800427C2C /* RUMUpdateFrame2.png in Resources */,
+ 				097B79AD09A6537800427C2C /* RUMUpdateFrame3.png in Resources */,
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+ 		};
  		09B3F06D054D917300D8F843 /* Resources */ = {
  			isa = PBXResourcesBuildPhase;
***************
*** 635,641 ****
  				09B3F06E054D917300D8F843 /* MainMenu.nib in Resources */,
  				09B3F06F054D917300D8F843 /* InfoPlist.strings in Resources */,
- 				09B3F071054D917300D8F843 /* template.term in Resources */,
  				09B3F072054D917300D8F843 /* background.tiff in Resources */,
- 				09B3F074054D917300D8F843 /* rmauthexec in Resources */,
  				09B3F075054D917300D8F843 /* errorbrain.png in Resources */,
  				09B3F076054D917300D8F843 /* 10.2-desktop-negative.T in Resources */,
--- 931,935 ----
***************
*** 680,684 ****
  				095A1EFC092AC1270094056D /* edu.umich.rumd.plist in Resources */,
  				09C8AB5D092E2578009189DB /* RadmindUpdateMonitor in Resources */,
- 				09C8AB5E092E2578009189DB /* rumd in Resources */,
  				09C8AB5F092E2578009189DB /* rumd-StartupParamenters.plist in Resources */,
  			);
--- 974,977 ----
***************
*** 687,691 ****
--- 980,1045 ----
  /* End PBXResourcesBuildPhase section */
  
+ /* Begin PBXShellScriptBuildPhase section */
+ 		097B791F09A61B3300427C2C /* ShellScript */ = {
+ 			isa = PBXShellScriptBuildPhase;
+ 			buildActionMask = 2147483647;
+ 			files = (
+ 			);
+ 			inputPaths = (
+ 			);
+ 			outputPaths = (
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+ 			shellPath = /bin/sh;
+ 			shellScript = "#! /bin/sh\n\nPATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH\n\ntoolname=\"rumd\"\ntoolpath=\"${BUILT_PRODUCTS_DIR}/${toolname}\"\nrsrcdir=\"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\"\n\nif [ x\"${ACTION}\" != x\"build\" ]; then\n\texit 0\nfi\n\nif [ \"${toolpath}\" -nt \"${rsrcdir}/${toolname}\" \\\n\t\t-o ! -f \"${rsrcdir}/${toolname}\" ]; then\n\techo Copying ${toolpath} to ${rsrcdir}...\n\tcp -f \"${toolpath}\" \"${rsrcdir}\"\n\tif [ $? -ne 0 ]; then\n\t\techo Copy failed.\n\t\texit 2\n\tfi\nfi\n\nexit 0";
+ 		};
+ 		097B79B009A6544E00427C2C /* ShellScript */ = {
+ 			isa = PBXShellScriptBuildPhase;
+ 			buildActionMask = 2147483647;
+ 			files = (
+ 			);
+ 			inputPaths = (
+ 			);
+ 			outputPaths = (
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+ 			shellPath = /bin/sh;
+ 			shellScript = "#! /bin/sh\n\nPATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH\n\ntoolname=\"RadmindUpdateMonitor.app\"\ntoolpath=\"${BUILT_PRODUCTS_DIR}/${toolname}\"\nrsrcdir=\"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\"\n\nif [ x\"${ACTION}\" != x\"build\" ]; then\n\texit 0\nfi\n\nif [ -e \"${rsrcdir}/${toolname}\" ]; then\n\tif [ \"${toolpath}\" -nt \"${rsrcdir}/${toolname}\" ]; then\n\t\trm -r \"${rsrcdir}/${toolname}\"\n\tfi\nfi\n\nif [ ! -f \"${rsrcdir}/${toolname}\" ]; then\n\techo Copying ${toolpath} to ${rsrcdir}...\n\tcp -Rf \"${toolpath}\" \"${rsrcdir}/${toolname}\"\n\tif [ $? -ne 0 ]; then\n\t\techo Copy failed.\n\t\texit 2\n\tfi\nfi\n\nexit 0";
+ 		};
+ 		09EFC3C5099D176500A7D599 /* ShellScript */ = {
+ 			isa = PBXShellScriptBuildPhase;
+ 			buildActionMask = 2147483647;
+ 			files = (
+ 			);
+ 			inputPaths = (
+ 			);
+ 			outputPaths = (
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+ 			shellPath = /bin/sh;
+ 			shellScript = "#! /bin/sh\n\nPATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH\n\ntoolname=\"rmauthexec\"\ntoolpath=\"${BUILT_PRODUCTS_DIR}/${toolname}\"\nrsrcdir=\"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\"\n\nif [ x\"${ACTION}\" != x\"build\" ]; then\n\texit 0\nfi\n\nif [ \"${toolpath}\" -nt \"${rsrcdir}/${toolname}\" \\\n\t\t-o ! -f \"${rsrcdir}/${toolname}\" ]; then\n\techo Copying ${toolpath} to ${rsrcdir}...\n\tcp -f \"${toolpath}\" \"${rsrcdir}\"\n\tif [ $? -ne 0 ]; then\n\t\techo Copy failed.\n\t\texit 2\n\tfi\nfi\n\nexit 0";
+ 		};
+ /* End PBXShellScriptBuildPhase section */
+ 
  /* Begin PBXSourcesBuildPhase section */
+ 		097B78BE09A61A4600427C2C /* Sources */ = {
+ 			isa = PBXSourcesBuildPhase;
+ 			buildActionMask = 2147483647;
+ 			files = (
+ 				097B78D109A61AAF00427C2C /* argcargv.c in Sources */,
+ 				097B78D009A61AAA00427C2C /* pidforname.c in Sources */,
+ 				097B78D209A61AB400427C2C /* rumd.c in Sources */,
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+ 		};
+ 		097B796609A6329C00427C2C /* Sources */ = {
+ 			isa = PBXSourcesBuildPhase;
+ 			buildActionMask = 2147483647;
+ 			files = (
+ 				097B797009A632AA00427C2C /* main.m in Sources */,
+ 				097B797109A632B000427C2C /* RUMController.m in Sources */,
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+ 		};
  		09B3F08D054D917300D8F843 /* Sources */ = {
  			isa = PBXSourcesBuildPhase;
***************
*** 717,722 ****
--- 1071,1112 ----
  			runOnlyForDeploymentPostprocessing = 0;
  		};
+ 		09EFC398099D14BD00A7D599 /* Sources */ = {
+ 			isa = PBXSourcesBuildPhase;
+ 			buildActionMask = 2147483647;
+ 			files = (
+ 				09EFC3C1099D15C600A7D599 /* argcargv.c in Sources */,
+ 				09EFC3A6099D150A00A7D599 /* pidforname.c in Sources */,
+ 				09EFC3A8099D150A00A7D599 /* rmauthexec.c in Sources */,
+ 				09EFC3A9099D150A00A7D599 /* selfrepair.c in Sources */,
+ 				09EFC3AB099D150A00A7D599 /* defaults.c in Sources */,
+ 				09EFC3AD099D150A00A7D599 /* automator.c in Sources */,
+ 				09EFC3AF099D150A00A7D599 /* copy.c in Sources */,
+ 				09EFC3B1099D150A00A7D599 /* makedir.c in Sources */,
+ 				09EFC3B7099D157D00A7D599 /* kvalid.c in Sources */,
+ 				09EFC3BE099D15A300A7D599 /* prepost.c in Sources */,
+ 				09EFC3BF099D15A300A7D599 /* rummgmt.c in Sources */,
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+ 		};
  /* End PBXSourcesBuildPhase section */
  
+ /* Begin PBXTargetDependency section */
+ 		097B791E09A61B2500427C2C /* PBXTargetDependency */ = {
+ 			isa = PBXTargetDependency;
+ 			target = 097B78C009A61A4600427C2C /* rumd */;
+ 			targetProxy = 097B791D09A61B2500427C2C /* PBXContainerItemProxy */;
+ 		};
+ 		097B79DC09A6594400427C2C /* PBXTargetDependency */ = {
+ 			isa = PBXTargetDependency;
+ 			target = 097B796809A6329C00427C2C /* Radmind Update Monitor */;
+ 			targetProxy = 097B79DB09A6594400427C2C /* PBXContainerItemProxy */;
+ 		};
+ 		09EFC3A0099D14CC00A7D599 /* PBXTargetDependency */ = {
+ 			isa = PBXTargetDependency;
+ 			target = 09EFC39A099D14BD00A7D599 /* rmauthexec */;
+ 			targetProxy = 09EFC39F099D14CC00A7D599 /* PBXContainerItemProxy */;
+ 		};
+ /* End PBXTargetDependency section */
+ 
  /* Begin PBXVariantGroup section */
  		089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
***************
*** 744,747 ****
--- 1134,1153 ----
  			sourceTree = "<group>";
  		};
+ 		097B798F09A6525600427C2C /* InfoPlist.strings */ = {
+ 			isa = PBXVariantGroup;
+ 			children = (
+ 				097B799009A6525600427C2C /* English */,
+ 			);
+ 			name = InfoPlist.strings;
+ 			sourceTree = "<group>";
+ 		};
+ 		097B799109A6525600427C2C /* MainMenu.nib */ = {
+ 			isa = PBXVariantGroup;
+ 			children = (
+ 				097B799209A6525600427C2C /* English */,
+ 			);
+ 			name = MainMenu.nib;
+ 			sourceTree = "<group>";
+ 		};
  		09B60A2F08AC2D0D001CDD4B /* RAScriptManager.nib */ = {
  			isa = PBXVariantGroup;
***************
*** 763,766 ****
--- 1169,1286 ----
  
  /* Begin XCBuildConfiguration section */
+ 		097B78CB09A61A7100427C2C /* Development */ = {
+ 			isa = XCBuildConfiguration;
+ 			buildSettings = {
+ 				COPY_PHASE_STRIP = NO;
+ 				GCC_DYNAMIC_NO_PIC = NO;
+ 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+ 				GCC_MODEL_TUNING = G5;
+ 				GCC_OPTIMIZATION_LEVEL = 0;
+ 				INSTALL_PATH = "$(HOME)/bin";
+ 				PREBINDING = NO;
+ 				PRODUCT_NAME = rumd;
+ 				ZERO_LINK = YES;
+ 			};
+ 			name = Development;
+ 		};
+ 		097B78CC09A61A7100427C2C /* Deployment */ = {
+ 			isa = XCBuildConfiguration;
+ 			buildSettings = {
+ 				COPY_PHASE_STRIP = YES;
+ 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+ 				GCC_MODEL_TUNING = G5;
+ 				INSTALL_PATH = "$(HOME)/bin";
+ 				PREBINDING = NO;
+ 				PRODUCT_NAME = rumd;
+ 				ZERO_LINK = NO;
+ 			};
+ 			name = Deployment;
+ 		};
+ 		097B78CD09A61A7100427C2C /* Default */ = {
+ 			isa = XCBuildConfiguration;
+ 			buildSettings = {
+ 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ 				GCC_MODEL_TUNING = G5;
+ 				INSTALL_PATH = "$(HOME)/bin";
+ 				PREBINDING = NO;
+ 				PRODUCT_NAME = rumd;
+ 				ZERO_LINK = YES;
+ 			};
+ 			name = Default;
+ 		};
+ 		097B796D09A6329D00427C2C /* Development */ = {
+ 			isa = XCBuildConfiguration;
+ 			buildSettings = {
+ 				COPY_PHASE_STRIP = NO;
+ 				GCC_DYNAMIC_NO_PIC = NO;
+ 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+ 				GCC_MODEL_TUNING = G5;
+ 				GCC_OPTIMIZATION_LEVEL = 0;
+ 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+ 				INFOPLIST_FILE = rum/Info.plist;
+ 				INSTALL_PATH = "$(HOME)/Applications";
+ 				OTHER_LDFLAGS = (
+ 					"-framework",
+ 					Foundation,
+ 					"-framework",
+ 					AppKit,
+ 				);
+ 				PREBINDING = NO;
+ 				PRODUCT_NAME = RadmindUpdateMonitor;
+ 				WRAPPER_EXTENSION = app;
+ 				ZERO_LINK = YES;
+ 			};
+ 			name = Development;
+ 		};
+ 		097B796E09A6329D00427C2C /* Deployment */ = {
+ 			isa = XCBuildConfiguration;
+ 			buildSettings = {
+ 				COPY_PHASE_STRIP = YES;
+ 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+ 				GCC_MODEL_TUNING = G5;
+ 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+ 				INFOPLIST_FILE = rum/Info.plist;
+ 				INSTALL_PATH = "$(HOME)/Applications";
+ 				OTHER_LDFLAGS = (
+ 					"-framework",
+ 					Foundation,
+ 					"-framework",
+ 					AppKit,
+ 				);
+ 				PREBINDING = NO;
+ 				PRODUCT_NAME = RadmindUpdateMonitor;
+ 				WRAPPER_EXTENSION = app;
+ 				ZERO_LINK = NO;
+ 			};
+ 			name = Deployment;
+ 		};
+ 		097B796F09A6329D00427C2C /* Default */ = {
+ 			isa = XCBuildConfiguration;
+ 			buildSettings = {
+ 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ 				GCC_MODEL_TUNING = G5;
+ 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+ 				INFOPLIST_FILE = rum/Info.plist;
+ 				INSTALL_PATH = "$(HOME)/Applications";
+ 				OTHER_LDFLAGS = (
+ 					"-framework",
+ 					Foundation,
+ 					"-framework",
+ 					AppKit,
+ 				);
+ 				PREBINDING = NO;
+ 				PRODUCT_NAME = RadmindUpdateMonitor;
+ 				WRAPPER_EXTENSION = app;
+ 				ZERO_LINK = YES;
+ 			};
+ 			name = Default;
+ 		};
  		09943E43088F5D8C001810A0 /* Development */ = {
  			isa = XCBuildConfiguration;
***************
*** 871,874 ****
--- 1391,1400 ----
  			isa = XCBuildConfiguration;
  			buildSettings = {
+ 				ARCHS = (
+ 					ppc,
+ 					i386,
+ 				);
+ 				MACOSX_DEPLOYMENT_TARGET = 10.4;
+ 				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
  			};
  			name = Development;
***************
*** 877,880 ****
--- 1403,1412 ----
  			isa = XCBuildConfiguration;
  			buildSettings = {
+ 				ARCHS = (
+ 					ppc,
+ 					i386,
+ 				);
+ 				MACOSX_DEPLOYMENT_TARGET = 10.4;
+ 				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
  			};
  			name = Deployment;
***************
*** 883,886 ****
--- 1415,1466 ----
  			isa = XCBuildConfiguration;
  			buildSettings = {
+ 				ARCHS = (
+ 					ppc,
+ 					i386,
+ 				);
+ 				MACOSX_DEPLOYMENT_TARGET = 10.4;
+ 				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ 			};
+ 			name = Default;
+ 		};
+ 		09EFC3A3099D150900A7D599 /* Development */ = {
+ 			isa = XCBuildConfiguration;
+ 			buildSettings = {
+ 				COPY_PHASE_STRIP = NO;
+ 				GCC_DYNAMIC_NO_PIC = NO;
+ 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+ 				GCC_MODEL_TUNING = G5;
+ 				GCC_OPTIMIZATION_LEVEL = 0;
+ 				INSTALL_PATH = "$(HOME)/bin";
+ 				PREBINDING = NO;
+ 				PRODUCT_NAME = rmauthexec;
+ 				ZERO_LINK = YES;
+ 			};
+ 			name = Development;
+ 		};
+ 		09EFC3A4099D150900A7D599 /* Deployment */ = {
+ 			isa = XCBuildConfiguration;
+ 			buildSettings = {
+ 				COPY_PHASE_STRIP = YES;
+ 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+ 				GCC_MODEL_TUNING = G5;
+ 				INSTALL_PATH = "$(HOME)/bin";
+ 				PREBINDING = NO;
+ 				PRODUCT_NAME = rmauthexec;
+ 				ZERO_LINK = NO;
+ 			};
+ 			name = Deployment;
+ 		};
+ 		09EFC3A5099D150900A7D599 /* Default */ = {
+ 			isa = XCBuildConfiguration;
+ 			buildSettings = {
+ 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ 				GCC_MODEL_TUNING = G5;
+ 				INSTALL_PATH = "$(HOME)/bin";
+ 				PREBINDING = NO;
+ 				PRODUCT_NAME = rmauthexec;
+ 				ZERO_LINK = YES;
  			};
  			name = Default;
***************
*** 889,892 ****
--- 1469,1492 ----
  
  /* Begin XCConfigurationList section */
+ 		097B78CA09A61A7100427C2C /* Build configuration list for PBXNativeTarget "rumd" */ = {
+ 			isa = XCConfigurationList;
+ 			buildConfigurations = (
+ 				097B78CB09A61A7100427C2C /* Development */,
+ 				097B78CC09A61A7100427C2C /* Deployment */,
+ 				097B78CD09A61A7100427C2C /* Default */,
+ 			);
+ 			defaultConfigurationIsVisible = 0;
+ 			defaultConfigurationName = Default;
+ 		};
+ 		097B796C09A6329D00427C2C /* Build configuration list for PBXNativeTarget "Radmind Update Monitor" */ = {
+ 			isa = XCConfigurationList;
+ 			buildConfigurations = (
+ 				097B796D09A6329D00427C2C /* Development */,
+ 				097B796E09A6329D00427C2C /* Deployment */,
+ 				097B796F09A6329D00427C2C /* Default */,
+ 			);
+ 			defaultConfigurationIsVisible = 0;
+ 			defaultConfigurationName = Default;
+ 		};
  		09943E42088F5D8C001810A0 /* Build configuration list for PBXNativeTarget "Radmind Assistant" */ = {
  			isa = XCConfigurationList;
***************
*** 909,912 ****
--- 1509,1522 ----
  			defaultConfigurationName = Default;
  		};
+ 		09EFC3A2099D150900A7D599 /* Build configuration list for PBXNativeTarget "rmauthexec" */ = {
+ 			isa = XCConfigurationList;
+ 			buildConfigurations = (
+ 				09EFC3A3099D150900A7D599 /* Development */,
+ 				09EFC3A4099D150900A7D599 /* Deployment */,
+ 				09EFC3A5099D150900A7D599 /* Default */,
+ 			);
+ 			defaultConfigurationIsVisible = 0;
+ 			defaultConfigurationName = Default;
+ 		};
  /* End XCConfigurationList section */
  	};

[Radmind-commit] radmind-assistant/English.lproj/Preferences.nib classes.nib,1.7,1.8 info.nib,1.11,1.12 keyedobjects.nib,1.11,1.12 objects.nib,1.11,1.12

[Andrew M. <fit...@us...>]

Update of /cvsroot/radmind/radmind-assistant/English.lproj/Preferences.nib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27567/English.lproj/Preferences.nib

Modified Files:
	classes.nib info.nib keyedobjects.nib objects.nib 
Log Message:
Compression level settings interface.


Index: info.nib
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/English.lproj/Preferences.nib/info.nib,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** info.nib	12 Aug 2005 19:31:17 -0000	1.11
--- info.nib	24 Feb 2006 22:22:58 -0000	1.12
***************
*** 4,31 ****
  <dict>
  	<key>IBDocumentLocation</key>
! 	<string>195 225 362 373 0 0 1440 878 </string>
  	<key>IBEditorPositions</key>
  	<dict>
  		<key>105</key>
! 		<string>471 455 498 305 0 0 1440 878 </string>
  		<key>12</key>
! 		<string>496 396 498 166 0 0 1440 878 </string>
  		<key>151</key>
  		<string>471 460 498 289 0 0 1440 878 </string>
  		<key>22</key>
! 		<string>471 444 498 320 0 0 1440 878 </string>
  		<key>40</key>
  		<string>471 503 498 202 0 0 1440 878 </string>
  		<key>45</key>
! 		<string>471 546 498 123 0 0 1440 878 </string>
  	</dict>
  	<key>IBFramework Version</key>
! 	<string>439.0</string>
  	<key>IBOpenObjects</key>
  	<array>
! 		<integer>12</integer>
  	</array>
  	<key>IBSystem Version</key>
! 	<string>8C46</string>
  </dict>
  </plist>
--- 4,31 ----
  <dict>
  	<key>IBDocumentLocation</key>
! 	<string>61 290 362 373 0 0 1440 878 </string>
  	<key>IBEditorPositions</key>
  	<dict>
  		<key>105</key>
! 		<string>471 459 498 318 0 0 1440 878 </string>
  		<key>12</key>
! 		<string>264 666 498 166 0 0 1440 878 </string>
  		<key>151</key>
  		<string>471 460 498 289 0 0 1440 878 </string>
  		<key>22</key>
! 		<string>471 416 498 377 0 0 1440 878 </string>
  		<key>40</key>
  		<string>471 503 498 202 0 0 1440 878 </string>
  		<key>45</key>
! 		<string>402 519 498 123 0 0 1440 878 </string>
  	</dict>
  	<key>IBFramework Version</key>
! 	<string>443.0</string>
  	<key>IBOpenObjects</key>
  	<array>
! 		<integer>22</integer>
  	</array>
  	<key>IBSystem Version</key>
! 	<string>8H14</string>
  </dict>
  </plist>

Index: objects.nib
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/English.lproj/Preferences.nib/objects.nib,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
Binary files /tmp/cvsmch27S and /tmp/cvswxKMHY differ

Index: classes.nib
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/English.lproj/Preferences.nib/classes.nib,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** classes.nib	12 Aug 2005 19:31:17 -0000	1.7
--- classes.nib	24 Feb 2006 22:22:58 -0000	1.8
***************
*** 16,19 ****
--- 16,20 ----
                  setAutomationConfiguration = id; 
                  setCaseSensitivity = id; 
+                 setCompressionLevel = id; 
                  setDefaultServer = id; 
                  setFsdiffPath = id; 
***************
*** 26,32 ****
--- 27,35 ----
                  toggleAlwaysPostApplySwitch = id; 
                  toggleAlwaysPreApplySwitch = id; 
+                 toggleCompressionSwitch = id; 
                  toggleEnableScheduleSwitch = id; 
                  toggleForceLockRemoval = id; 
                  toggleIgnoreUploadErrors = id; 
+                 toggleRadmindUpdateMonitor = id; 
                  toggleUserAuth = id; 
                  toggleUserManagement = id; 
***************
*** 50,53 ****
--- 53,57 ----
                  prefDeleteRadmindServerButton = NSButton; 
                  prefEditRadmindListSheet = NSPanel; 
+                 prefEnableRadmindUpdateMonitor = NSButton; 
                  prefEnableUserAuth = NSButton; 
                  prefFsdiffPath = NSPopUpButton; 
***************
*** 58,68 ****
                  prefMaxDiskUsageField = NSTextField; 
                  prefMaxHomeLifeField = NSTextField; 
-                 prefNewServerAddButton = NSButton; 
-                 prefNewServerField = NSTextField; 
-                 prefNewServerSheet = NSPanel; 
                  prefPanel = NSPanel; 
                  prefRadmindHost = NSPopUpButton; 
!                 prefRadmindServerPort = NSTextField; 
                  prefRadmindServerTable = NSTableView; 
                  prefTLSLevel = NSPopUpButton; 
                  prefTemplateUserNameField = NSTextField; 
--- 62,74 ----
                  prefMaxDiskUsageField = NSTextField; 
                  prefMaxHomeLifeField = NSTextField; 
                  prefPanel = NSPanel; 
                  prefRadmindHost = NSPopUpButton; 
!                 prefRadmindServerSettingBox = NSBox; 
!                 prefRadmindServerSettingCompress = NSButton; 
!                 prefRadmindServerSettingCompressionLevel = NSPopUpButton; 
!                 prefRadmindServerSettingPort = NSTextField; 
                  prefRadmindServerTable = NSTableView; 
+                 prefServerCompressionSummary = NSTextField; 
+                 prefServerPortSummary = NSTextField; 
                  prefTLSLevel = NSPopUpButton; 
                  prefTemplateUserNameField = NSTextField; 

Index: keyedobjects.nib
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/English.lproj/Preferences.nib/keyedobjects.nib,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
Binary files /tmp/cvsvcVqVU and /tmp/cvs30eLF0 differ

[Radmind-commit] radmind-assistant/English.lproj/MainMenu.nib info.nib,1.58,1.59 keyedobjects.nib,1.10,1.11 objects.nib,1.61,1.62

[Andrew M. <fit...@us...>]

Update of /cvsroot/radmind/radmind-assistant/English.lproj/MainMenu.nib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27508/English.lproj/MainMenu.nib

Modified Files:
	info.nib keyedobjects.nib objects.nib 
Log Message:
Updated versions.


Index: info.nib
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/English.lproj/MainMenu.nib/info.nib,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** info.nib	5 Aug 2005 15:23:29 -0000	1.58
--- info.nib	24 Feb 2006 22:22:33 -0000	1.59
***************
*** 47,51 ****
  	</dict>
  	<key>IBFramework Version</key>
! 	<string>439.0</string>
  	<key>IBLockedObjects</key>
  	<array>
--- 47,51 ----
  	</dict>
  	<key>IBFramework Version</key>
! 	<string>443.0</string>
  	<key>IBLockedObjects</key>
  	<array>
***************
*** 55,63 ****
  	<array>
  		<integer>29</integer>
- 		<integer>1193</integer>
  		<integer>205</integer>
  	</array>
  	<key>IBSystem Version</key>
! 	<string>8C46</string>
  </dict>
  </plist>
--- 55,63 ----
  	<array>
  		<integer>29</integer>
  		<integer>205</integer>
+ 		<integer>1193</integer>
  	</array>
  	<key>IBSystem Version</key>
! 	<string>8G32</string>
  </dict>
  </plist>

Index: objects.nib
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/English.lproj/MainMenu.nib/objects.nib,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
Binary files /tmp/cvsvlVdul and /tmp/cvsvbhRRb differ

Index: keyedobjects.nib
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/English.lproj/MainMenu.nib/keyedobjects.nib,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
Binary files /tmp/cvsToVMkn and /tmp/cvs4LJyNd differ

[Radmind-commit] radmind-assistant/English.lproj InfoPlist.strings,1.16,1.17

[Andrew M. <fit...@us...>]

Update of /cvsroot/radmind/radmind-assistant/English.lproj
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27217/English.lproj

Modified Files:
	InfoPlist.strings 
Log Message:
Updated version strings.


Index: InfoPlist.strings
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/English.lproj/InfoPlist.strings,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
Binary files /tmp/cvsaevQwr and /tmp/cvsAlvytY differ

[Radmind-commit] radmind-assistant UMLoginItem.m,1.1,1.2

[Andrew M. <fit...@us...>]

Update of /cvsroot/radmind/radmind-assistant
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27076

Modified Files:
	UMLoginItem.m 
Log Message:
Fixed crash caused by missing argument to NSLog.


Index: UMLoginItem.m
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/UMLoginItem.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** UMLoginItem.m	18 Nov 2005 15:22:30 -0000	1.1
--- UMLoginItem.m	24 Feb 2006 22:21:45 -0000	1.2
***************
*** 36,39 ****
--- 36,42 ----
      }
      
+     /* remove it from the loginwindow prefs if it's already there */
+     ( void )[ self removeLoginItem: itemPath ];
+     
      prefArray = ( NSArray * )CFPreferencesCopyValue(
  			    CFSTR( "AutoLaunchedApplicationDictionary" ),
***************
*** 48,58 ****
  	[ prefArray autorelease ];
      }
! 	
!     /*
!      * We could check to see if the item's already in the dictionary,
!      * but just overwrite it instead. It's a tiny operation.
!      */
!     err = FSPathMakeRef(
! 		    ( const UInt8 * )[ itemPath fileSystemRepresentation ],
  		    &ref, NULL );
      if ( err != noErr ) {
--- 51,56 ----
  	[ prefArray autorelease ];
      }
!     
!     err = FSPathMakeRef(( const UInt8 * )[ itemPath fileSystemRepresentation ],
  		    &ref, NULL );
      if ( err != noErr ) {
***************
*** 78,82 ****
  	DisposeHandle(( Handle )handle );
      }
!     
      [ autoLaunchedApps addObject: loginItem ];
      
--- 76,80 ----
  	DisposeHandle(( Handle )handle );
      }
! 
      [ autoLaunchedApps addObject: loginItem ];
      
***************
*** 130,134 ****
      }
      if ( i >= [ autoLaunchedApps count ] ) {
! 	NSLog( @"%@ not found in login items array" );
  	return( NO );
      }
--- 128,132 ----
      }
      if ( i >= [ autoLaunchedApps count ] ) {
! 	NSLog( @"%@ not found in login items array", itemPath );
  	return( NO );
      }

[Radmind-commit] radmind-assistant RCMStepController.m,1.101,1.102

[Andrew M. <fit...@us...>]

Update of /cvsroot/radmind/radmind-assistant
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26406

Modified Files:
	RCMStepController.m 
Log Message:
Compression settings support.
Use bundle ID to locate and launch Server Manager.


Index: RCMStepController.m
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/RCMStepController.m,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** RCMStepController.m	2 Dec 2005 16:32:20 -0000	1.101
--- RCMStepController.m	24 Feb 2006 22:20:43 -0000	1.102
***************
*** 1151,1154 ****
--- 1151,1155 ----
      int             toolforstep = 0, uauth = 0, rc;
      int             tlslevel = 0, port;
+     int		    zlevel = 0;
  
      NSNumber        *tL = [[ NSUserDefaults standardUserDefaults ]
***************
*** 1189,1193 ****
  			[ NSString stringWithFormat: @"%d", port ], nil ]];
  	}
! 	
          [ argv retain ];
          break;
--- 1190,1201 ----
  			[ NSString stringWithFormat: @"%d", port ], nil ]];
  	}
! 	if ( [[ NSUserDefaults standardUserDefaults ]
! 		boolForKey: @"RadmindServerEnableCompression" ] == YES ) {
! 	    zlevel = [[ NSUserDefaults standardUserDefaults ]
! 			integerForKey: @"RadmindServerCompressionLevel" ];
! 	    argv = [ argv arrayByAddingObjectsFromArray:
! 			[ NSArray arrayWithObjects: @"-Z",
! 			[ NSString stringWithFormat: @"%d", zlevel ], nil ]];
! 	}
          [ argv retain ];
          break;
***************
*** 1329,1332 ****
--- 1337,1348 ----
  				[ NSString stringWithFormat: @"%d", port ], nil ]];
  		}
+ 		if ( [[ NSUserDefaults standardUserDefaults ]
+ 			boolForKey: @"RadmindServerEnableCompression" ] == YES ) {
+ 		    zlevel = [[ NSUserDefaults standardUserDefaults ]
+ 				integerForKey: @"RadmindServerCompressionLevel" ];
+ 		    argv = [ argv arrayByAddingObjectsFromArray:
+ 				[ NSArray arrayWithObjects: @"-Z",
+ 				[ NSString stringWithFormat: @"%d", zlevel ], nil ]];
+ 		}
                  
                  argv = [ argv arrayByAddingObjectsFromArray:
***************
*** 1368,1371 ****
--- 1384,1395 ----
  			    [ NSString stringWithFormat: @"%d", port ], nil ]];
  	    }
+ 	    if ( [[ NSUserDefaults standardUserDefaults ]
+ 		    boolForKey: @"RadmindServerEnableCompression" ] == YES ) {
+ 		zlevel = [[ NSUserDefaults standardUserDefaults ]
+ 			    integerForKey: @"RadmindServerCompressionLevel" ];
+ 		argv = [ argv arrayByAddingObjectsFromArray:
+ 			    [ NSArray arrayWithObjects: @"-Z",
+ 			    [ NSString stringWithFormat: @"%d", zlevel ], nil ]];
+ 	    }
              
              argv = [ argv arrayByAddingObjectsFromArray: [ NSArray arrayWithObjects:
***************
*** 2067,2080 ****
  - ( IBAction )openServerManager: ( id )sender
  {
!     NSString		*smpath = [[ NSBundle mainBundle ] pathForResource:
  					@"Radmind Server Manager"
  					ofType: @"app" ];
! 					
!     if ( smpath == nil ) {
! 	NSRunAlertPanel( @"Couldn't locate Radmind Server Manager!",
! 		@"The Radmind Assistant couldn't open the Radmind Server Manager "
! 		@"because the Server Manager could not be found. Please reinstall "
! 		@"the Radmind Assistant.", @"OK", @"", @"" );
! 	exit( 2 );
      }
      
--- 2091,2111 ----
  - ( IBAction )openServerManager: ( id )sender
  {
!     NSString		*smpath;
!     NSString		*bundleID = @"edu.umich.radmindservermanager";
!     
!     smpath = [[ NSWorkspace sharedWorkspace ]
! 		absolutePathForAppBundleWithIdentifier: bundleID ];
!     if ( smpath == nil ) {
! 	/* check in resource dir */
! 	smpath = [[ NSBundle mainBundle ] pathForResource:
  					@"Radmind Server Manager"
  					ofType: @"app" ];
! 	if ( smpath == nil ) {
! 	    NSRunAlertPanel( @"Couldn't locate Radmind Server Manager!",
! 		    @"The Radmind Assistant couldn't open the Radmind Server Manager "
! 		    @"because the Server Manager could not be found. Please reinstall "
! 		    @"the Radmind Assistant.", @"OK", @"", @"" );
! 	    exit( 2 );
! 	}
      }
      

[Radmind-commit] radmind-assistant RCMPreferences.h,1.22,1.23 RCMPreferences.m,1.38,1.39

[Andrew M. <fit...@us...>]

Update of /cvsroot/radmind/radmind-assistant
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25675

Modified Files:
	RCMPreferences.h RCMPreferences.m 
Log Message:
Compression settings support.
RadmindUpdateMonitor toggle.
Modified server addition inteface.


Index: RCMPreferences.m
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/RCMPreferences.m,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** RCMPreferences.m	18 Nov 2005 15:21:40 -0000	1.38
--- RCMPreferences.m	24 Feb 2006 22:19:35 -0000	1.39
***************
*** 28,37 ****
  
  - ( void )awakeFromNib
! {
!     [[ NSNotificationCenter defaultCenter ] addObserver: self
!                 selector: @selector( enableAddServerButton: )
!                 name: NSControlTextDidChangeNotification
!                 object: nil ];
! 		
      radmindServerList = nil;
      certificateManager = nil;
--- 28,32 ----
  
  - ( void )awakeFromNib
! {		
      radmindServerList = nil;
      certificateManager = nil;
***************
*** 200,203 ****
--- 195,232 ----
  /* end required toolbar delegate methods */
  
+ /* update preferences from array of strings to array of dictionaries */
+ - ( void )updateServerListPreferences: ( NSArray * )serverList
+ {
+     NSMutableArray	*newServerArray = nil;
+     NSDictionary	*serverInfo = nil;
+     int			i;
+     
+     if ( [ serverList count ] &&
+ 	    [[ serverList objectAtIndex: 0 ] isKindOfClass: [ NSString class ]] ) {
+ 	newServerArray = [ NSMutableArray array ];
+ 	
+ 	for ( i = 0; i < [ serverList count ]; i++ ) {
+ 	    serverInfo = [ NSDictionary dictionaryWithObjectsAndKeys:
+ 			    [ serverList objectAtIndex: i ],
+ 				@"RadmindServerName",
+ 			    @"",
+ 				@"RadmindServerPort",
+ 			    [ NSNumber numberWithBool: NO ],
+ 				@"RadmindServerEnableCompression",
+ 			    [ NSNumber numberWithInt: 0 ],
+ 				@"RadmindServerCompressionLevel",
+ 			    nil ];
+ 	    [ newServerArray addObject: serverInfo ];
+ 	}
+ 	
+ 	[[ NSUserDefaults standardUserDefaults ]
+ 		setObject: newServerArray forKey: @"RadmindServers" ];
+     }
+     
+     [[ NSUserDefaults standardUserDefaults ]
+ 	    removeObjectForKey: @"radmindhosts" ];
+     [[ NSUserDefaults standardUserDefaults ] synchronize ];
+ }
+ 
  - ( void )prefsReload
  {
***************
*** 218,221 ****
--- 247,251 ----
      BOOL		postapply = [ defaults boolForKey: @"RAAlwaysPostProcess" ];
      BOOL		caseInsensitive = [ defaults boolForKey: @"RACaseInsensitive" ];
+     BOOL		rum = [ defaults boolForKey: @"RadmindUpdateMonitorEnabled" ];
      NSString		*username = [ defaults stringForKey:
                                          @"username" ];
***************
*** 223,227 ****
      NSNumber		*tlsLevel = [ defaults objectForKey:
                                      @"tlslevel" ];
!     int			port = [ defaults integerForKey: @"RadmindServerPort" ];
      int			i = 0;
      
--- 253,257 ----
      NSNumber		*tlsLevel = [ defaults objectForKey:
                                      @"tlslevel" ];
!     NSDictionary	*serverInfo = nil;
      int			i = 0;
      
***************
*** 233,236 ****
--- 263,272 ----
      [ prefRadmindHost setEnabled: NO ];
      
+     if ( defaultHosts != nil ) {
+ 	[ self updateServerListPreferences: defaultHosts ];
+     }
+     defaultHosts = [[ NSUserDefaults standardUserDefaults ]
+ 			objectForKey: @"RadmindServers" ];
+     
      if ( radmindServerList == nil ) {
          radmindServerList = [[ NSMutableArray alloc ] init ];
***************
*** 238,246 ****
      [ radmindServerList removeAllObjects ];
      [ radmindServerList addObjectsFromArray: defaultHosts ];
      for ( i = 0; i < [ radmindServerList count ]; i++ ) {
          [ prefRadmindHost insertItemWithTitle:
!                         [ radmindServerList objectAtIndex: i ]
                          atIndex: 0 ];
  	[ prefRadmindHost setEnabled: YES ];
      }
      
--- 274,316 ----
      [ radmindServerList removeAllObjects ];
      [ radmindServerList addObjectsFromArray: defaultHosts ];
+     
      for ( i = 0; i < [ radmindServerList count ]; i++ ) {
          [ prefRadmindHost insertItemWithTitle:
!                         [[ radmindServerList objectAtIndex: i ]
! 				objectForKey: @"RadmindServerName" ]
                          atIndex: 0 ];
  	[ prefRadmindHost setEnabled: YES ];
+ 	if ( serverInfo == nil ) {
+ 	    if ( [[[ radmindServerList objectAtIndex: i ]
+ 			objectForKey: @"RadmindServerName" ]
+ 			isEqualToString: radmind ] ) {
+ 		serverInfo = [ radmindServerList objectAtIndex: i ];
+ 	    }
+ 	}
+     }
+     
+     [ prefServerPortSummary setStringValue: @"" ];
+     [ prefServerCompressionSummary setStringValue: @"" ];
+     
+     if ( serverInfo != nil ) {
+ 	NSString	*portString = @"";
+ 	NSString	*compressionString = @"";
+ 	int		port, zlevel;
+ 	
+ 	if ( [ serverInfo objectForKey: @"RadmindServerPort" ] != nil ) {
+ 	    port = [[ serverInfo objectForKey: @"RadmindServerPort" ] intValue ];
+ 	    if ( port > 0 ) {
+ 		portString = [ NSString stringWithFormat: @"Port %d", port ];
+ 		[ prefServerPortSummary setStringValue: portString ];
+ 	    }
+ 	}
+ 	if ( [[ serverInfo objectForKey:
+ 		@"RadmindServerEnableCompression" ] intValue ] == (int)YES ) {
+ 	    zlevel = [[ serverInfo objectForKey:
+ 			@"RadmindServerCompressionLevel" ] intValue ];
+ 	    compressionString = [ NSString stringWithFormat:
+ 				    @"Compression level %d", zlevel ];
+ 	    [ prefServerCompressionSummary setStringValue: compressionString ];
+ 	}
      }
      
***************
*** 252,258 ****
      }
      
!     if ( port != 0 ) {
! 	[ prefRadmindServerPort setStringValue:
! 		[ NSString stringWithFormat: @"%d", port ]];
      }
      
--- 322,329 ----
      }
      
!     if ( rum ) {
! 	[ prefEnableRadmindUpdateMonitor setState: NSOnState ];
!     } else {
! 	[ prefEnableRadmindUpdateMonitor setState: NSOffState ];
      }
      
***************
*** 661,664 ****
--- 732,738 ----
      [ prefDeleteRadmindServerButton setEnabled: NO ];
      [ prefPanel makeKeyAndOrderFront: nil ];
+     [ prefRadmindServerSettingCompress setEnabled: NO ];
+     [ prefRadmindServerSettingCompressionLevel setEnabled: NO ];
+     [ prefRadmindServerSettingPort setStringValue: @"" ];
      [ NSApp beginSheet: prefEditRadmindListSheet
  	    modalForWindow: prefPanel
***************
*** 670,695 ****
  - ( IBAction )setDefaultServer: ( id )sender
  {
      [[ NSUserDefaults standardUserDefaults ] setObject: [ sender title ]
  						forKey: @"radmindhost" ];
  }
  
  - ( IBAction )setPort: ( id )sender
  {
      NSString			*portString = [ sender stringValue ];
!     int				port;
      
!     if ( portString == nil || [ portString length ] == 0 ) {
! 	[[ NSUserDefaults standardUserDefaults ]
! 	    removeObjectForKey: @"RadmindServerPort" ];
  	return;
      }
      
!     if (( port = [ portString intValue ] ) < 1 || port > 65535 ) {
  	NSLog( @"%@: invalid port number", portString );
  	return;
      }
      
      [[ NSUserDefaults standardUserDefaults ]
! 	    setInteger: port forKey: @"RadmindServerPort" ];
  }
  
--- 744,824 ----
  - ( IBAction )setDefaultServer: ( id )sender
  {
+     NSDictionary		*serverInfo = nil;
+     NSNumber			*port, *zlevel;
+     int				i, compress;
+     
      [[ NSUserDefaults standardUserDefaults ] setObject: [ sender title ]
  						forKey: @"radmindhost" ];
+ 	
+     /* remove old settings */
+     [[ NSUserDefaults standardUserDefaults ]
+ 	    removeObjectForKey: @"RadmindServerPort" ];
+     [[ NSUserDefaults standardUserDefaults ]
+ 	    removeObjectForKey: @"RadmindServerEnableCompression" ];
+     [[ NSUserDefaults standardUserDefaults ]
+ 	    removeObjectForKey: @"RadmindServerCompressionLevel" ];
+ 	    
+     for ( i = 0; i < [ radmindServerList count ]; i++ ) {
+ 	if ( [[[ radmindServerList objectAtIndex: i ]
+ 		    objectForKey: @"RadmindServerName" ]
+ 		    isEqualToString: [ sender title ]] ) {
+ 	    serverInfo = [ radmindServerList objectAtIndex: i ];
+ 	    break;
+ 	}
+     }
+     if ( serverInfo != nil ) {
+ 	port = [ serverInfo objectForKey: @"RadmindServerPort" ];
+ 	if ( port != nil ) {
+ 	    [[ NSUserDefaults standardUserDefaults ]
+ 		    setInteger: [ port intValue ] forKey: @"RadmindServerPort" ];
+ 	}
+ 	
+ 	compress = [[ serverInfo objectForKey:
+ 			@"RadmindServerEnableCompression" ] intValue ];
+ 	if ( compress ) {
+ 	    zlevel = [ serverInfo objectForKey: @"RadmindServerCompressionLevel" ];
+ 	    if ( zlevel == nil ) {
+ 		zlevel = [ NSNumber numberWithInt: 0 ];
+ 	    }
+ 	    [[ NSUserDefaults standardUserDefaults ]
+ 		    setInteger: [ zlevel intValue ]
+ 		    forKey: @"RadmindServerCompressionLevel" ];
+ 	    [[ NSUserDefaults standardUserDefaults ]
+ 		    setBool: YES
+ 		    forKey: @"RadmindServerEnableCompression" ];
+ 	}
+     }
+     
+     [ self prefsReload ];
  }
  
  - ( IBAction )setPort: ( id )sender
  {
+     NSMutableDictionary		*serverInfo = nil;
      NSString			*portString = [ sender stringValue ];
!     int				port, row;
      
!     row = [ prefRadmindServerTable selectedRow ];
!     if ( row < 0 || row > [ radmindServerList count ] ) {
  	return;
      }
      
!     serverInfo = [ NSMutableDictionary dictionaryWithDictionary:
! 		    [ radmindServerList objectAtIndex: row ]];
!     
!     if ( portString == nil || [ portString length ] == 0 ) {
! 	[ serverInfo removeObjectForKey: @"RadmindServerPort" ];
!     } else if (( port = [ portString intValue ] ) < 1 || port > 65535 ) {
  	NSLog( @"%@: invalid port number", portString );
  	return;
+     } else {
+ 	[ serverInfo setObject: [ NSNumber numberWithInt: port ]
+ 		forKey: @"RadmindServerPort" ];
      }
      
+     [ radmindServerList replaceObjectAtIndex: row
+ 	    withObject: serverInfo ];
      [[ NSUserDefaults standardUserDefaults ]
! 	    setObject: radmindServerList forKey: @"RadmindServers" ];
  }
  
***************
*** 744,749 ****
      rae = [[ RAAuthExec alloc ] init ];
      rc = [ rae executeTool: -1
! 		withArgs: [ NSArray arrayWithObjects: @"-A", @"EnableRUM", @"--",
! 			    ctl, [[ NSBundle mainBundle ] resourcePath ], nil ]
  		controller: nil ];
      [ rae release ];
--- 873,879 ----
      rae = [[ RAAuthExec alloc ] init ];
      rc = [ rae executeTool: -1
! 		withArgs: [ NSArray arrayWithObjects: @"-A",
! 			    @"EnableRUM", @"--", ctl,
! 			    [[ NSBundle mainBundle ] resourcePath ], nil ]
  		controller: nil ];
      [ rae release ];
***************
*** 757,760 ****
--- 887,893 ----
  	NSLog( @"Failed to launch RadmindUpdateMonitor" );
      }
+     
+     [[ NSUserDefaults standardUserDefaults ]
+ 	    setBool: YES forKey: @"RadmindUpdateMonitorEnabled" ];
  }
  
***************
*** 815,818 ****
--- 948,954 ----
  		[ asErrorDictionary objectForKey: NSAppleScriptErrorMessage ] );
      }
+     
+     [[ NSUserDefaults standardUserDefaults ]
+ 	    setBool: YES forKey: @"RadmindUpdateMonitorEnabled" ];
  }
  
***************
*** 821,825 ****
      NSString			*path = [ sender title ];
      
!     [[ NSUserDefaults standardUserDefaults ] setObject: path forKey: @"runfrompath" ];
  }
  
--- 957,962 ----
      NSString			*path = [ sender title ];
      
!     [[ NSUserDefaults standardUserDefaults ] setObject: path
! 	    forKey: @"runfrompath" ];
  }
  
***************
*** 834,838 ****
      
      editor = [ sender title ];
!     [[ NSUserDefaults standardUserDefaults ] setObject: editor forKey: @"transeditor" ];
  }
  
--- 971,976 ----
      
      editor = [ sender title ];
!     [[ NSUserDefaults standardUserDefaults ] setObject: editor
! 	    forKey: @"transeditor" ];
  }
  
***************
*** 1224,1228 ****
  - ( IBAction )addRadmindServerToTable: ( id )sender
  {
!     [ radmindServerList addObject: @"radmindserver.local" ];
      [ prefRadmindServerTable reloadData ];
      [ prefRadmindServerTable selectRow: ( [ radmindServerList count ] - 1 )
--- 1362,1371 ----
  - ( IBAction )addRadmindServerToTable: ( id )sender
  {
!     [ radmindServerList addObject:
! 	    [ NSDictionary dictionaryWithObjectsAndKeys:
! 		@"newserver.radmind.edu", @"RadmindServerName",
! 		[ NSNumber numberWithBool: NO ], @"RadmindServerEnableCompression",
! 		[ NSNumber numberWithInt: 0 ], @"RadmindServerCompressionLevel",
! 		nil ]];
      [ prefRadmindServerTable reloadData ];
      [ prefRadmindServerTable selectRow: ( [ radmindServerList count ] - 1 )
***************
*** 1246,1250 ****
      [[ NSUserDefaults standardUserDefaults ]
  	    setObject: radmindServerList
! 	    forKey: @"radmindhosts" ];
      [[ NSUserDefaults standardUserDefaults ] synchronize ];
  	
--- 1389,1393 ----
      [[ NSUserDefaults standardUserDefaults ]
  	    setObject: radmindServerList
! 	    forKey: @"RadmindServers" ];
      [[ NSUserDefaults standardUserDefaults ] synchronize ];
  	
***************
*** 1253,1314 ****
  }
  
! - ( IBAction )okEditServerTable: ( id )sender
  {
!     if ( radmindServerList != nil ) {
!         [[ NSUserDefaults standardUserDefaults ] setObject: radmindServerList
!                                                 forKey: @"radmindhosts" ];
! 	if ( [ radmindServerList count ] == 1 ) {
! 	    [[ NSUserDefaults standardUserDefaults ]
! 		    setObject: [ radmindServerList objectAtIndex: 0 ]
! 		    forKey: @"radmindhost" ];
! 	}
      }
!     [ prefEditRadmindListSheet orderOut: nil ];
!     [ NSApp endSheet: prefEditRadmindListSheet ];
!     [ prefPanel makeKeyAndOrderFront: nil ];
!     [ self prefsReload ];
  }
  
! - ( IBAction )addRadmindServer: ( id )sender
  {
!     NSUserDefaults		*defaults = nil;
!     NSMutableArray		*defaultServers = nil;
!     NSString			*newServer = nil;
      
!     defaults = [ NSUserDefaults standardUserDefaults ];
!     newServer = [ prefNewServerField stringValue ];
!     if (( defaultServers = [ defaults objectForKey: @"radmindhosts" ] ) == nil ) {
!         defaultServers = [ NSMutableArray array ];
      }
!     [ defaultServers addObject: newServer ];
!     [ defaults setObject: defaultServers forKey: @"radmindhosts" ];
      
!     [ prefRadmindHost insertItemWithTitle: newServer atIndex: 0 ];
!     [ prefRadmindHost selectItemWithTitle: newServer ];
      
!     [ prefNewServerSheet orderOut: nil ];
!     [ NSApp endSheet: prefNewServerSheet ];
!     [ prefPanel makeKeyAndOrderFront: nil ];
!     [ self prefsReload ];
  }
  
! - ( IBAction )cancelAddRadmindServer: ( id )sender
  {
!     [ prefNewServerSheet orderOut: nil ];
!     [ NSApp endSheet: prefNewServerSheet ];
      [ prefPanel makeKeyAndOrderFront: nil ];
      [ self prefsReload ];
  }
  
- - ( void )enableAddServerButton: ( NSNotification * )aNotification
- {
-     if ( [ aNotification object ] != prefNewServerField ) return;
-     
-     if ( [[ prefNewServerField stringValue ] length ] == 0 ) {
-             [ prefNewServerAddButton setEnabled: NO ];
-     } else {
-         [ prefNewServerAddButton setEnabled: YES ];
-     }
- }
  
  - ( IBAction )chooseAlternateEditor: ( id )sender
--- 1396,1493 ----
  }
  
! - ( IBAction )setCompressionLevel: ( id )sender
  {
!     NSMutableDictionary	*serverInfo = nil;
!     int			zlevel = [ sender indexOfSelectedItem ];
!     int			row = [ prefRadmindServerTable selectedRow ];
!     
!     if ( row < 0 || row >= [ radmindServerList count ] ) {
! 	return;
      }
!     
!     serverInfo = [ NSMutableDictionary dictionaryWithDictionary:
! 		    [ radmindServerList objectAtIndex: row ]];
!     
!     if ( zlevel < 0 || zlevel > 9 ) {
! 	zlevel = 0;
!     }
!     
!     [ serverInfo setObject: [ NSNumber numberWithInt: zlevel ]
! 	    forKey: @"RadmindServerCompressionLevel" ];
!     [ radmindServerList replaceObjectAtIndex: row
! 	    withObject: serverInfo ];
! 	    
!     [[ NSUserDefaults standardUserDefaults ]
! 	    setObject: radmindServerList
! 	    forKey: @"RadmindServers" ];
  }
  
! - ( IBAction )toggleCompressionSwitch: ( id )sender
  {
!     NSMutableDictionary	*serverInfo = nil;
!     BOOL		enableCompression = NO;
!     int			row = [ prefRadmindServerTable selectedRow ];
      
!     if ( [ sender state ] == NSOnState ) {
! 	enableCompression = YES;
      }
!     [ prefRadmindServerSettingCompressionLevel
! 	    setEnabled: enableCompression ];
      
!     if ( row < 0 || row >= [ radmindServerList count ] ) {
! 	return;
!     }
      
!     serverInfo = [ NSMutableDictionary dictionaryWithDictionary:
! 		    [ radmindServerList objectAtIndex: row ]];
!     
!     [ serverInfo setObject: [ NSNumber numberWithBool: enableCompression ]
! 	    forKey: @"RadmindServerEnableCompression" ];
!     [ radmindServerList replaceObjectAtIndex: row
! 	    withObject: serverInfo ];
! 	    
!     [[ NSUserDefaults standardUserDefaults ]
! 	    setObject: radmindServerList
! 	    forKey: @"RadmindServers" ];
  }
  
! - ( IBAction )okEditServerTable: ( id )sender
  {
!     if ( radmindServerList != nil ) {
!         [[ NSUserDefaults standardUserDefaults ] setObject: radmindServerList
!                                                 forKey: @"RadmindServers" ];
! 	if ( [ radmindServerList count ] == 1 ) {
! 	    NSDictionary	*serverInfo = nil;
! 	    BOOL		compress = NO;
! 	    
! 	    serverInfo = [ radmindServerList objectAtIndex: 0 ];
! 	    
! 	    if ( [[ serverInfo objectForKey:
! 		    @"RadmindServerEnableCompression" ] intValue ] ) {
! 		compress = YES;
! 	    }
! 	    
! 	    [[ NSUserDefaults standardUserDefaults ]
! 		    setObject: [ serverInfo objectForKey: @"RadmindServerName" ]
! 		    forKey: @"radmindhost" ];
! 	    [[ NSUserDefaults standardUserDefaults ]
! 		    setObject: [ serverInfo objectForKey: @"RadmindServerPort" ]
! 		    forKey: @"RadmindServerPort" ];
! 	    [[ NSUserDefaults standardUserDefaults ]
! 		    setBool: compress
! 		    forKey: @"RadmindServerEnableCompression" ];
! 	    [[ NSUserDefaults standardUserDefaults ]
! 		    setInteger: [[ serverInfo objectForKey:
! 				    @"RadmindServerCompressionLevel" ]
! 				    intValue ]
! 		    forKey: @"RadmindServerCompressionLevel" ];
! 	}
!     }
!     [ prefEditRadmindListSheet orderOut: nil ];
!     [ NSApp endSheet: prefEditRadmindListSheet ];
      [ prefPanel makeKeyAndOrderFront: nil ];
      [ self prefsReload ];
  }
  
  
  - ( IBAction )chooseAlternateEditor: ( id )sender
***************
*** 1379,1383 ****
          row: ( int )row
  {
!     return( [ radmindServerList objectAtIndex: row ] );
  }
  
--- 1558,1563 ----
          row: ( int )row
  {
!     return( [[ radmindServerList objectAtIndex: row ]
! 		objectForKey: @"RadmindServerName" ] );
  }
  
***************
*** 1386,1394 ****
          row: ( int )row
  {
!     if ( ! [ obj isKindOfClass: [ NSString class ]] ) return;
!     if ( ! [ ( NSString * )obj length ] ) return;
!     if ( row < 0 || row > [ radmindServerList count ] ) return;
      
!     [ radmindServerList replaceObjectAtIndex: row withObject: obj ];
      [ prefRadmindServerTable reloadData ];
  }
--- 1566,1587 ----
          row: ( int )row
  {
!     NSMutableDictionary    *serverInfo = nil;
      
!     if ( ! [ obj isKindOfClass: [ NSString class ]] ) {
! 	return;
!     }
!     if ( ! [ ( NSString * )obj length ] ) {
! 	return;
!     }
!     if ( row < 0 || row > [ radmindServerList count ] ) {
! 	return;
!     }
!     
!     serverInfo = [ NSMutableDictionary dictionaryWithDictionary:
! 		    [ radmindServerList objectAtIndex: row ]];
!     [ serverInfo setObject: obj forKey: @"RadmindServerName" ];
!     
!     [ radmindServerList replaceObjectAtIndex: row
! 	    withObject: serverInfo ];
      [ prefRadmindServerTable reloadData ];
  }
***************
*** 1396,1406 ****
  - ( void )tableViewSelectionDidChange: ( NSNotification * )notification
  {
      BOOL	    enabled = NO;
      
!     if ( [ prefRadmindServerTable selectedRow ] >= 0 ) {
  	enabled = YES;
      }
      
      [ prefDeleteRadmindServerButton setEnabled: enabled ];
  }
  
--- 1589,1641 ----
  - ( void )tableViewSelectionDidChange: ( NSNotification * )notification
  {
+     NSArray	    *servers = nil;
+     NSDictionary    *serverInfo = nil;
+     NSNumber	    *port;
+     NSString	    *serverName;
      BOOL	    enabled = NO;
+     int		    row, compress = 0, zlevel = 0;
      
!     if (( row = [ prefRadmindServerTable selectedRow ] ) >= 0 ) {
  	enabled = YES;
      }
      
      [ prefDeleteRadmindServerButton setEnabled: enabled ];
+     
+     servers = [[ NSUserDefaults standardUserDefaults ]
+ 		    objectForKey: @"RadmindServers" ];
+     
+     [ prefRadmindServerSettingBox setTitle:
+ 	    NSLocalizedString( @"Server Settings", @"Server Settings" ) ];
+     [ prefRadmindServerSettingCompress setState: NSOffState ];
+     [ prefRadmindServerSettingCompress setEnabled: NO ];
+     [ prefRadmindServerSettingCompressionLevel setEnabled: NO ];
+     [ prefRadmindServerSettingCompressionLevel selectItemAtIndex: 0 ];
+     [ prefRadmindServerSettingPort setStringValue: @"" ];
+     [ prefRadmindServerSettingPort setEnabled: NO ];
+ 		    
+     if ( row < 0 || row >= [ servers count ] ) {
+ 	return;
+     }
+     
+     [ prefRadmindServerSettingCompress setEnabled: YES ];
+     [ prefRadmindServerSettingPort setEnabled: YES ];
+     
+     serverInfo = [ servers objectAtIndex: row ];
+     serverName = [ serverInfo objectForKey: @"RadmindServerName" ];
+     port = [ serverInfo objectForKey: @"RadmindServerPort" ];
+     compress = [[ serverInfo objectForKey:
+ 		@"RadmindServerEnableCompression" ] intValue ];
+     zlevel = [[ serverInfo objectForKey:
+ 		@"RadmindServerCompressionLevel" ] intValue ];
+ 		
+     [ prefRadmindServerSettingBox setTitle: serverName ];
+     if ( port != nil ) {
+ 	[ prefRadmindServerSettingPort setObjectValue: port ];
+     }
+     if ( compress ) {
+ 	[ prefRadmindServerSettingCompress setState: NSOnState ];
+ 	[ prefRadmindServerSettingCompressionLevel selectItemAtIndex: zlevel ];
+ 	[ prefRadmindServerSettingCompressionLevel setEnabled: YES ];
+     }
  }
  

Index: RCMPreferences.h
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/RCMPreferences.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** RCMPreferences.h	18 Nov 2005 15:21:40 -0000	1.22
--- RCMPreferences.h	24 Feb 2006 22:19:35 -0000	1.23
***************
*** 30,33 ****
--- 30,37 ----
      IBOutlet NSButton		*prefDeleteRadmindServerButton;
      IBOutlet NSTableView	*prefRadmindServerTable;
+     IBOutlet NSBox		*prefRadmindServerSettingBox; 
+     IBOutlet NSTextField	*prefRadmindServerSettingPort;
+     IBOutlet NSButton		*prefRadmindServerSettingCompress;
+     IBOutlet NSPopUpButton	*prefRadmindServerSettingCompressionLevel;
      
      /* general prefs view */
***************
*** 35,39 ****
      IBOutlet NSMatrix 		*prefGlobalCksum;
      IBOutlet NSPopUpButton 	*prefRadmindHost;
!     IBOutlet NSTextField	*prefRadmindServerPort;
      IBOutlet NSButton		*prefLapplyForce;
      IBOutlet NSButton		*prefIgnoreLcreateErrors;
--- 39,45 ----
      IBOutlet NSMatrix 		*prefGlobalCksum;
      IBOutlet NSPopUpButton 	*prefRadmindHost;
!     IBOutlet NSTextField	*prefServerCompressionSummary;
!     IBOutlet NSTextField	*prefServerPortSummary;
!     IBOutlet NSButton		*prefEnableRadmindUpdateMonitor;
      IBOutlet NSButton		*prefLapplyForce;
      IBOutlet NSButton		*prefIgnoreLcreateErrors;
***************
*** 125,131 ****
  
  - ( IBAction )editRadmindServerList: ( id )sender;
! - ( IBAction )addRadmindServer: ( id )sender;
! - ( IBAction )cancelAddRadmindServer: ( id )sender;
! 
  - ( IBAction )deleteRadmindServerFromTable: ( id )sender;
  - ( IBAction )okEditServerTable: ( id )sender;
--- 131,137 ----
  
  - ( IBAction )editRadmindServerList: ( id )sender;
! - ( IBAction )setCompressionLevel: ( id )sender;
! - ( IBAction )toggleCompressionSwitch: ( id )sender;
! - ( IBAction )addRadmindServerToTable: ( id )sender;
  - ( IBAction )deleteRadmindServerFromTable: ( id )sender;
  - ( IBAction )okEditServerTable: ( id )sender;

[Radmind-commit] radmind-assistant RASTableView.m,1.7,1.8

[Andrew M. <fit...@us...>]

Update of /cvsroot/radmind/radmind-assistant
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25234

Modified Files:
	RASTableView.m 
Log Message:
-textDidEndEditing stub.


Index: RASTableView.m
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/RASTableView.m,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RASTableView.m	9 Aug 2005 04:38:07 -0000	1.7
--- RASTableView.m	24 Feb 2006 22:17:41 -0000	1.8
***************
*** 71,73 ****
--- 71,107 ----
  }
  
+ - ( void )textDidEndEditing: ( NSNotification * )aNotification
+ {
+     int			tm = [[[ aNotification userInfo ]
+ 				objectForKey: @"NSTextMovement" ] intValue ];
+     
+     if ( tm == NSReturnTextMovement || tm == NSTabTextMovement ) {
+ 	NSMutableDictionary	*newUserInfo;
+ 	NSNotification		*newNotification;
+ 	
+         if ( [[ self dataSource ] respondsToSelector:
+ 		    @selector( handleChangedText:forTable: ) ] ) {
+             [[ self dataSource ]
+ 		    handleChangedText: [[ aNotification object ] string ]
+ 		    forTable: self ];
+         }
+         
+ 	newUserInfo = [ NSMutableDictionary dictionaryWithDictionary:
+ 				[ aNotification userInfo ]];
+ 	[ newUserInfo setObject:
+ 		    [ NSNumber numberWithInt: NSIllegalTextMovement ]
+ 		    forKey: @"NSTextMovement" ];
+ 	newNotification = [ NSNotification
+ 				notificationWithName: [ aNotification name ]
+ 				object: [ aNotification object ]
+ 				userInfo: newUserInfo ];
+ 		
+ 	[ super textDidEndEditing: newNotification ];
+         [[ self window ] makeFirstResponder: self ];
+ 	return;
+     }
+     
+     [ super textDidEndEditing: aNotification ];
+ }
+ 
  @end

[Radmind-commit] radmind-assistant RAEditorLauncher.m,1.9,1.10

[Andrew M. <fit...@us...>]

Update of /cvsroot/radmind/radmind-assistant
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24855

Modified Files:
	RAEditorLauncher.m 
Log Message:
Removed nasty .term file dependency.
Using bundle ID to locate RTE.


Index: RAEditorLauncher.m
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/RAEditorLauncher.m,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** RAEditorLauncher.m	2 Jul 2003 00:07:25 -0000	1.9
--- RAEditorLauncher.m	24 Feb 2006 22:16:55 -0000	1.10
***************
*** 1,4 ****
  /*
!  * Copyright (c) 2003 Regents of The University of Michigan.
   * All Rights Reserved.  See COPYRIGHT.
   */
--- 1,4 ----
  /*
!  * Copyright (c) 2006 Regents of The University of Michigan.
   * All Rights Reserved.  See COPYRIGHT.
   */
***************
*** 6,15 ****
  #import "RAEditorLauncher.h"
  
- #include <sys/types.h>
- #include <errno.h>
- #include <unistd.h>
- 
- extern int			errno;
- 
  @implementation RAEditorLauncher
  
--- 6,9 ----
***************
*** 29,41 ****
      NSUserDefaults		*defaults;
      NSArray			*altEditors;
      int				i;
-     NSMutableDictionary		*term;
-     NSString			*termPath;
      
!     if ( strstr(( char * )[ editor UTF8String ], "Radmind" ) != NULL ) {
!         NSString		*rtepath = [[ NSBundle mainBundle ]
!                                     pathForResource: @"Radmind Transcript Editor"
!                                     ofType: @"app" ];
!                                     
          if ( tPath == nil ) {
              if ( ![[ NSWorkspace sharedWorkspace ] openFile: rtepath ] ) {
--- 23,48 ----
      NSUserDefaults		*defaults;
      NSArray			*altEditors;
+     NSString			*bundleID = @"edu.umich.radmindtranscripteditor";
+     NSString			*rtepath;
+     NSAppleScript               *as = nil;
+     NSDictionary                *errorDictionary = nil;
+     NSString                    *scriptSource = nil;
      int				i;
      
!     if ( [ editor isEqualToString: @"Radmind Transcript Editor" ] ) {
! 	if (( rtepath = [[ NSWorkspace sharedWorkspace ]
! 		    absolutePathForAppBundleWithIdentifier: bundleID ] ) == nil ) {
! 	    rtepath = [[ NSBundle mainBundle ]
! 			pathForResource: editor ofType: @"app" ];
! 	    if ( rtepath == nil ) {
! 		NSRunAlertPanel( NSLocalizedString( @"Error", @"Error" ),
! 			NSLocalizedString(
! 				@"Couldn't locate the Radmind Transcript Editor",
! 				@"Couldn't locate the Radmind Transcript Editor" ),
! 			NSLocalizedString( @"OK", @"OK" ), @"", @"" );
! 		return( NO );
! 	    }
! 	}
! 
          if ( tPath == nil ) {
              if ( ![[ NSWorkspace sharedWorkspace ] openFile: rtepath ] ) {
***************
*** 46,50 ****
              return( YES );
          }
!         /* this fails if tPath isn't readable by the user */
          if ( ![[ NSWorkspace sharedWorkspace ] openFile: tPath
                              withApplication: rtepath
--- 53,61 ----
              return( YES );
          }
!         /*
! 	 * this fails if tPath isn't readable by the user.
! 	 * should use NSWorkspace's launchAppWithBundleIdentifier...
! 	 * and pass doc path as part of paramdescriptor
! 	 */
          if ( ![[ NSWorkspace sharedWorkspace ] openFile: tPath
                              withApplication: rtepath
***************
*** 77,115 ****
          }
      }
-     
-     term = [[ NSMutableDictionary alloc ] init ];
-     
-     [ term setDictionary: [ NSDictionary dictionaryWithContentsOfFile:
-         [[ NSBundle mainBundle ] pathForResource: @"template" ofType: @"term" ]]];
  
!     [[[ term objectForKey: @"WindowSettings" ] objectAtIndex: 0 ] setObject:
!             [ NSString stringWithFormat: @"/usr/bin/sudo %@ %@ ; exit", editor, tPath ]
!             forKey: @"ExecutionString" ];
!                 
!     termPath = [ NSString stringWithFormat: @"/tmp/ra.%d.term", getpid() ];
!     
!     if ( access(( char * )[ termPath UTF8String ], F_OK ) == 0 ) {
!         if ( unlink(( char * )[ termPath UTF8String ] ) < 0 ) {
!             NSLog( @"unlink %@: %s", termPath, strerror( errno ));
!             return( NO );
!         }
!     }
!     
!     if ( ![ term writeToFile: termPath atomically: YES ] ) {
!         NSRunAlertPanel( @"Error creating terminal session.",
!                             @"Couldn't write .term file to /tmp",
!                             @"OK", @"", @"" );
!         return( NO );
!     }
      
!     if ( ![[ NSWorkspace sharedWorkspace ] openFile: termPath
!                                         withApplication: @"Terminal.app"
!                                         andDeactivate: YES ] ) {
!         NSRunAlertPanel( @"Error launching editing session.",
!                             @"Couldn't launch Terminal",
!                             @"OK", @"", @"" );
          return( NO );
      }
!     
      return( YES );
  }
--- 88,105 ----
          }
      }
  
!     scriptSource = [ NSString stringWithFormat: 
! 			@"tell application \"Terminal\"\r"
! 			    @"activate\r"
! 			    @"do script \"/usr/bin/sudo %@ \\\"%@\\\"; exit\"\r"
! 			@"end tell", editor, tPath ];
      
!     as = [[[ NSAppleScript alloc ] initWithSource: scriptSource ] autorelease ];
!     if ( [ as executeAndReturnError: &errorDictionary ] == nil ) {
!         NSLog( @"Failed to open terminal with AppleScript: %@",
!                 [ errorDictionary objectForKey: @"NSAppleScriptErrorMessage" ] );
          return( NO );
      }
! 
      return( YES );
  }

[Radmind-commit] radmind-assistant Info.plist,1.8,1.9

[Andrew M. <fit...@us...>]

Update of /cvsroot/radmind/radmind-assistant
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24488

Modified Files:
	Info.plist 
Log Message:
Updated versions.


Index: Info.plist
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/Info.plist,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Info.plist	12 Aug 2005 19:29:42 -0000	1.8
--- Info.plist	24 Feb 2006 22:16:00 -0000	1.9
***************
*** 8,12 ****
  	<string>Radmind Assistant</string>
  	<key>CFBundleGetInfoString</key>
! 	<string>Radmind Assistant 1.0.0rc1</string>
  	<key>CFBundleIconFile</key>
  	<string>radassist</string>
--- 8,12 ----
  	<string>Radmind Assistant</string>
  	<key>CFBundleGetInfoString</key>
! 	<string>Radmind Assistant 1.0.0</string>
  	<key>CFBundleIconFile</key>
  	<string>radassist</string>
***************
*** 20,28 ****
  	<string>APPL</string>
  	<key>CFBundleShortVersionString</key>
! 	<string>1.0.0rc1</string>
  	<key>CFBundleSignature</key>
  	<string>????</string>
  	<key>CFBundleVersion</key>
! 	<string>1.0.0rc1</string>
  	<key>NSMainNibFile</key>
  	<string>MainMenu</string>
--- 20,28 ----
  	<string>APPL</string>
  	<key>CFBundleShortVersionString</key>
! 	<string>1.0.0</string>
  	<key>CFBundleSignature</key>
  	<string>????</string>
  	<key>CFBundleVersion</key>
! 	<string>1.0.0</string>
  	<key>NSMainNibFile</key>
  	<string>MainMenu</string>
***************
*** 30,34 ****
  	<string>NSApplication</string>
  	<key>RABundledRadmindVersion</key>
! 	<string>150</string>
  </dict>
  </plist>
--- 30,34 ----
  	<string>NSApplication</string>
  	<key>RABundledRadmindVersion</key>
! 	<string>160</string>
  </dict>
  </plist>

[Radmind-commit] radmind-assistant COPYRIGHT.txt,1.2,1.3

[Andrew M. <fit...@us...>]

Update of /cvsroot/radmind/radmind-assistant
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24414

Modified Files:
	COPYRIGHT.txt 
Log Message:
Updated copyright date.


Index: COPYRIGHT.txt
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/COPYRIGHT.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** COPYRIGHT.txt	12 Jun 2003 18:53:52 -0000	1.2
--- COPYRIGHT.txt	24 Feb 2006 22:15:37 -0000	1.3
***************
*** 1,3 ****
! Copyright (c) 2003 Regents of The University of Michigan.
  All Rights Reserved.
  
--- 1,3 ----
! Copyright (c) 2006 Regents of The University of Michigan.
  All Rights Reserved.
  

[Radmind-commit] radmind-assistant 10.4-desktop-negative.T,1.5,1.6 10.4-lab-negative.T,1.5,1.6

[Andrew M. <fit...@us...>]

Update of /cvsroot/radmind/radmind-assistant
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24021

Modified Files:
	10.4-desktop-negative.T 10.4-lab-negative.T 
Log Message:
Transcripts for 10.4 are absolute paths.


Index: 10.4-lab-negative.T
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/10.4-lab-negative.T,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** 10.4-lab-negative.T	1 Sep 2005 20:46:16 -0000	1.5
--- 10.4-lab-negative.T	24 Feb 2006 22:15:08 -0000	1.6
***************
*** 1,197 ****
  # Spotlight database directory. Every writable mounted volume gets one.
! d ./.Spotlight-V100                   	0600     0    80
  
  # Obvious, no? Every volume has its own .Trashes folder
! d ./.Trashes                           	1333     0    80 AAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
  
  # database of frequently-accessed small files
! a ./.hotfiles.btree                     0600     0     0 1111523163   65630 RQBDAUdqJnkTxJsKZZYxUz9veiQ=
  
  # volfs mount point, used by Carbon applications
! d ./.vol                               	0555     0     0
  
  # Cached information
! d ./Library/Caches                     	1777     0    80
  
  # ColorSync Display Profiles
! d ./Library/ColorSync/Profiles/Displays 0775     0    80
  
  # Console logs, crash reports, etc.
! d ./Library/Logs                        0775     0    80
  
  # Global preferences, energy saver settings, login timeouts, etc.
  # Remove or comment out if you're managing a lab.
! #f ./Library/Preferences/.GlobalPreferences.plist        0644     0    80 1123612723     0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # Available network interface information
! f ./Library/Preferences/SystemConfiguration/NetworkInterfaces.plist 0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
! # Additional SystemConfiguration settings. Should be commented out for# a more fully managed environment, like a lab.
! #f ./Library/Preferences/SystemConfiguration/com.apple.PowerManagement.plist     0644     0    80 1072504750    1245 7W+4djjIZRBJlrUsVSTJw5yqBNg=
! #f ./Library/Preferences/SystemConfiguration/com.apple.airport.preferences.plist 0644     0    80 1125594056    6623 n9W/Jthauzh/RV1laotcA/Tq6r0=
! #f ./Library/Preferences/SystemConfiguration/com.apple.nat.plist 0644     0    80 1069909129     909 SrYrmXU/e4XidaiU74MajA+jtho=
  
  # Machine's rendezvous name, AppleTalk name, DHCP settings, etc.
! #f ./Library/Preferences/SystemConfiguration/preferences.plist 0644     0    80 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # audio settings, like volume and balance
! #f ./Library/Preferences/com.apple.audio.DeviceSettings.plist    0644     0    80 1125436293    2109 cdfG/Cgo1JJ+jdOCJErkAqoRJfg= 
  
  # loginwindow settings. Should be managed in a lab, although it breaks
  # tripwire because use of the loginwindow modifies it.
! #f ./Library/Preferences/com.apple.loginwindow.plist     0644     0    80 1125439218      90 9EVFNVmVvgTkZyIJ6o+IndqD2l8=
  
  # Network share browsing
! d ./Network                            	0755     0     0
  
  # Cached information (kernel cache, fonts)
! d ./System/Library/Caches              	0755     0     0
  
  # Extensions caching. Remove the files after installing new kexts.
! f ./System/Library/Extensions.kextcache 0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f ./System/Library/Extensions.mkext     0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # User home directories. Don't delete them. Use the User Management scripts
  # if you need to manage user profiles in a lab.
! d ./Users                              	1775     0    80
  
  # Shared User space, required by some applications
! d ./Users/Shared                        0775     0    80
  
  # Other volumes mounted here.
! d ./Volumes                            	1777     0    80 AAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
  
  # automount volumes from fstab or netinfo. If you mount NFS shares, you'll
! # probably need to add ./private/automount to your negative.
! d ./automount                          	0755     0    80
  
  # If coring is enabled, here's where cores go.
! d ./cores                              	1775     0    80 AAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
  
  # Mac OS X uses a devfs and fdesc filesystem to handle /dev and /dev/fd
! d ./dev                                	0555     0     0
  
  # Created by /etc/rc on boot
! f ./mach.sym                            0444     0    80 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # cupsd(8) components. Comment out if managing a lab.
! #f ./private/etc/cups/certs/0                    0440     0    80 1122301379      32 W4eA+rgISk8sh5okWWnZnkt6VBE=
! #d ./private/etc/cups/ppd                        0755     0    26
! #f ./private/etc/cups/printers.conf              0600     0    26 1111362301    2751 gokL/omR4IyPaOsFG/geqRDX6KM=
  
  # dump(8) date records
! f ./private/etc/dumpdates               0644     0     0 1124886610       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # managed by cupsd(8).
! f ./private/etc/printcap                0644     0     0 1121953780     143 zMWyr8b2agfzVBQrIAayMkMfh5M=
  
  # Used by netbooting
! d ./private/tftpboot                   	0755     0     0
  
  # temporary files, managed by system
! d ./private/tmp                        	1777     0     0
  
  # at(1) queues
! d ./private/var/at/jobs                	0755     1     0
! d ./private/var/at/spool               	0755     1     0
  
  # NetInfo DB backups, done nightly by /etc/periodic/daily/500.daily
! d ./private/var/backups                 0700     0     0
  
  # crontabs
! #d ./private/var/cron/tabs              	0755     0     0
  
  # Apple caches
! f ./private/var/db/BootCache.playlist   0600     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f ./private/var/db/CodeEquivalenceDatabase 0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # Spotlight databases for non-local volumes
! d ./private/var/db/Spotlight-V100       0600     0     0
  
  # more caches
! f ./private/var/db/SystemEntropyCache   0600     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! d ./private/var/db/TokenCache          	0711     0     0
  
  # crashdump(8)
! d ./private/var/db/crashdump            0755     0     0
  
  # DHCP leases
! d ./private/var/db/dhcpclient/leases   	0700     0     0
  
  # determines progress bar speed during boot. See WaitingForLoginWindow(8)
! f ./private/var/db/loginwindow.boottime 0644     0     0 1111523219      10 rUMgoS75n+VDUxo9RkTrGejeuTM=
  
  # NetInfo contains local user account information. The hash folder has
  # files containing MD5 hashes of the user passwords. Remove or comment
  # out the next two lines if you're running a lab.
! #d ./private/var/db/netinfo/local.nidb  	0700     0     0
! #d ./private/var/db/shadow/hash         	0700     0     0
  
  # managed by rpc.statd(8)
! f ./private/var/db/statd.status         0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # managed by vsdbutil (no manpage yet)
! f ./private/var/db/volinfo.database     0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # launchd(8), Apple's replacement for init and StartupItems
! d ./private/var/launchd                 0755     0     0
  
  # Logging facilities. syslogd doesn't create them if they're missing.
! d ./private/var/log                    	0755     0     0
! d ./private/var/log/cups               	0755     0     0
! f ./private/var/log/cups/access_log     0644     0    26 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f ./private/var/log/cups/error_log      0644     0    26 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! d ./private/var/log/fax                	0755     0     0
! f ./private/var/log/ftp.log            	0644     0     0 1098606428       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! d ./private/var/log/httpd              	0755     0     0
! f ./private/var/log/install.log         0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f ./private/var/log/ipfw.log           	0640     0    80 1098606428       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f ./private/var/log/lastlog             0640     0    80 1111695092   14056 IYdy7EsLIl+fOmX89xDLlCElJRk=
! f ./private/var/log/lpr.log            	0644     0     0 1098606428       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f ./private/var/log/mail.log            0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f ./private/var/log/netinfo.log        	0644     0     0 1098606428       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! d ./private/var/log/ppp                	0755     0     0
! d ./private/var/log/sa                 	0755     0     0
! d ./private/var/log/samba              	0755     0     0
! f ./private/var/log/secure.log          0600     0    80 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f ./private/var/log/system.log          0640     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f ./private/var/log/windowserver.log    0640     0    80 1111693676    2276 1Dw1n/DznTLoa6TH9qZQm+K/1t0=
! f ./private/var/log/wtmp                0644     0    80 1111695092     720 qdyP/5LrB7f0J2qFV0YTBL25tB4=
  
  # used by the postfix mail transfer agent
! d ./private/var/mail                   	0775     0     6
  
  # radmind client data
! d ./private/var/radmind/client         	0755     0     0
  
  # where pid information is stored for running processes
! d ./private/var/run                    	0775     0     1
  
  # slpd(1). Could probably be in base.
! f ./private/var/slp.regfile             0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # CUPS print spooling
! d ./private/var/spool/cups             	0710     0    26
! d ./private/var/spool/cups/tmp         	1770     0    26
  
  # Faxes
! d ./private/var/spool/fax              	0750     0     0
  
  # Mail and postfix spool folders
! d ./private/var/spool/mqueue           	0750     0     0
! d ./private/var/spool/postfix          	0755     0     0
  
  # Maybe for SMB printing?
! d ./private/var/spool/samba            	0775     0     0
  
  # Temporary items, managed by the system.
! d ./private/var/tmp                    	1777     0     0
  
  # Virtual memory
! d ./private/var/vm                     	0755     0     0
  
  # Xgrid client job control
! d ./private/var/xgrid/agent            	0755    86     0
! d ./private/var/xgrid/agent/cookies    	0755    86     0
! d ./private/var/xgrid/controller       	0755    85     0
! d ./private/var/xgrid/controller/blobs 	0755    85     0
--- 1,198 ----
  # Spotlight database directory. Every writable mounted volume gets one.
! d /.Spotlight-V100                   	0600     0    80
  
  # Obvious, no? Every volume has its own .Trashes folder
! d /.Trashes                           	1333     0    80 AAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
  
  # database of frequently-accessed small files
! a /.hotfiles.btree                     0600     0     0 1111523163   65630 RQBDAUdqJnkTxJsKZZYxUz9veiQ=
  
  # volfs mount point, used by Carbon applications
! d /.vol                               	0555     0     0
  
  # Cached information
! d /Library/Caches                     	1777     0    80
  
  # ColorSync Display Profiles
! d /Library/ColorSync/Profiles/Displays 0775     0    80
  
  # Console logs, crash reports, etc.
! d /Library/Logs                        0775     0    80
  
  # Global preferences, energy saver settings, login timeouts, etc.
  # Remove or comment out if you're managing a lab.
! #f /Library/Preferences/.GlobalPreferences.plist        0644     0    80 1123612723     0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # Available network interface information
! f /Library/Preferences/SystemConfiguration/NetworkInterfaces.plist 0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
! # Additional SystemConfiguration settings. Should be commented out for
! # a more fully managed environment, like a lab.
! #f /Library/Preferences/SystemConfiguration/com.apple.PowerManagement.plist     0644     0    80 1072504750    1245 7W+4djjIZRBJlrUsVSTJw5yqBNg=
! #f /Library/Preferences/SystemConfiguration/com.apple.airport.preferences.plist 0644     0    80 1125594056    6623 n9W/Jthauzh/RV1laotcA/Tq6r0=
! #f /Library/Preferences/SystemConfiguration/com.apple.nat.plist 0644     0    80 1069909129     909 SrYrmXU/e4XidaiU74MajA+jtho=
  
  # Machine's rendezvous name, AppleTalk name, DHCP settings, etc.
! #f /Library/Preferences/SystemConfiguration/preferences.plist 0644     0    80 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # audio settings, like volume and balance
! #f /Library/Preferences/com.apple.audio.DeviceSettings.plist    0644     0    80 1125436293    2109 cdfG/Cgo1JJ+jdOCJErkAqoRJfg= 
  
  # loginwindow settings. Should be managed in a lab, although it breaks
  # tripwire because use of the loginwindow modifies it.
! #f /Library/Preferences/com.apple.loginwindow.plist     0644     0    80 1125439218      90 9EVFNVmVvgTkZyIJ6o+IndqD2l8=
  
  # Network share browsing
! d /Network                            	0755     0     0
  
  # Cached information (kernel cache, fonts)
! d /System/Library/Caches              	0755     0     0
  
  # Extensions caching. Remove the files after installing new kexts.
! f /System/Library/Extensions.kextcache 0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f /System/Library/Extensions.mkext     0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # User home directories. Don't delete them. Use the User Management scripts
  # if you need to manage user profiles in a lab.
! d /Users                              	1775     0    80
  
  # Shared User space, required by some applications
! d /Users/Shared                        0775     0    80
  
  # Other volumes mounted here.
! d /Volumes                            	1777     0    80 AAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
  
  # automount volumes from fstab or netinfo. If you mount NFS shares, you'll
! # probably need to add /private/automount to your negative.
! d /automount                          	0755     0    80
  
  # If coring is enabled, here's where cores go.
! d /cores                              	1775     0    80 AAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
  
  # Mac OS X uses a devfs and fdesc filesystem to handle /dev and /dev/fd
! d /dev                                	0555     0     0
  
  # Created by /etc/rc on boot
! f /mach.sym                            0444     0    80 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # cupsd(8) components. Comment out if managing a lab.
! #f /private/etc/cups/certs/0                    0440     0    80 1122301379      32 W4eA+rgISk8sh5okWWnZnkt6VBE=
! #d /private/etc/cups/ppd                        0755     0    26
! #f /private/etc/cups/printers.conf              0600     0    26 1111362301    2751 gokL/omR4IyPaOsFG/geqRDX6KM=
  
  # dump(8) date records
! f /private/etc/dumpdates               0644     0     0 1124886610       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # managed by cupsd(8).
! f /private/etc/printcap                0644     0     0 1121953780     143 zMWyr8b2agfzVBQrIAayMkMfh5M=
  
  # Used by netbooting
! d /private/tftpboot                   	0755     0     0
  
  # temporary files, managed by system
! d /private/tmp                        	1777     0     0
  
  # at(1) queues
! d /private/var/at/jobs                	0755     1     0
! d /private/var/at/spool               	0755     1     0
  
  # NetInfo DB backups, done nightly by /etc/periodic/daily/500.daily
! d /private/var/backups                 0700     0     0
  
  # crontabs
! #d /private/var/cron/tabs              	0755     0     0
  
  # Apple caches
! f /private/var/db/BootCache.playlist   0600     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f /private/var/db/CodeEquivalenceDatabase 0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # Spotlight databases for non-local volumes
! d /private/var/db/Spotlight-V100       0600     0     0
  
  # more caches
! f /private/var/db/SystemEntropyCache   0600     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! d /private/var/db/TokenCache          	0711     0     0
  
  # crashdump(8)
! d /private/var/db/crashdump            0755     0     0
  
  # DHCP leases
! d /private/var/db/dhcpclient/leases   	0700     0     0
  
  # determines progress bar speed during boot. See WaitingForLoginWindow(8)
! f /private/var/db/loginwindow.boottime 0644     0     0 1111523219      10 rUMgoS75n+VDUxo9RkTrGejeuTM=
  
  # NetInfo contains local user account information. The hash folder has
  # files containing MD5 hashes of the user passwords. Remove or comment
  # out the next two lines if you're running a lab.
! #d /private/var/db/netinfo/local.nidb  	0700     0     0
! #d /private/var/db/shadow/hash         	0700     0     0
  
  # managed by rpc.statd(8)
! f /private/var/db/statd.status         0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # managed by vsdbutil (no manpage yet)
! f /private/var/db/volinfo.database     0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # launchd(8), Apple's replacement for init and StartupItems
! d /private/var/launchd                 0755     0     0
  
  # Logging facilities. syslogd doesn't create them if they're missing.
! d /private/var/log                    	0755     0     0
! d /private/var/log/cups               	0755     0     0
! f /private/var/log/cups/access_log     0644     0    26 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f /private/var/log/cups/error_log      0644     0    26 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! d /private/var/log/fax                	0755     0     0
! f /private/var/log/ftp.log            	0644     0     0 1098606428       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! d /private/var/log/httpd              	0755     0     0
! f /private/var/log/install.log         0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f /private/var/log/ipfw.log           	0640     0    80 1098606428       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f /private/var/log/lastlog             0640     0    80 1111695092   14056 IYdy7EsLIl+fOmX89xDLlCElJRk=
! f /private/var/log/lpr.log            	0644     0     0 1098606428       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f /private/var/log/mail.log            0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f /private/var/log/netinfo.log        	0644     0     0 1098606428       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! d /private/var/log/ppp                	0755     0     0
! d /private/var/log/sa                 	0755     0     0
! d /private/var/log/samba              	0755     0     0
! f /private/var/log/secure.log          0600     0    80 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f /private/var/log/system.log          0640     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f /private/var/log/windowserver.log    0640     0    80 1111693676    2276 1Dw1n/DznTLoa6TH9qZQm+K/1t0=
! f /private/var/log/wtmp                0644     0    80 1111695092     720 qdyP/5LrB7f0J2qFV0YTBL25tB4=
  
  # used by the postfix mail transfer agent
! d /private/var/mail                   	0775     0     6
  
  # radmind client data
! d /private/var/radmind/client         	0755     0     0
  
  # where pid information is stored for running processes
! d /private/var/run                    	0775     0     1
  
  # slpd(1). Could probably be in base.
! f /private/var/slp.regfile             0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # CUPS print spooling
! d /private/var/spool/cups             	0710     0    26
! d /private/var/spool/cups/tmp         	1770     0    26
  
  # Faxes
! d /private/var/spool/fax              	0750     0     0
  
  # Mail and postfix spool folders
! d /private/var/spool/mqueue           	0750     0     0
! d /private/var/spool/postfix          	0755     0     0
  
  # Maybe for SMB printing?
! d /private/var/spool/samba            	0775     0     0
  
  # Temporary items, managed by the system.
! d /private/var/tmp                    	1777     0     0
  
  # Virtual memory
! d /private/var/vm                     	0755     0     0
  
  # Xgrid client job control
! d /private/var/xgrid/agent            	0755    86     0
! d /private/var/xgrid/agent/cookies    	0755    86     0
! d /private/var/xgrid/controller       	0755    85     0
! d /private/var/xgrid/controller/blobs 	0755    85     0

Index: 10.4-desktop-negative.T
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/10.4-desktop-negative.T,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** 10.4-desktop-negative.T	1 Sep 2005 18:28:53 -0000	1.5
--- 10.4-desktop-negative.T	24 Feb 2006 22:15:08 -0000	1.6
***************
*** 1,199 ****
  # Spotlight database directory. Every writable mounted volume gets one.
! d ./.Spotlight-V100                   	0600     0    80
  
  # Obvious, no? Every volume has its own .Trashes folder
! d ./.Trashes                           	1333     0    80 AAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
  
  # database of frequently-accessed small files
! a ./.hotfiles.btree                     0600     0     0 1111523163   65630 RQBDAUdqJnkTxJsKZZYxUz9veiQ=
  
  # volfs mount point, used by Carbon applications
! d ./.vol                               	0555     0     0
  
  # Cached information
! d ./Library/Caches                     	1777     0    80
  
  # ColorSync Display Profiles
! d ./Library/ColorSync/Profiles/Displays 0775     0    80
  
  # Console logs, crash reports, etc.
! d ./Library/Logs                        0775     0    80
  
  # Global preferences, energy saver settings, login timeouts, etc.
  # Remove or comment out if you're managing a lab.
! f ./Library/Preferences/.GlobalPreferences.plist	0644     0    80 1123612723     0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # Available network interface information
! f ./Library/Preferences/SystemConfiguration/NetworkInterfaces.plist 0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # Additional SystemConfiguration settings. Should be commented out for
  # a more fully managed environment, like a lab.
! f ./Library/Preferences/SystemConfiguration/com.apple.PowerManagement.plist	0644     0    80 1072504750    1245 7W+4djjIZRBJlrUsVSTJw5yqBNg=
! f ./Library/Preferences/SystemConfiguration/com.apple.airport.preferences.plist	0644     0    80 1125594056    6623 n9W/Jthauzh/RV1laotcA/Tq6r0=
! f ./Library/Preferences/SystemConfiguration/com.apple.nat.plist	0644     0    80 1069909129     909 SrYrmXU/e4XidaiU74MajA+jtho=
  
  # Machine's rendezvous name, AppleTalk name, DHCP settings, etc.
  # Remove this item if you're running a lab.
! f ./Library/Preferences/SystemConfiguration/preferences.plist 0644     0    80 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # audio settings, like volume and balance
! f ./Library/Preferences/com.apple.audio.DeviceSettings.plist	0644     0    80 1125436293    2109 cdfG/Cgo1JJ+jdOCJErkAqoRJfg=
  
  # loginwindow settings. Should be managed in a lab, although it breaks
  # tripwire because use of the loginwindow modifies it.
! f ./Library/Preferences/com.apple.loginwindow.plist	0644     0    80 1125439218      90 9EVFNVmVvgTkZyIJ6o+IndqD2l8=
  
  # Network share browsing
! d ./Network                            	0755     0     0
  
  # Cached information (kernel cache, fonts)
! d ./System/Library/Caches              	0755     0     0
  
  # Extensions caching. Remove the files after installing new kexts.
! f ./System/Library/Extensions.kextcache 0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f ./System/Library/Extensions.mkext     0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # User home directories. Don't delete them. Use the User Management scripts
  # if you need to manage user profiles in a lab.
! d ./Users                              	1775     0    80
  
  # Shared User space, required by some applications
! d ./Users/Shared                        0775     0    80
  
  # Other volumes mounted here.
! d ./Volumes                            	1777     0    80 AAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
  
  # automount volumes from fstab or netinfo. If you mount NFS shares, you'll
! # probably need to add ./private/automount to your negative.
! d ./automount                          	0755     0    80
  
  # If coring is enabled, here's where cores go.
! d ./cores                              	1775     0    80 AAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
  
  # Mac OS X uses a devfs and fdesc filesystem to handle /dev and /dev/fd
! d ./dev                                	0555     0     0
  
  # Created by /etc/rc on boot
! f ./mach.sym                            0444     0    80 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # cupsd(8) components. Comment out if managing a lab.
! f ./private/etc/cups/certs/0            	0440     0    80 1122301379      32 W4eA+rgISk8sh5okWWnZnkt6VBE=
! d ./private/etc/cups/ppd                	0755     0    26
! f ./private/etc/cups/printers.conf      	0600     0    26 1111362301    2751 gokL/omR4IyPaOsFG/geqRDX6KM=
  
  # dump(8) date records
! f ./private/etc/dumpdates               0644     0     0 1124886610       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # managed by cupsd(8)
! f ./private/etc/printcap                0644     0     0 1121953780     143 zMWyr8b2agfzVBQrIAayMkMfh5M=
  
  # Used by netbooting
! d ./private/tftpboot                   	0755     0     0
  
  # temporary files, managed by system
! d ./private/tmp                        	1777     0     0
  
  # at(1) queues
! d ./private/var/at/jobs                	0755     1     0
! d ./private/var/at/spool               	0755     1     0
  
  # NetInfo DB backups, done nightly by /etc/periodic/daily/500.daily
! d ./private/var/backups                 0700     0     0
  
  # crontabs
! d ./private/var/cron/tabs              	0755     0     0
  
  # Apple caches
! f ./private/var/db/BootCache.playlist   0600     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f ./private/var/db/CodeEquivalenceDatabase 0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # Spotlight databases for non-local volumes
! d ./private/var/db/Spotlight-V100       0600     0     0
  
  # more caches
! f ./private/var/db/SystemEntropyCache   0600     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! d ./private/var/db/TokenCache          	0711     0     0
  
  # crashdump(8)
! d ./private/var/db/crashdump            0755     0     0
  
  # DHCP leases
! d ./private/var/db/dhcpclient/leases   	0700     0     0
  
  # apparently Apple records the time it took to reach the loginwindow from boot
! f ./private/var/db/loginwindow.boottime 0644     0     0 1111523219      10 rUMgoS75n+VDUxo9RkTrGejeuTM=
  
  # NetInfo contains local user account information. The hash folder has
  # files containing MD5 hashes of the user passwords. Remove or comment
  # out the next two lines if you're running a lab.
! d ./private/var/db/netinfo/local.nidb  	0700     0     0
! d ./private/var/db/shadow/hash         	0700     0     0
  
  # managed by rpc.statd(8)
! f ./private/var/db/statd.status         0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # used by vsdbutil (no manpage yet)
! f ./private/var/db/volinfo.database     0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # launchd(8), Apple's replacement for init and StartupItems
! d ./private/var/launchd                 0755     0     0
  
  # Logging facilities. syslogd doesn't create them if they're missing.
! d ./private/var/log                    	0755     0     0
! d ./private/var/log/cups               	0755     0     0
! f ./private/var/log/cups/access_log     0644     0    26 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f ./private/var/log/cups/error_log      0644     0    26 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! d ./private/var/log/fax                	0755     0     0
! f ./private/var/log/ftp.log            	0644     0     0 1098606428       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! d ./private/var/log/httpd              	0755     0     0
! f ./private/var/log/install.log         0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f ./private/var/log/ipfw.log           	0640     0    80 1098606428       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f ./private/var/log/lastlog             0640     0    80 1111695092   14056 IYdy7EsLIl+fOmX89xDLlCElJRk=
! f ./private/var/log/lpr.log            	0644     0     0 1098606428       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f ./private/var/log/mail.log            0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f ./private/var/log/netinfo.log        	0644     0     0 1098606428       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! d ./private/var/log/ppp                	0755     0     0
! d ./private/var/log/sa                 	0755     0     0
! d ./private/var/log/samba              	0755     0     0
! f ./private/var/log/secure.log          0600     0    80 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f ./private/var/log/system.log          0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f ./private/var/log/windowserver.log    0640     0    80 1111693676    2276 1Dw1n/DznTLoa6TH9qZQm+K/1t0=
! f ./private/var/log/wtmp                0644     0    80 1111695092     720 qdyP/5LrB7f0J2qFV0YTBL25tB4=
  
  # used by the postfix mail transfer agent
! d ./private/var/mail                   	0775     0     6
  
  # radmind client data
! d ./private/var/radmind/client         	0755     0     0
  
  # where pid information is stored for running processes
! d ./private/var/run                    	0775     0     1
  
  # slpd(1). Could probably be in base.
! f ./private/var/slp.regfile             0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # CUPS print spooling
! d ./private/var/spool/cups             	0710     0    26
! d ./private/var/spool/cups/tmp         	1770     0    26
  
  # Faxes
! d ./private/var/spool/fax              	0750     0     0
  
  # Mail and postfix spool folders
! d ./private/var/spool/mqueue           	0750     0     0
! d ./private/var/spool/postfix          	0755     0     0
  
  # Maybe for SMB printing?
! d ./private/var/spool/samba            	0775     0     0
  
  # Temporary items, managed by the system.
! d ./private/var/tmp                    	1777     0     0
  
  # Virtual memory
! d ./private/var/vm                     	0755     0     0
  
  # Xgrid client job control
! d ./private/var/xgrid/agent            	0755    86     0
! d ./private/var/xgrid/agent/cookies    	0755    86     0
! d ./private/var/xgrid/controller       	0755    85     0
! d ./private/var/xgrid/controller/blobs 	0755    85     0
--- 1,199 ----
  # Spotlight database directory. Every writable mounted volume gets one.
! d /.Spotlight-V100                   	0600     0    80
  
  # Obvious, no? Every volume has its own .Trashes folder
! d /.Trashes                           	1333     0    80 AAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
  
  # database of frequently-accessed small files
! a /.hotfiles.btree                     0600     0     0 1111523163   65630 RQBDAUdqJnkTxJsKZZYxUz9veiQ=
  
  # volfs mount point, used by Carbon applications
! d /.vol                               	0555     0     0
  
  # Cached information
! d /Library/Caches                     	1777     0    80
  
  # ColorSync Display Profiles
! d /Library/ColorSync/Profiles/Displays 0775     0    80
  
  # Console logs, crash reports, etc.
! d /Library/Logs                        0775     0    80
  
  # Global preferences, energy saver settings, login timeouts, etc.
  # Remove or comment out if you're managing a lab.
! f /Library/Preferences/.GlobalPreferences.plist	0644     0    80 1123612723     0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # Available network interface information
! f /Library/Preferences/SystemConfiguration/NetworkInterfaces.plist 0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # Additional SystemConfiguration settings. Should be commented out for
  # a more fully managed environment, like a lab.
! f /Library/Preferences/SystemConfiguration/com.apple.PowerManagement.plist	0644     0    80 1072504750    1245 7W+4djjIZRBJlrUsVSTJw5yqBNg=
! f /Library/Preferences/SystemConfiguration/com.apple.airport.preferences.plist	0644     0    80 1125594056    6623 n9W/Jthauzh/RV1laotcA/Tq6r0=
! f /Library/Preferences/SystemConfiguration/com.apple.nat.plist	0644     0    80 1069909129     909 SrYrmXU/e4XidaiU74MajA+jtho=
  
  # Machine's rendezvous name, AppleTalk name, DHCP settings, etc.
  # Remove this item if you're running a lab.
! f /Library/Preferences/SystemConfiguration/preferences.plist 0644     0    80 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # audio settings, like volume and balance
! f /Library/Preferences/com.apple.audio.DeviceSettings.plist	0644     0    80 1125436293    2109 cdfG/Cgo1JJ+jdOCJErkAqoRJfg=
  
  # loginwindow settings. Should be managed in a lab, although it breaks
  # tripwire because use of the loginwindow modifies it.
! f /Library/Preferences/com.apple.loginwindow.plist	0644     0    80 1125439218      90 9EVFNVmVvgTkZyIJ6o+IndqD2l8=
  
  # Network share browsing
! d /Network                            	0755     0     0
  
  # Cached information (kernel cache, fonts)
! d /System/Library/Caches              	0755     0     0
  
  # Extensions caching. Remove the files after installing new kexts.
! f /System/Library/Extensions.kextcache 0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f /System/Library/Extensions.mkext     0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # User home directories. Don't delete them. Use the User Management scripts
  # if you need to manage user profiles in a lab.
! d /Users                              	1775     0    80
  
  # Shared User space, required by some applications
! d /Users/Shared                        0775     0    80
  
  # Other volumes mounted here.
! d /Volumes                            	1777     0    80 AAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
  
  # automount volumes from fstab or netinfo. If you mount NFS shares, you'll
! # probably need to add /private/automount to your negative.
! d /automount                          	0755     0    80
  
  # If coring is enabled, here's where cores go.
! d /cores                              	1775     0    80 AAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
  
  # Mac OS X uses a devfs and fdesc filesystem to handle /dev and /dev/fd
! d /dev                                	0555     0     0
  
  # Created by /etc/rc on boot
! f /mach.sym                            0444     0    80 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # cupsd(8) components. Comment out if managing a lab.
! f /private/etc/cups/certs/0            	0440     0    80 1122301379      32 W4eA+rgISk8sh5okWWnZnkt6VBE=
! d /private/etc/cups/ppd                	0755     0    26
! f /private/etc/cups/printers.conf      	0600     0    26 1111362301    2751 gokL/omR4IyPaOsFG/geqRDX6KM=
  
  # dump(8) date records
! f /private/etc/dumpdates               0644     0     0 1124886610       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # managed by cupsd(8)
! f /private/etc/printcap                0644     0     0 1121953780     143 zMWyr8b2agfzVBQrIAayMkMfh5M=
  
  # Used by netbooting
! d /private/tftpboot                   	0755     0     0
  
  # temporary files, managed by system
! d /private/tmp                        	1777     0     0
  
  # at(1) queues
! d /private/var/at/jobs                	0755     1     0
! d /private/var/at/spool               	0755     1     0
  
  # NetInfo DB backups, done nightly by /etc/periodic/daily/500.daily
! d /private/var/backups                 0700     0     0
  
  # crontabs
! d /private/var/cron/tabs              	0755     0     0
  
  # Apple caches
! f /private/var/db/BootCache.playlist   0600     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f /private/var/db/CodeEquivalenceDatabase 0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # Spotlight databases for non-local volumes
! d /private/var/db/Spotlight-V100       0600     0     0
  
  # more caches
! f /private/var/db/SystemEntropyCache   0600     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! d /private/var/db/TokenCache          	0711     0     0
  
  # crashdump(8)
! d /private/var/db/crashdump            0755     0     0
  
  # DHCP leases
! d /private/var/db/dhcpclient/leases   	0700     0     0
  
  # apparently Apple records the time it took to reach the loginwindow from boot
! f /private/var/db/loginwindow.boottime 0644     0     0 1111523219      10 rUMgoS75n+VDUxo9RkTrGejeuTM=
  
  # NetInfo contains local user account information. The hash folder has
  # files containing MD5 hashes of the user passwords. Remove or comment
  # out the next two lines if you're running a lab.
! d /private/var/db/netinfo/local.nidb  	0700     0     0
! d /private/var/db/shadow/hash         	0700     0     0
  
  # managed by rpc.statd(8)
! f /private/var/db/statd.status         0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # used by vsdbutil (no manpage yet)
! f /private/var/db/volinfo.database     0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # launchd(8), Apple's replacement for init and StartupItems
! d /private/var/launchd                 0755     0     0
  
  # Logging facilities. syslogd doesn't create them if they're missing.
! d /private/var/log                    	0755     0     0
! d /private/var/log/cups               	0755     0     0
! f /private/var/log/cups/access_log     0644     0    26 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f /private/var/log/cups/error_log      0644     0    26 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! d /private/var/log/fax                	0755     0     0
! f /private/var/log/ftp.log            	0644     0     0 1098606428       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! d /private/var/log/httpd              	0755     0     0
! f /private/var/log/install.log         0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f /private/var/log/ipfw.log           	0640     0    80 1098606428       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f /private/var/log/lastlog             0640     0    80 1111695092   14056 IYdy7EsLIl+fOmX89xDLlCElJRk=
! f /private/var/log/lpr.log            	0644     0     0 1098606428       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f /private/var/log/mail.log            0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f /private/var/log/netinfo.log        	0644     0     0 1098606428       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! d /private/var/log/ppp                	0755     0     0
! d /private/var/log/sa                 	0755     0     0
! d /private/var/log/samba              	0755     0     0
! f /private/var/log/secure.log          0600     0    80 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f /private/var/log/system.log          0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
! f /private/var/log/windowserver.log    0640     0    80 1111693676    2276 1Dw1n/DznTLoa6TH9qZQm+K/1t0=
! f /private/var/log/wtmp                0644     0    80 1111695092     720 qdyP/5LrB7f0J2qFV0YTBL25tB4=
  
  # used by the postfix mail transfer agent
! d /private/var/mail                   	0775     0     6
  
  # radmind client data
! d /private/var/radmind/client         	0755     0     0
  
  # where pid information is stored for running processes
! d /private/var/run                    	0775     0     1
  
  # slpd(1). Could probably be in base.
! f /private/var/slp.regfile             0644     0     0 1099338074       0 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
  
  # CUPS print spooling
! d /private/var/spool/cups             	0710     0    26
! d /private/var/spool/cups/tmp         	1770     0    26
  
  # Faxes
! d /private/var/spool/fax              	0750     0     0
  
  # Mail and postfix spool folders
! d /private/var/spool/mqueue           	0750     0     0
! d /private/var/spool/postfix          	0755     0     0
  
  # Maybe for SMB printing?
! d /private/var/spool/samba            	0775     0     0
  
  # Temporary items, managed by the system.
! d /private/var/tmp                    	1777     0     0
  
  # Virtual memory
! d /private/var/vm                     	0755     0     0
  
  # Xgrid client job control
! d /private/var/xgrid/agent            	0755    86     0
! d /private/var/xgrid/agent/cookies    	0755    86     0
! d /private/var/xgrid/controller       	0755    85     0
! d /private/var/xgrid/controller/blobs 	0755    85     0

[Radmind-commit] radmind-assistant/rsm/rsm.xcodeproj project.pbxproj,1.6,1.7

[Andrew M. <fit...@us...>]

Update of /cvsroot/radmind/radmind-assistant/rsm/rsm.xcodeproj
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23110/rsm.xcodeproj

Modified Files:
	project.pbxproj 
Log Message:
Universal binary settings, auth tool as separate target.


Index: project.pbxproj
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/rsm/rsm.xcodeproj/project.pbxproj,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** project.pbxproj	20 Dec 2005 13:43:52 -0000	1.6
--- project.pbxproj	24 Feb 2006 22:12:56 -0000	1.7
***************
*** 30,34 ****
  		0966F51209490F6C0061D4EC /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
  		0966F51309490F6C0061D4EC /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
- 		0966F51409490F6C0061D4EC /* rsmauthtool in Resources */ = {isa = PBXBuildFile; fileRef = 09C83D7C04696A8500A8002B /* rsmauthtool */; };
  		0966F51509490F6C0061D4EC /* deletekfile.png in Resources */ = {isa = PBXBuildFile; fileRef = 09D1FF08046AB6840087E7E6 /* deletekfile.png */; };
  		0966F51609490F6C0061D4EC /* newkfile.png in Resources */ = {isa = PBXBuildFile; fileRef = 09D1FF09046AB6840087E7E6 /* newkfile.png */; };
--- 30,33 ----
***************
*** 81,91 ****
  		0966F54609490F6C0061D4EC /* RSMNewFolderHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 0952D10D0802367500BF8531 /* RSMNewFolderHelper.m */; };
  		0966F54709490F6C0061D4EC /* sessionrights.c in Sources */ = {isa = PBXBuildFile; fileRef = 09E73B0A080CA0E200DFAA34 /* sessionrights.c */; };
- 		0966F54909490F6C0061D4EC /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
  		0966F54A09490F6C0061D4EC /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 097966E00468BFAE00A8002B /* Security.framework */; };
- 		0966F54B09490F6C0061D4EC /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D4E56D05457D120089D7A6 /* ApplicationServices.framework */; };
  		0966F54C09490F6C0061D4EC /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D4E570054584210089D7A6 /* CoreFoundation.framework */; };
  		0966F725094E11190061D4EC /* NSPanel(Resizing).h in Headers */ = {isa = PBXBuildFile; fileRef = 0966F723094E11190061D4EC /* NSPanel(Resizing).h */; };
  		0966F726094E11190061D4EC /* NSPanel(Resizing).m in Sources */ = {isa = PBXBuildFile; fileRef = 0966F724094E11190061D4EC /* NSPanel(Resizing).m */; };
  		0966F7A9094E3EF20061D4EC /* serverprefs.png in Resources */ = {isa = PBXBuildFile; fileRef = 0966F7A8094E3EF20061D4EC /* serverprefs.png */; };
  /* End PBXBuildFile section */
  
--- 80,103 ----
  		0966F54609490F6C0061D4EC /* RSMNewFolderHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 0952D10D0802367500BF8531 /* RSMNewFolderHelper.m */; };
  		0966F54709490F6C0061D4EC /* sessionrights.c in Sources */ = {isa = PBXBuildFile; fileRef = 09E73B0A080CA0E200DFAA34 /* sessionrights.c */; };
  		0966F54A09490F6C0061D4EC /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 097966E00468BFAE00A8002B /* Security.framework */; };
  		0966F54C09490F6C0061D4EC /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D4E570054584210089D7A6 /* CoreFoundation.framework */; };
  		0966F725094E11190061D4EC /* NSPanel(Resizing).h in Headers */ = {isa = PBXBuildFile; fileRef = 0966F723094E11190061D4EC /* NSPanel(Resizing).h */; };
  		0966F726094E11190061D4EC /* NSPanel(Resizing).m in Sources */ = {isa = PBXBuildFile; fileRef = 0966F724094E11190061D4EC /* NSPanel(Resizing).m */; };
  		0966F7A9094E3EF20061D4EC /* serverprefs.png in Resources */ = {isa = PBXBuildFile; fileRef = 0966F7A8094E3EF20061D4EC /* serverprefs.png */; };
+ 		09EFC1DB099CE40300A7D599 /* genplist.c in Sources */ = {isa = PBXBuildFile; fileRef = 09EFC1C4099CE40300A7D599 /* genplist.c */; };
+ 		09EFC1DD099CE40300A7D599 /* llist.c in Sources */ = {isa = PBXBuildFile; fileRef = 09EFC1C7099CE40300A7D599 /* llist.c */; };
+ 		09EFC1E2099CE40300A7D599 /* radpaths.c in Sources */ = {isa = PBXBuildFile; fileRef = 09EFC1CE099CE40300A7D599 /* radpaths.c */; };
+ 		09EFC1E4099CE40300A7D599 /* rmdirs.c in Sources */ = {isa = PBXBuildFile; fileRef = 09EFC1D2099CE40300A7D599 /* rmdirs.c */; };
+ 		09EFC1E7099CE40300A7D599 /* selfrepair.c in Sources */ = {isa = PBXBuildFile; fileRef = 09EFC1D9099CE40300A7D599 /* selfrepair.c */; };
+ 		09EFC1EF099CE4E500A7D599 /* rsmauthtool.c in Sources */ = {isa = PBXBuildFile; fileRef = 09C83D7A0469673C00A8002B /* rsmauthtool.c */; };
+ 		09EFC1F0099CE4E900A7D599 /* code.c in Sources */ = {isa = PBXBuildFile; fileRef = 09773131048C53C6007C46D8 /* code.c */; };
+ 		09EFC1F1099CE4EB00A7D599 /* addspecial.c in Sources */ = {isa = PBXBuildFile; fileRef = 0996666F048D2EFB005FCB4F /* addspecial.c */; };
+ 		09EFC1F2099CE4EE00A7D599 /* copy.c in Sources */ = {isa = PBXBuildFile; fileRef = 09966671048D2EFB005FCB4F /* copy.c */; };
+ 		09EFC1F3099CE4F900A7D599 /* makedir.c in Sources */ = {isa = PBXBuildFile; fileRef = 09966673048D2EFB005FCB4F /* makedir.c */; };
+ 		09EFC1F5099CE57000A7D599 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 097966E00468BFAE00A8002B /* Security.framework */; };
+ 		09EFC31F099CE58800A7D599 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
+ 		09EFC320099CE58D00A7D599 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D4E56D05457D120089D7A6 /* ApplicationServices.framework */; };
+ 		09EFC321099CE59800A7D599 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D4E570054584210089D7A6 /* CoreFoundation.framework */; };
+ 		09EFC327099CE5AD00A7D599 /* argcargv.c in Sources */ = {isa = PBXBuildFile; fileRef = 097966EA0468C08C00A8002B /* argcargv.c */; };
  /* End PBXBuildFile section */
  
***************
*** 142,145 ****
--- 154,167 ----
  /* End PBXBuildStyle section */
  
+ /* Begin PBXContainerItemProxy section */
+ 		09EFC1BE099CE3C000A7D599 /* PBXContainerItemProxy */ = {
+ 			isa = PBXContainerItemProxy;
+ 			containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+ 			proxyType = 1;
+ 			remoteGlobalIDString = 09EFC1B9099CE3A900A7D599;
+ 			remoteInfo = rsmauthtool;
+ 		};
+ /* End PBXContainerItemProxy section */
+ 
  /* Begin PBXFileReference section */
  		089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
***************
*** 224,227 ****
--- 246,260 ----
  		09E73D03080DF14700DFAA34 /* advancedprefs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = advancedprefs.png; sourceTree = "<group>"; };
  		09E73D04080DF14700DFAA34 /* generalprefs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = generalprefs.png; sourceTree = "<group>"; };
+ 		09EFC1BA099CE3A900A7D599 /* rsmauthtool */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = rsmauthtool; sourceTree = BUILT_PRODUCTS_DIR; };
+ 		09EFC1C4099CE40300A7D599 /* genplist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = genplist.c; sourceTree = "<group>"; };
+ 		09EFC1C5099CE40300A7D599 /* genplist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = genplist.h; sourceTree = "<group>"; };
+ 		09EFC1C7099CE40300A7D599 /* llist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = llist.c; sourceTree = "<group>"; };
+ 		09EFC1C8099CE40300A7D599 /* llist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llist.h; sourceTree = "<group>"; };
+ 		09EFC1CE099CE40300A7D599 /* radpaths.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = radpaths.c; sourceTree = "<group>"; };
+ 		09EFC1CF099CE40300A7D599 /* radpaths.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = radpaths.h; sourceTree = "<group>"; };
+ 		09EFC1D2099CE40300A7D599 /* rmdirs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rmdirs.c; sourceTree = "<group>"; };
+ 		09EFC1D3099CE40300A7D599 /* rmdirs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rmdirs.h; sourceTree = "<group>"; };
+ 		09EFC1D9099CE40300A7D599 /* selfrepair.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = selfrepair.c; sourceTree = "<group>"; };
+ 		09EFC1DA099CE40300A7D599 /* selfrepair.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = selfrepair.h; sourceTree = "<group>"; };
  		09F09F1D081551E9008698D6 /* editor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = editor.png; sourceTree = "<group>"; };
  		09FBACCC06485BEE0089C37B /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Preferences.nib; sourceTree = "<group>"; };
***************
*** 244,254 ****
  			buildActionMask = 2147483647;
  			files = (
! 				0966F54909490F6C0061D4EC /* Cocoa.framework in Frameworks */,
  				0966F54A09490F6C0061D4EC /* Security.framework in Frameworks */,
! 				0966F54B09490F6C0061D4EC /* ApplicationServices.framework in Frameworks */,
  				0966F54C09490F6C0061D4EC /* CoreFoundation.framework in Frameworks */,
  			);
  			runOnlyForDeploymentPostprocessing = 0;
  		};
  /* End PBXFrameworksBuildPhase section */
  
--- 277,296 ----
  			buildActionMask = 2147483647;
  			files = (
! 				09EFC31F099CE58800A7D599 /* Cocoa.framework in Frameworks */,
  				0966F54A09490F6C0061D4EC /* Security.framework in Frameworks */,
! 				09EFC320099CE58D00A7D599 /* ApplicationServices.framework in Frameworks */,
  				0966F54C09490F6C0061D4EC /* CoreFoundation.framework in Frameworks */,
  			);
  			runOnlyForDeploymentPostprocessing = 0;
  		};
+ 		09EFC1B8099CE3A900A7D599 /* Frameworks */ = {
+ 			isa = PBXFrameworksBuildPhase;
+ 			buildActionMask = 2147483647;
+ 			files = (
+ 				09EFC321099CE59800A7D599 /* CoreFoundation.framework in Frameworks */,
+ 				09EFC1F5099CE57000A7D599 /* Security.framework in Frameworks */,
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+ 		};
  /* End PBXFrameworksBuildPhase section */
  
***************
*** 282,285 ****
--- 324,337 ----
  			isa = PBXGroup;
  			children = (
+ 				09EFC1C4099CE40300A7D599 /* genplist.c */,
+ 				09EFC1C5099CE40300A7D599 /* genplist.h */,
+ 				09EFC1C7099CE40300A7D599 /* llist.c */,
+ 				09EFC1C8099CE40300A7D599 /* llist.h */,
+ 				09EFC1CE099CE40300A7D599 /* radpaths.c */,
+ 				09EFC1CF099CE40300A7D599 /* radpaths.h */,
+ 				09EFC1D2099CE40300A7D599 /* rmdirs.c */,
+ 				09EFC1D3099CE40300A7D599 /* rmdirs.h */,
+ 				09EFC1D9099CE40300A7D599 /* selfrepair.c */,
+ 				09EFC1DA099CE40300A7D599 /* selfrepair.h */,
  				09C83D7A0469673C00A8002B /* rsmauthtool.c */,
  				09966675048D2EFB005FCB4F /* rsmauthtool.h */,
***************
*** 383,386 ****
--- 435,439 ----
  			children = (
  				0966F55609490F6C0061D4EC /* Radmind Server Manager.app */,
+ 				09EFC1BA099CE3A900A7D599 /* rsmauthtool */,
  			);
  			name = Products;
***************
*** 393,396 ****
--- 446,450 ----
  				09718B020466E87F003C81A3 /* Subclasses */,
  				080E96DDFE201D6D7F000001 /* Classes */,
+ 				09174DBC04D6C78A00A8022B /* authtool */,
  				29B97315FDCFA39411CA2CEA /* Other Sources */,
  				29B97317FDCFA39411CA2CEA /* Resources */,
***************
*** 408,412 ****
  				09FBAD1C064ABA9D0089C37B /* srvprocinfo.c */,
  				09FBAD1D064ABA9D0089C37B /* srvprocinfo.h */,
- 				09174DBC04D6C78A00A8022B /* authtool */,
  				29B97316FDCFA39411CA2CEA /* main.m */,
  				097966E20468BFF100A8002B /* authtools.c */,
--- 462,465 ----
***************
*** 511,514 ****
--- 564,568 ----
  			};
  			dependencies = (
+ 				09EFC1BF099CE3C000A7D599 /* PBXTargetDependency */,
  			);
  			name = "Radmind Server Manager";
***************
*** 518,521 ****
--- 572,599 ----
  			productType = "com.apple.product-type.application";
  		};
+ 		09EFC1B9099CE3A900A7D599 /* rsmauthtool */ = {
+ 			isa = PBXNativeTarget;
+ 			buildConfigurationList = 09EFC1C0099CE3F000A7D599 /* Build configuration list for PBXNativeTarget "rsmauthtool" */;
+ 			buildPhases = (
+ 				09EFC1B7099CE3A900A7D599 /* Sources */,
+ 				09EFC1B8099CE3A900A7D599 /* Frameworks */,
+ 			);
+ 			buildRules = (
+ 			);
+ 			buildSettings = {
+ 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ 				GCC_MODEL_TUNING = G5;
+ 				INSTALL_PATH = "$(HOME)/bin";
+ 				PREBINDING = NO;
+ 				PRODUCT_NAME = rsmauthtool;
+ 				ZERO_LINK = YES;
+ 			};
+ 			dependencies = (
+ 			);
+ 			name = rsmauthtool;
+ 			productName = rsmauthtool;
+ 			productReference = 09EFC1BA099CE3A900A7D599 /* rsmauthtool */;
+ 			productType = "com.apple.product-type.tool";
+ 		};
  /* End PBXNativeTarget section */
  
***************
*** 535,538 ****
--- 613,617 ----
  			targets = (
  				0966F4FB09490F6C0061D4EC /* Radmind Server Manager */,
+ 				09EFC1B9099CE3A900A7D599 /* rsmauthtool */,
  			);
  		};
***************
*** 546,550 ****
  				0966F51209490F6C0061D4EC /* MainMenu.nib in Resources */,
  				0966F51309490F6C0061D4EC /* InfoPlist.strings in Resources */,
- 				0966F51409490F6C0061D4EC /* rsmauthtool in Resources */,
  				0966F51509490F6C0061D4EC /* deletekfile.png in Resources */,
  				0966F51609490F6C0061D4EC /* newkfile.png in Resources */,
--- 625,628 ----
***************
*** 585,594 ****
  		0966F54D09490F6C0061D4EC /* ShellScript */ = {
  			isa = PBXShellScriptBuildPhase;
! 			buildActionMask = 8;
  			files = (
  			);
! 			runOnlyForDeploymentPostprocessing = 1;
  			shellPath = /bin/sh;
! 			shellScript = "open ~/src/radassist/rsm/setuidbits.command";
  		};
  /* End PBXShellScriptBuildPhase section */
--- 663,672 ----
  		0966F54D09490F6C0061D4EC /* ShellScript */ = {
  			isa = PBXShellScriptBuildPhase;
! 			buildActionMask = 12;
  			files = (
  			);
! 			runOnlyForDeploymentPostprocessing = 0;
  			shellPath = /bin/sh;
! 			shellScript = "#! /bin/sh\n\nPATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH\n\ntoolname=\"rsmauthtool\"\ntoolpath=\"${BUILT_PRODUCTS_DIR}/${toolname}\"\nrsrcdir=\"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\"\n\nif [ x\"${ACTION}\" != x\"build\" ]; then\n\texit 0\nfi\n\nif [ \"${toolpath}\" -nt \"${rsrcdir}/${toolname}\" \\\n\t\t-o ! -f \"${rsrcdir}/${toolname}\" ]; then\n\techo Copying ${toolpath} to ${rsrcdir}...\n\tcp -f \"${toolpath}\" \"${rsrcdir}\"\n\tif [ $? -ne 0 ]; then\n\t\techo Copy failed.\n\t\texit 2\n\tfi\nfi\n\nexit 0";
  		};
  /* End PBXShellScriptBuildPhase section */
***************
*** 624,629 ****
--- 702,733 ----
  			runOnlyForDeploymentPostprocessing = 0;
  		};
+ 		09EFC1B7099CE3A900A7D599 /* Sources */ = {
+ 			isa = PBXSourcesBuildPhase;
+ 			buildActionMask = 2147483647;
+ 			files = (
+ 				09EFC327099CE5AD00A7D599 /* argcargv.c in Sources */,
+ 				09EFC1F0099CE4E900A7D599 /* code.c in Sources */,
+ 				09EFC1F2099CE4EE00A7D599 /* copy.c in Sources */,
+ 				09EFC1F1099CE4EB00A7D599 /* addspecial.c in Sources */,
+ 				09EFC1DB099CE40300A7D599 /* genplist.c in Sources */,
+ 				09EFC1DD099CE40300A7D599 /* llist.c in Sources */,
+ 				09EFC1F3099CE4F900A7D599 /* makedir.c in Sources */,
+ 				09EFC1E2099CE40300A7D599 /* radpaths.c in Sources */,
+ 				09EFC1E4099CE40300A7D599 /* rmdirs.c in Sources */,
+ 				09EFC1EF099CE4E500A7D599 /* rsmauthtool.c in Sources */,
+ 				09EFC1E7099CE40300A7D599 /* selfrepair.c in Sources */,
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+ 		};
  /* End PBXSourcesBuildPhase section */
  
+ /* Begin PBXTargetDependency section */
+ 		09EFC1BF099CE3C000A7D599 /* PBXTargetDependency */ = {
+ 			isa = PBXTargetDependency;
+ 			target = 09EFC1B9099CE3A900A7D599 /* rsmauthtool */;
+ 			targetProxy = 09EFC1BE099CE3C000A7D599 /* PBXContainerItemProxy */;
+ 		};
+ /* End PBXTargetDependency section */
+ 
  /* Begin PBXVariantGroup section */
  		089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
***************
*** 761,767 ****
  			isa = XCBuildConfiguration;
  			buildSettings = {
  				INFOPLIST_FILE = Info.plist;
! 				MACOSX_DEPLOYMENT_TARGET = 10.3;
! 				SDKROOT = /Developer/SDKs/MacOSX10.3.9.sdk;
  			};
  			name = Development;
--- 865,875 ----
  			isa = XCBuildConfiguration;
  			buildSettings = {
+ 				ARCHS = (
+ 					ppc,
+ 					i386,
+ 				);
  				INFOPLIST_FILE = Info.plist;
! 				MACOSX_DEPLOYMENT_TARGET = 10.4;
! 				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
  			};
  			name = Development;
***************
*** 770,776 ****
  			isa = XCBuildConfiguration;
  			buildSettings = {
  				INFOPLIST_FILE = Info.plist;
! 				MACOSX_DEPLOYMENT_TARGET = 10.3;
! 				SDKROOT = /Developer/SDKs/MacOSX10.3.9.sdk;
  			};
  			name = Deployment;
--- 878,888 ----
  			isa = XCBuildConfiguration;
  			buildSettings = {
+ 				ARCHS = (
+ 					ppc,
+ 					i386,
+ 				);
  				INFOPLIST_FILE = Info.plist;
! 				MACOSX_DEPLOYMENT_TARGET = 10.4;
! 				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
  			};
  			name = Deployment;
***************
*** 779,785 ****
  			isa = XCBuildConfiguration;
  			buildSettings = {
  				INFOPLIST_FILE = Info.plist;
! 				MACOSX_DEPLOYMENT_TARGET = 10.3;
! 				SDKROOT = /Developer/SDKs/MacOSX10.3.9.sdk;
  			};
  			name = Default;
--- 891,944 ----
  			isa = XCBuildConfiguration;
  			buildSettings = {
+ 				ARCHS = (
+ 					ppc,
+ 					i386,
+ 				);
  				INFOPLIST_FILE = Info.plist;
! 				MACOSX_DEPLOYMENT_TARGET = 10.4;
! 				PREBINDING = NO;
! 				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
! 			};
! 			name = Default;
! 		};
! 		09EFC1C1099CE3F000A7D599 /* Development */ = {
! 			isa = XCBuildConfiguration;
! 			buildSettings = {
! 				COPY_PHASE_STRIP = NO;
! 				GCC_DYNAMIC_NO_PIC = NO;
! 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
! 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
! 				GCC_MODEL_TUNING = G5;
! 				GCC_OPTIMIZATION_LEVEL = 0;
! 				INSTALL_PATH = "$(HOME)/bin";
! 				PREBINDING = NO;
! 				PRODUCT_NAME = rsmauthtool;
! 				ZERO_LINK = YES;
! 			};
! 			name = Development;
! 		};
! 		09EFC1C2099CE3F000A7D599 /* Deployment */ = {
! 			isa = XCBuildConfiguration;
! 			buildSettings = {
! 				COPY_PHASE_STRIP = YES;
! 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
! 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
! 				GCC_MODEL_TUNING = G5;
! 				INSTALL_PATH = "$(HOME)/bin";
! 				PREBINDING = NO;
! 				PRODUCT_NAME = rsmauthtool;
! 				ZERO_LINK = NO;
! 			};
! 			name = Deployment;
! 		};
! 		09EFC1C3099CE3F000A7D599 /* Default */ = {
! 			isa = XCBuildConfiguration;
! 			buildSettings = {
! 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
! 				GCC_MODEL_TUNING = G5;
! 				INSTALL_PATH = "$(HOME)/bin";
! 				PREBINDING = NO;
! 				PRODUCT_NAME = rsmauthtool;
! 				ZERO_LINK = YES;
  			};
  			name = Default;
***************
*** 808,811 ****
--- 967,980 ----
  			defaultConfigurationName = Default;
  		};
+ 		09EFC1C0099CE3F000A7D599 /* Build configuration list for PBXNativeTarget "rsmauthtool" */ = {
+ 			isa = XCConfigurationList;
+ 			buildConfigurations = (
+ 				09EFC1C1099CE3F000A7D599 /* Development */,
+ 				09EFC1C2099CE3F000A7D599 /* Deployment */,
+ 				09EFC1C3099CE3F000A7D599 /* Default */,
+ 			);
+ 			defaultConfigurationIsVisible = 0;
+ 			defaultConfigurationName = Default;
+ 		};
  /* End XCConfigurationList section */
  	};