Remove my_* redirection in pwutil.c for testsudoers and just use the normal

libc get{pw,gr}* names.

diff --git a/pwutil.c b/pwutil.c
index 3e30499af9de6dceb60f98de37d06712a2308064..b309804807ebc4199054884ef824eed7f9c7490f 100644 (file)
--- a/pwutil.c
+++ b/pwutil.c
@@ -56,26 +56,6 @@
 __unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
-#ifdef MYPW
-extern void (*my_setgrent) __P((void));
-extern void (*my_endgrent) __P((void));
-extern struct group *(*my_getgrnam) __P((const char *));
-extern struct group *(*my_getgrgid) __P((gid_t));
-#define setgrent()     my_setgrent()
-#define endgrent()     my_endgrent()
-#define getgrnam(n)    my_getgrnam(n)
-#define getgrgid(g)    my_getgrgid(g)
-
-extern void (*my_setpwent) __P((void));
-extern void (*my_endpwent) __P((void));
-extern struct passwd *(*my_getpwnam) __P((const char *));
-extern struct passwd *(*my_getpwuid) __P((uid_t));
-#define setpwent()     my_setpwent()
-#define endpwent()     my_endpwent()
-#define getpwnam(n)    my_getpwnam(n)
-#define getpwuid(u)    my_getpwuid(u)
-#endif
-
 /*
  * The passwd and group caches.
  */

diff --git a/testsudoers.c b/testsudoers.c
index 284d560a341af24f6f300540c7698afa9ed14c12..edadb5f66d517239875e4c694ec4e91b3f225f46 100644 (file)
--- a/testsudoers.c
+++ b/testsudoers.c
@@ -86,16 +86,6 @@ struct sudo_user sudo_user;
 struct passwd *list_pw;
 extern int parse_error;
 
-/* passwd/group redirection for pwutil.c */
-void (*my_setgrent) __P((void)) = setgrent;
-void (*my_endgrent) __P((void)) = endgrent;
-struct group *(*my_getgrnam) __P((const char *)) = getgrnam;
-struct group *(*my_getgrgid) __P((gid_t)) = getgrgid;
-void (*my_setpwent) __P((void)) = setpwent;
-void (*my_endpwent) __P((void)) = endpwent;
-struct passwd *(*my_getpwnam) __P((const char *)) = getpwnam;
-struct passwd *(*my_getpwuid) __P((uid_t)) = getpwuid;
-
 /* For getopt(3) */
 extern char *optarg;
 extern int optind;
@@ -116,18 +106,18 @@ void usage __P((void)) __attribute__((__noreturn__));
 void set_runasgr __P((char *));
 void set_runaspw __P((char *));
 
-extern void ts_setgrfile __P((const char *));
-extern void ts_setgrent __P((void));
-extern void ts_endgrent __P((void));
-extern struct group *ts_getgrent __P((void));
-extern struct group *ts_getgrnam __P((const char *));
-extern struct group *ts_getgrgid __P((gid_t));
-extern void ts_setpwfile __P((const char *));
-extern void ts_setpwent __P((void));
-extern void ts_endpwent __P((void));
-extern struct passwd *ts_getpwent __P((void));
-extern struct passwd *ts_getpwnam __P((const char *));
-extern struct passwd *ts_getpwuid __P((uid_t));
+extern void setgrfile __P((const char *));
+extern void setgrent __P((void));
+extern void endgrent __P((void));
+extern struct group *getgrent __P((void));
+extern struct group *getgrnam __P((const char *));
+extern struct group *getgrgid __P((gid_t));
+extern void setpwfile __P((const char *));
+extern void setpwent __P((void));
+extern void endpwent __P((void));
+extern struct passwd *getpwent __P((void));
+extern struct passwd *getpwnam __P((const char *));
+extern struct passwd *getpwuid __P((uid_t));
 
 int
 main(argc, argv)
@@ -184,20 +174,10 @@ main(argc, argv)
     NewArgv = argv;
 
     /* Set group/passwd file and init the cache. */
-    if (grfile) {
-       my_setgrent = ts_setgrent;
-       my_endgrent = ts_endgrent;
-       my_getgrnam = ts_getgrnam;
-       my_getgrgid = ts_getgrgid;
-       ts_setgrfile(grfile);
-    }
-    if (pwfile) {
-       my_setpwent = ts_setpwent;
-       my_endpwent = ts_endpwent;
-       my_getpwnam = ts_getpwnam;
-       my_getpwuid = ts_getpwuid;
-       ts_setpwfile(pwfile);
-    }
+    if (grfile)
+       setgrfile(grfile);
+    if (pwfile)
+       setpwfile(pwfile);
     sudo_setpwent();
     sudo_setgrent();
 

diff --git a/tsgetgrpw.c b/tsgetgrpw.c
index 7f35269a94e54bd92d2d82f6dc1a349cff8b4b30..175de78bd884d613ab2b6e9b3f16a90bcbcd55b8 100644 (file)
--- a/tsgetgrpw.c
+++ b/tsgetgrpw.c
@@ -64,31 +64,31 @@ static FILE *grf;
 static const char *grfile = "/etc/group";
 static int gr_stayopen;
 
