[Spread-cvs] cvs commit: spread/daemon alarm.h spread.c Readme.txt

[jonathan at spread.org]

jonathan    04/02/13 11:14:26

  Modified:    daemon   alarm.h spread.c Readme.txt
  Log:
  Change alarm tag from SEC to SECURITY to avoid name conflict with sys/time.h
  header. Problem reported by Mikhail Terekhov.
  
  Revision  Changes    Path
  1.4       +1 -1      spread/daemon/alarm.h
  
  Index: alarm.h
  ===================================================================
  RCS file: /storage/cvsroot/spread/daemon/alarm.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- alarm.h	12 Nov 2003 22:11:03 -0000	1.3
  +++ alarm.h	13 Feb 2004 16:14:26 -0000	1.4
  @@ -66,7 +66,7 @@
   #define         SKIPLIST        0x00200000
   #define         ACM             0x00400000
   
  -#define         SEC             0x00800000
  +#define         SECURITY        0x00800000
   
   #define		ALL		0xffffffff
   #define		NONE		0x00000000
  
  
  
  1.18      +4 -4      spread/daemon/spread.c
  
  Index: spread.c
  ===================================================================
  RCS file: /storage/cvsroot/spread/daemon/spread.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- spread.c	9 Feb 2004 19:38:21 -0000	1.17
  +++ spread.c	13 Feb 2004 16:14:26 -0000	1.18
  @@ -169,7 +169,7 @@
   	/* Yupp, we're paranoid */
    
   	if (geteuid() != (uid_t) 0) {
  -            Alarmp( SPLOG_WARNING, SEC, "Spread: not running as root, won't chroot\n" );
  +            Alarmp( SPLOG_WARNING, SECURITY, "Spread: not running as root, won't chroot\n" );
   	}
   	else if ( (grp = getgrnam(Conf_get_group())) == NULL
                     || (pwd = getpwnam(Conf_get_user())) == NULL ) {
  @@ -177,7 +177,7 @@
   	}
   	else if (chdir(Conf_get_runtime_dir()) < 0
                     || chroot(Conf_get_runtime_dir()) < 0 ) {
  -            Alarmp( SPLOG_FATAL, SEC, "Spread: FAILED chroot to '%s'\n",
  +            Alarmp( SPLOG_FATAL, SECURITY, "Spread: FAILED chroot to '%s'\n",
                      Conf_get_runtime_dir() );
   	}
   	else if ( setgroups(1, &grp->gr_gid) < 0
  @@ -185,7 +185,7 @@
                     || setuid(pwd->pw_uid) < 0) {
               Invalid_privilege_decrease(Conf_get_user(), Conf_get_group());
   	} else {
  -            Alarmp( SPLOG_INFO, SEC, "Spread: setugid and chroot successeful\n" );
  +            Alarmp( SPLOG_INFO, SECURITY, "Spread: setugid and chroot successeful\n" );
   	}
   
   #endif	/* ARCH_PC_WIN95 */
  @@ -206,7 +206,7 @@
   
   static	void	Invalid_privilege_decrease(char *user, char *group)
   {
  -    Alarmp( SPLOG_FATAL, SEC, "Spread: FAILED privilege drop to user/group "
  +    Alarmp( SPLOG_FATAL, SECURITY, "Spread: FAILED privilege drop to user/group "
              "'%s/%s' (defined in spread.conf or spread_params.h)\n",
              user, group );
   }
  
  
  
  1.50      +2 -0      spread/daemon/Readme.txt
  
  Index: Readme.txt
  ===================================================================
  RCS file: /storage/cvsroot/spread/daemon/Readme.txt,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- Readme.txt	13 Feb 2004 16:12:14 -0000	1.49
  +++ Readme.txt	13 Feb 2004 16:14:26 -0000	1.50
  @@ -77,6 +77,8 @@
   14) Fix small endianness error in sp.c where the mess_type field may not be
       correctly converted for different endian platforms when the SP_*_recv calls
       return a BUFFER_TOO_SHORT or GROUPS_TOO_SHORT error.
  +15) Change alarm tag for security prints from SEC to SECURITY because of conflict
  +    with sys/time.h header.
   
   SOURCE INSTALL:
   ---------------