===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sudo/Attic/testsudoers.c,v
retrieving revision 1.4
retrieving revision 1.4.8.1
diff -c -r1.4 -r1.4.8.1
*** src/usr.bin/sudo/Attic/testsudoers.c	2000/03/27 03:44:39	1.4
--- src/usr.bin/sudo/Attic/testsudoers.c	2002/01/18 16:14:46	1.4.8.1
***************
*** 1,5 ****
  /*
!  * Copyright (c) 1996, 1998-2000 Todd C. Miller <Todd.Miller@courtesan.com>
   * All rights reserved.
   *
   * This code is derived from software contributed by Chris Jepeway
--- 1,5 ----
  /*
!  * Copyright (c) 1996, 1998-2001 Todd C. Miller <Todd.Miller@courtesan.com>
   * All rights reserved.
   *
   * This code is derived from software contributed by Chris Jepeway
***************
*** 37,55 ****
  
  #include "config.h"
  
  #include <stdio.h>
  #ifdef STDC_HEADERS
  # include <stdlib.h>
  #endif /* STDC_HEADERS */
- #ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif /* HAVE_UNISTD_H */
  #ifdef HAVE_STRING_H
  # include <string.h>
  #endif /* HAVE_STRING_H */
! #ifdef HAVE_STRINGS_H
! # include <strings.h>
! #endif /* HAVE_STRINGS_H */
  #ifdef HAVE_FNMATCH
  # include <fnmatch.h>
  #endif /* HAVE_FNMATCH_H */
--- 37,65 ----
  
  #include "config.h"
  
+ #include <sys/param.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/socket.h>
  #include <stdio.h>
  #ifdef STDC_HEADERS
  # include <stdlib.h>
+ # include <stddef.h>
+ #else
+ # ifdef HAVE_STDLIB_H
+ #  include <stdlib.h>
+ # endif
  #endif /* STDC_HEADERS */
  #ifdef HAVE_STRING_H
  # include <string.h>
+ #else
+ # ifdef HAVE_STRINGS_H
+ #  include <strings.h>
+ # endif
  #endif /* HAVE_STRING_H */
! #ifdef HAVE_UNISTD_H
! # include <unistd.h>
! #endif /* HAVE_UNISTD_H */
  #ifdef HAVE_FNMATCH
  # include <fnmatch.h>
  #endif /* HAVE_FNMATCH_H */
***************
*** 59,71 ****
  #include <ctype.h>
  #include <pwd.h>
  #include <grp.h>
- #include <sys/param.h>
- #include <sys/types.h>
- #include <sys/socket.h>
  #include <netinet/in.h>
  #include <arpa/inet.h>
  #include <netdb.h>
- #include <sys/stat.h>
  #include <dirent.h>
  
  #include "sudo.h"
--- 69,77 ----
***************
*** 77,86 ****
  #endif /* HAVE_FNMATCH */
  
  #ifndef lint
! static const char rcsid[] = "$Sudo: testsudoers.c,v 1.71 2000/03/23 04:38:22 millert Exp $";
  #endif /* lint */
  
  /*
   * Globals
   */
  char **Argv, **NewArgv;
--- 83,100 ----
  #endif /* HAVE_FNMATCH */
  
  #ifndef lint
! static const char rcsid[] = "$Sudo: testsudoers.c,v 1.75 2001/12/15 02:27:17 millert Exp $";
  #endif /* lint */
  
+ 
  /*
+  * Prototypes
+  */
+ void init_parser	__P((void));
+ void dumpaliases	__P((void));
+ void set_perms_dummy	__P((int, int));
+ 
+ /*
   * Globals
   */
  char **Argv, **NewArgv;
***************
*** 89,104 ****
  int num_interfaces;
  struct interface *interfaces;
  struct sudo_user sudo_user;
  extern int clearaliases;
  extern int pedantic;
  
  /*
-  * Prototypes for external functions
-  */
- void init_parser	__P((void));
- void dumpaliases	__P((void));
- 
- /*
   * Returns TRUE if "s" has shell meta characters in it,
   * else returns FALSE.
   */
--- 103,113 ----
  int num_interfaces;
  struct interface *interfaces;
  struct sudo_user sudo_user;
+ void (*set_perms) __P((int, int)) = set_perms_dummy;
  extern int clearaliases;
  extern int pedantic;
  
  /*
   * Returns TRUE if "s" has shell meta characters in it,
   * else returns FALSE.
   */
***************
*** 190,197 ****
  	addr.s_addr = inet_addr(n);
  	if (strchr(m, '.'))
  	    mask.s_addr = inet_addr(m);
! 	else
! 	    mask.s_addr = (1 << atoi(m)) - 1;	/* XXX - better way? */
  	*(m - 1) = '/';               
  
  	for (i = 0; i < num_interfaces; i++)
--- 199,211 ----
  	addr.s_addr = inet_addr(n);
  	if (strchr(m, '.'))
  	    mask.s_addr = inet_addr(m);
! 	else {
! 	    i = 32 - atoi(m);
! 	    mask.s_addr = 0xffffffff;
! 	    mask.s_addr >>= i;
! 	    mask.s_addr <<= i;
! 	    mask.s_addr = htonl(mask.s_addr);
! 	}
  	*(m - 1) = '/';               
  
  	for (i = 0; i < num_interfaces; i++)
***************
*** 298,304 ****
  }
  
  void
! set_perms(i, j)
      int i, j;
  {
      return;
--- 312,318 ----
  }
  
  void
! set_perms_dummy(i, j)
      int i, j;
  {
      return;
***************
*** 306,311 ****
--- 320,331 ----
  
  void
  set_fqdn()
+ {
+     return;
+ }
+ 
+ void
+ init_envtables()
  {
      return;
  }