Undo last commit and add sudo_setspent and sudo_endspent instead.

diff --git a/sudo.h b/sudo.h
index dab13e6379cff15cc305f0067da772a10ae3ca43..9e909f181b310eaea2f0ca64137657e53093b27d 100644 (file)
--- a/sudo.h
+++ b/sudo.h
@@ -161,16 +161,6 @@ struct sudo_user {
 #define TGP_ECHO       0x01            /* leave echo on when reading passwd */
 #define TGP_STDIN      0x02            /* read from stdin, not /dev/tty */
 
-/*
- * Second param of pwcache_{get,put}
- */
-enum cmptype {
-    bypwnam,
-    byuid,
-    bygrnam,
-    bygid
-};
-
 struct passwd;
 struct timespec;
 struct timeval;
@@ -256,10 +246,12 @@ int gettime               __P((struct timespec *));
 FILE *open_sudoers     __P((const char *, int *));
 void display_privs     __P((struct passwd *));
 int display_cmnd       __P((struct passwd *));
-void sudo_setpwent     __P((void));
-void sudo_endpwent     __P((void));
 void sudo_setgrent     __P((void));
 void sudo_endgrent     __P((void));
+void sudo_setpwent     __P((void));
+void sudo_endpwent     __P((void));
+void sudo_setspent     __P((void));
+void sudo_endspent     __P((void));
 void cleanup           __P((void));
 struct passwd *sudo_getpwnam __P((const char *));
 struct passwd *sudo_fakepwnam __P((const char *));
@@ -267,8 +259,6 @@ struct passwd *sudo_getpwuid __P((uid_t));
 struct passwd *sudo_fakepwuid __P((uid_t));
 struct group *sudo_getgrnam __P((const char *));
 struct group *sudo_getgrgid __P((gid_t));
-void pwcache_init __P((void));
-void pwcache_destroy __P((void));
 #ifdef HAVE_SYSTRACE
 void systrace_attach   __P((pid_t));
 #endif