From: Bdale Garbee <bdale@gag.com>
Date: Thu, 15 May 2008 06:50:33 +0000 (-0600)
Subject: fix an apparent merge error
X-Git-Tag: debian/1.6.9p17-1~9
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=74ca4f2feae690857d4a833ef8f5ba89a439002c;p=debian%2Fsudo

fix an apparent merge error
---

diff --git a/sudo.c b/sudo.c
index f051d5a..0f8e2de 100644
--- a/sudo.c
+++ b/sudo.c
@@ -1243,34 +1243,6 @@ set_runaspw(user)
     return(TRUE);
 }
 
-/*
- * Get passwd entry for the user we are going to run commands as.
- * By default, this is "root".  Updates runas_pw as a side effect.
- */
-int
-set_runaspw(user)
-    char *user;
-{
-    if (runas_pw != NULL) {
-	if (user_runas != &def_runas_default)
-	    return(TRUE);		/* don't override -u option */
-	efree(runas_pw);
-    }
-    if (*user == '#') {
-	runas_pw = sudo_getpwuid(atoi(user + 1));
-	if (runas_pw == NULL) {
-	    runas_pw = emalloc(sizeof(struct passwd));
-	    (void) memset((VOID *)runas_pw, 0, sizeof(struct passwd));
-	    runas_pw->pw_uid = atoi(user + 1);
-	}
-    } else {
-	runas_pw = sudo_getpwnam(user);
-	if (runas_pw == NULL)
-	    log_error(NO_MAIL|MSG_ONLY, "no passwd entry for %s!", user);
-    }
-    return(TRUE);
-}
-
 /*
  * Get passwd entry for the user we are going to authenticate as.
  * By default, this is the user invoking sudo.  In the most common