]> granicus.if.org Git - sudo/commitdiff
No more sudo_getpw*
authorTodd C. Miller <Todd.Miller@courtesan.com>
Mon, 22 Feb 2010 02:18:52 +0000 (21:18 -0500)
committerTodd C. Miller <Todd.Miller@courtesan.com>
Mon, 22 Feb 2010 02:18:52 +0000 (21:18 -0500)
compat/glob.c

index f9594c80d44180b6e46e38c8a51d83931911c6c4..c0ec12b2543edc2a717da65d0b511dabdc2c5c87 100644 (file)
@@ -174,9 +174,6 @@ static int   match __P((Char *, Char *, Char *));
 static void     qprintf __P((const char *, Char *));
 #endif
 
-extern struct passwd *sudo_getpwnam __P((const char *));
-extern struct passwd *sudo_getpwuid __P((uid_t));
-
 int
 glob(pattern, flags, errfunc, pglob)
        const char *pattern;
@@ -390,7 +387,7 @@ globtilde(pattern, patbuf, patbuf_len, pglob)
                 * first and then trying the password file
                 */
                if ((h = getenv("HOME")) == NULL) {
-                       if ((pwd = sudo_getpwuid(getuid())) == NULL)
+                       if ((pwd = getpwuid(getuid())) == NULL)
                                return pattern;
                        else
                                h = pwd->pw_dir;
@@ -399,7 +396,7 @@ globtilde(pattern, patbuf, patbuf_len, pglob)
                /*
                 * Expand a ~user
                 */
-               if ((pwd = sudo_getpwnam((char*) patbuf)) == NULL)
+               if ((pwd = getpwnam((char*) patbuf)) == NULL)
                        return pattern;
                else
                        h = pwd->pw_dir;