-void ts_setgrfile __P((const char *));
-void ts_setgrent __P((void));
-void ts_endgrent __P((void));
-struct group *ts_getgrent __P((void));
-struct group *ts_getgrnam __P((const char *));
-struct group *ts_getgrgid __P((gid_t));
+void setgrfile __P((const char *));
+void setgrent __P((void));
+void endgrent __P((void));
+struct group *getgrent __P((void));
+struct group *getgrnam __P((const char *));
+struct group *getgrgid __P((gid_t));
 
-void ts_setpwfile __P((const char *));
-void ts_setpwent __P((void));
-void ts_endpwent __P((void));
-struct passwd *ts_getpwent __P((void));
-struct passwd *ts_getpwnam __P((const char *));
-struct passwd *ts_getpwuid __P((uid_t));
+void setpwfile __P((const char *));
+void setpwent __P((void));
+void endpwent __P((void));
+struct passwd *getpwent __P((void));
+struct passwd *getpwnam __P((const char *));
+struct passwd *getpwuid __P((uid_t));
 
 void
-ts_setpwfile(file)
+setpwfile(file)
     const char *file;
 {
     pwfile = file;
     if (pwf != NULL)
-       ts_endpwent();
+       endpwent();
 }
 
 void
-ts_setpwent()
+setpwent()
 {
     if (pwf == NULL)
        pwf = fopen(pwfile, "r");
@@ -98,7 +98,7 @@ ts_setpwent()
 }
 
 void
-ts_endpwent()
+endpwent()
 {
     if (pwf != NULL) {
        fclose(pwf);
@@ -108,7 +108,7 @@ ts_endpwent()
 }
 
 struct passwd *
-ts_getpwent()
+getpwent()
 {
     static struct passwd pw;
     static char pwbuf[LINE_MAX];
@@ -151,7 +151,7 @@ ts_getpwent()
 }
 
 struct passwd *
-ts_getpwnam(name)
+getpwnam(name)
     const char *name;
 {
     struct passwd *pw;
@@ -160,7 +160,7 @@ ts_getpwnam(name)
        rewind(pwf);
     else if ((pwf = fopen(pwfile, "r")) == NULL)
        return(NULL);
-    while ((pw = ts_getpwent()) != NULL) {
+    while ((pw = getpwent()) != NULL) {
        if (strcmp(pw->pw_name, name) == 0)
            break;
     }
@@ -172,7 +172,7 @@ ts_getpwnam(name)
 }
 
 struct passwd *
-ts_getpwuid(uid)
+getpwuid(uid)
     uid_t uid;
 {
     struct passwd *pw;
@@ -181,7 +181,7 @@ ts_getpwuid(uid)
        rewind(pwf);
     else if ((pwf = fopen(pwfile, "r")) == NULL)
        return(NULL);
-    while ((pw = ts_getpwent()) != NULL) {
+    while ((pw = getpwent()) != NULL) {
        if (pw->pw_uid == uid)
            break;
     }
@@ -193,16 +193,16 @@ ts_getpwuid(uid)
 }
 
 void
-ts_setgrfile(file)
+setgrfile(file)
     const char *file;
 {
     grfile = file;
     if (grf != NULL)
-       ts_endgrent();
+       endgrent();
 }
 
 void
-ts_setgrent()
+setgrent()
 {
     if (grf == NULL)
        grf = fopen(grfile, "r");
@@ -212,7 +212,7 @@ ts_setgrent()
 }
 
 void
-ts_endgrent()
+endgrent()
 {
     if (grf != NULL) {
        fclose(grf);
@@ -222,7 +222,7 @@ ts_endgrent()
 }
 
 struct group *
-ts_getgrent()
+getgrent()
 {
     static struct group gr;
     static char grbuf[LINE_MAX], *gr_mem[GRMEM_MAX+1];
@@ -263,7 +263,7 @@ ts_getgrent()
 }
 
 struct group *
-ts_getgrnam(name)
+getgrnam(name)
     const char *name;
 {
     struct group *gr;
@@ -272,7 +272,7 @@ ts_getgrnam(name)
        rewind(grf);
     else if ((grf = fopen(grfile, "r")) == NULL)
        return(NULL);
-    while ((gr = ts_getgrent()) != NULL) {
+    while ((gr = getgrent()) != NULL) {
        if (strcmp(gr->gr_name, name) == 0)
            break;
     }
@@ -284,7 +284,7 @@ ts_getgrnam(name)
 }
 
 struct group *
-ts_getgrgid(gid)
+getgrgid(gid)
     gid_t gid;
 {
     struct group *gr;
@@ -293,7 +293,7 @@ ts_getgrgid(gid)
        rewind(grf);
     else if ((grf = fopen(grfile, "r")) == NULL)
        return(NULL);
-    while ((gr = ts_getgrent()) != NULL) {
+    while ((gr = getgrent()) != NULL) {
        if (gr->gr_gid == gid)
            break;
     }