===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sudo/Attic/logging.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** src/usr.bin/sudo/Attic/logging.c	2008/11/14 11:58:08	1.21
--- src/usr.bin/sudo/Attic/logging.c	2009/06/21 14:48:42	1.22
***************
*** 1,5 ****
  /*
!  * Copyright (c) 1994-1996, 1998-2008 Todd C. Miller <Todd.Miller@courtesan.com>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
--- 1,5 ----
  /*
!  * Copyright (c) 1994-1996, 1998-2009 Todd C. Miller <Todd.Miller@courtesan.com>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
***************
*** 58,64 ****
  #include "sudo.h"
  
  #ifndef lint
! __unused static const char rcsid[] = "$Sudo: logging.c,v 1.203 2008/11/09 14:13:12 millert Exp $";
  #endif /* lint */
  
  static void do_syslog		__P((int, char *));
--- 58,64 ----
  #include "sudo.h"
  
  #ifndef lint
! __unused static const char rcsid[] = "$Sudo: logging.c,v 1.205 2009/05/25 12:02:41 millert Exp $";
  #endif /* lint */
  
  static void do_syslog		__P((int, char *));
***************
*** 371,377 ****
  #endif
  
      /* Become root if we are not already to avoid user interference */
!     set_perms(PERM_ROOT);
  
      /* Expand printf-style format + args. */
      evasprintf(&message, fmt, ap);
--- 371,377 ----
  #endif
  
      /* Become root if we are not already to avoid user interference */
!     set_perms(PERM_ROOT|PERM_NOEXIT);
  
      /* Expand printf-style format + args. */
      evasprintf(&message, fmt, ap);
***************
*** 555,564 ****
  		 * (so user cannot kill it) or as the user (for the paranoid).
  		 */
  #ifndef NO_ROOT_MAILER
! 		set_perms(PERM_ROOT);
  		execve(mpath, argv, root_envp);
  #else
! 		set_perms(PERM_FULL_USER);
  		execv(mpath, argv);
  #endif /* NO_ROOT_MAILER */
  		mysyslog(LOG_ERR, "cannot execute %s: %m", mpath);
--- 555,564 ----
  		 * (so user cannot kill it) or as the user (for the paranoid).
  		 */
  #ifndef NO_ROOT_MAILER
! 		set_perms(PERM_ROOT|PERM_NOEXIT);
  		execve(mpath, argv, root_envp);
  #else
! 		set_perms(PERM_FULL_USER|PERM_NOEXIT);
  		execv(mpath, argv);
  #endif /* NO_ROOT_MAILER */
  		mysyslog(LOG_ERR, "cannot execute %s: %m", mpath);