===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sudo/Attic/parse.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/sudo/Attic/parse.h	2000/03/27 03:44:38	1.3
--- src/usr.bin/sudo/Attic/parse.h	2004/09/28 15:10:51	1.4
***************
*** 1,37 ****
  /*
!  * Copyright (c) 1996, 1998-2000 Todd C. Miller <Todd.Miller@courtesan.com>
!  * All rights reserved.
   *
!  * Redistribution and use in source and binary forms, with or without
!  * modification, are permitted provided that the following conditions
!  * are met:
   *
!  * 1. Redistributions of source code must retain the above copyright
!  *    notice, this list of conditions and the following disclaimer.
   *
!  * 2. Redistributions in binary form must reproduce the above copyright
!  *    notice, this list of conditions and the following disclaimer in the
!  *    documentation and/or other materials provided with the distribution.
!  *
!  * 3. The name of the author may not be used to endorse or promote products
!  *    derived from this software without specific prior written permission.
!  *
!  * 4. Products derived from this software may not be called "Sudo" nor
!  *    may "Sudo" appear in their names without specific prior written
!  *    permission from the author.
!  *
!  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
!  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
!  * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
!  * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
!  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
!  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
!  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
!  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
!  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
!  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
!  *
!  * $Sudo: parse.h,v 1.9 2000/03/23 04:38:20 millert Exp $
   */
  
  #ifndef _SUDO_PARSE_H
--- 1,19 ----
  /*
!  * Copyright (c) 1996,1998-2000,2004 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
!  * copyright notice and this permission notice appear in all copies.
   *
!  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
!  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
!  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
!  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
!  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
!  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
!  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   *
!  * $Sudo: parse.h,v 1.14 2004/08/02 18:44:58 millert Exp $
   */
  
  #ifndef _SUDO_PARSE_H
***************
*** 50,55 ****
--- 32,38 ----
  	int host;
  	int runas;
  	int nopass;
+ 	int noexec;
  };
  
  /*
***************
*** 66,71 ****
--- 49,55 ----
  #define host_matches	(match[top-1].host)
  #define runas_matches	(match[top-1].runas)
  #define no_passwd	(match[top-1].nopass)
+ #define no_execve	(match[top-1].noexec)
  
  /*
   * Structure containing command matches if "sudo -l" is used.
***************
*** 78,83 ****
--- 62,68 ----
      size_t cmnd_len;
      size_t cmnd_size;
      int nopasswd;
+     int noexecve;
  };
  
  /*
***************
*** 108,116 ****
   * Prototypes
   */
  int addr_matches	__P((char *));
! int command_matches	__P((char *, char *, char *, char *));
  int hostname_matches	__P((char *, char *, char *));
  int netgr_matches	__P((char *, char *, char *, char *));
! int usergr_matches	__P((char *, char *));
  
  #endif /* _SUDO_PARSE_H */
--- 93,102 ----
   * Prototypes
   */
  int addr_matches	__P((char *));
! int command_matches	__P((char *, char *));
  int hostname_matches	__P((char *, char *, char *));
  int netgr_matches	__P((char *, char *, char *, char *));
! int userpw_matches	__P((char *, char *, struct passwd *));
! int usergr_matches	__P((char *, char *, struct passwd *));
  
  #endif /* _SUDO_PARSE_H */