===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sudo/Attic/sudo.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** src/usr.bin/sudo/Attic/sudo.c	2003/04/03 19:15:34	1.19
--- src/usr.bin/sudo/Attic/sudo.c	2003/04/19 21:57:17	1.20
***************
*** 31,36 ****
--- 31,40 ----
   * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
   * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   *
+  * Sponsored in part by the Defense Advanced Research Projects
+  * Agency (DARPA) and Air Force Research Laboratory, Air Force
+  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
+  *
   * For a brief history of sudo, please see the HISTORY file included
   * with this distribution.
   */
***************
*** 103,109 ****
  #include "version.h"
  
  #ifndef lint
! static const char rcsid[] = "$Sudo: sudo.c,v 1.335 2003/04/02 18:25:19 millert Exp $";
  #endif /* lint */
  
  /*
--- 107,113 ----
  #include "version.h"
  
  #ifndef lint
! static const char rcsid[] = "$Sudo: sudo.c,v 1.337 2003/04/16 00:42:10 millert Exp $";
  #endif /* lint */
  
  /*
***************
*** 138,144 ****
  extern int errorlineno;
  #if defined(RLIMIT_CORE) && !defined(SUDO_DEVEL)
  static struct rlimit corelimit;
! #endif /* RLIMIT_CORE */
  #ifdef HAVE_LOGIN_CAP_H
  login_cap_t *lc;
  #endif /* HAVE_LOGIN_CAP_H */
--- 142,148 ----
  extern int errorlineno;
  #if defined(RLIMIT_CORE) && !defined(SUDO_DEVEL)
  static struct rlimit corelimit;
! #endif /* RLIMIT_CORE && !SUDO_DEVEL */
  #ifdef HAVE_LOGIN_CAP_H
  login_cap_t *lc;
  #endif /* HAVE_LOGIN_CAP_H */
***************
*** 391,397 ****
  	/* Restore coredumpsize resource limit. */
  #if defined(RLIMIT_CORE) && !defined(SUDO_DEVEL)
  	(void) setrlimit(RLIMIT_CORE, &corelimit);
! #endif /* RLIMIT_CORE */
  
  	/* Become specified user or root. */
  	set_perms(PERM_RUNAS);
--- 395,401 ----
  	/* Restore coredumpsize resource limit. */
  #if defined(RLIMIT_CORE) && !defined(SUDO_DEVEL)
  	(void) setrlimit(RLIMIT_CORE, &corelimit);
! #endif /* RLIMIT_CORE && !SUDO_DEVEL */
  
  	/* Become specified user or root. */
  	set_perms(PERM_RUNAS);
***************
*** 862,870 ****
       * Turn off core dumps.
       */
      (void) getrlimit(RLIMIT_CORE, &corelimit);
!     rl.rlim_cur = rl.rlim_max = 0;
      (void) setrlimit(RLIMIT_CORE, &rl);
! #endif /* RLIMIT_CORE */
  
      /*
       * Close any open fd's other than stdin, stdout and stderr.
--- 866,875 ----
       * Turn off core dumps.
       */
      (void) getrlimit(RLIMIT_CORE, &corelimit);
!     memcpy(&rl, &corelimit, sizeof(struct rlimit));
!     rl.rlim_cur = 0;
      (void) setrlimit(RLIMIT_CORE, &rl);
! #endif /* RLIMIT_CORE && !SUDO_DEVEL */
  
      /*
       * Close any open fd's other than stdin, stdout and stderr.