From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Mon, 14 Nov 2016 21:33:43 +0000 (-0700)
Subject: Remove Ultrix support, modern sudo can't run on Ultrix anyway.
X-Git-Tag: SUDO_1_8_19^2~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d11b725c5fdb6efb693111862af1dc8b61b9b2b;p=sudo

Remove Ultrix support, modern sudo can't run on Ultrix anyway.
---

diff --git a/config.h.in b/config.h.in
index e34cc6dfd..b090672b0 100644
--- a/config.h.in
+++ b/config.h.in
@@ -258,10 +258,6 @@
 /* Define to 1 if you have the `getaddrinfo' function. */
 #undef HAVE_GETADDRINFO
 
-/* Define to 1 if you have the `getauthuid' function. (ULTRIX 4.x shadow
-   passwords). */
-#undef HAVE_GETAUTHUID
-
 /* Define to 1 if you have the `getdomainname' function. */
 #undef HAVE_GETDOMAINNAME
 
diff --git a/configure b/configure
index 2a10f9dd0..758d41e42 100755
--- a/configure
+++ b/configure
@@ -15321,11 +15321,6 @@ _ACEOF
 		# lockf() is broken on the Hurd
 		ac_cv_func_lockf=no
 		;;
-    *-*-ultrix*)
-		OS="ultrix"
-		shadow_funcs="getauthuid"
-		shadow_libs="-lauth"
-		;;
     *-*-riscos*)
 		LIBS="${LIBS} -lsun -lbsd"
 
@@ -26774,6 +26769,5 @@ fi
 
 
 
-
 
 
diff --git a/configure.ac b/configure.ac
index e3b284be8..664a29972 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1977,11 +1977,6 @@ case "$host" in
 		# lockf() is broken on the Hurd
 		ac_cv_func_lockf=no
 		;;
-    *-*-ultrix*)
-		OS="ultrix"
-		shadow_funcs="getauthuid"
-		shadow_libs="-lauth"
-		;;
     *-*-riscos*)
 		LIBS="${LIBS} -lsun -lbsd"
 		SUDO_APPEND_CPPFLAGS(-I/usr/include)
@@ -4317,7 +4312,6 @@ AH_TEMPLATE(HAVE_DLOPEN, [Define to 1 if you have the `dlopen' function.])
 AH_TEMPLATE(HAVE_FCNTL_CLOSEM, [Define to 1 if your system has the F_CLOSEM fcntl.])
 AH_TEMPLATE(HAVE_FNMATCH, [Define to 1 if you have the `fnmatch' function.])
 AH_TEMPLATE(HAVE_FWTK, [Define to 1 if you use the FWTK authsrv daemon.])
-AH_TEMPLATE(HAVE_GETAUTHUID, [Define to 1 if you have the `getauthuid' function. (ULTRIX 4.x  shadow passwords).])
 AH_TEMPLATE(HAVE_GETPRPWNAM, [Define to 1 if you have the `getprpwnam' function.  (SecureWare-style shadow passwords).])
 AH_TEMPLATE(HAVE_GETPWANAM, [Define to 1 if you have the `getpwanam' function. (SunOS 4.x shadow passwords).])
 AH_TEMPLATE(HAVE_GETSPNAM, [Define to 1 if you have the `getspnam' function (SVR4-style shadow passwords).])
diff --git a/plugins/sudoers/auth/passwd.c b/plugins/sudoers/auth/passwd.c
index 7318f09d3..ae5e086c2 100644
--- a/plugins/sudoers/auth/passwd.c
+++ b/plugins/sudoers/auth/passwd.c
@@ -66,13 +66,6 @@ sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_c
     if (pass[0] == '\0')
 	debug_return_int(pw_epasswd[0] ? AUTH_FAILURE : AUTH_SUCCESS);
 
-#ifdef HAVE_GETAUTHUID
-    /* Ultrix shadow passwords may use crypt16() */
-    epass = (char *) crypt16(pass, pw_epasswd);
-    if (epass != NULL && strcmp(pw_epasswd, epass) == 0)
-	debug_return_int(AUTH_SUCCESS);
-#endif /* HAVE_GETAUTHUID */
-
     /*
      * Truncate to 8 chars if standard DES since not all crypt()'s do this.
      * If this turns out not to be safe we will have to use OS #ifdef's (sigh).
diff --git a/plugins/sudoers/getspwuid.c b/plugins/sudoers/getspwuid.c
index 38cbc4f62..0b428f4fc 100644
--- a/plugins/sudoers/getspwuid.c
+++ b/plugins/sudoers/getspwuid.c
@@ -51,9 +51,6 @@
 # include <sys/audit.h>
 # include <pwdadj.h>
 #endif /* HAVE_GETPWANAM */
-#ifdef HAVE_GETAUTHUID
-# include <auth.h>
-#endif /* HAVE_GETAUTHUID */
 
 #include "sudoers.h"
 
@@ -120,14 +117,6 @@ sudo_getepw(const struct passwd *pw)
 	    epw = spw->pwa_passwd;
     }
 #endif /* HAVE_GETPWANAM */
-#ifdef HAVE_GETAUTHUID
-    {
-	AUTHORIZATION *spw;
-
-	if ((spw = getauthuid(pw->pw_uid)) && spw->a_password)
-	    epw = spw->a_password;
-    }
-#endif /* HAVE_GETAUTHUID */
 
 #if defined(HAVE_ISCOMSEC) || defined(HAVE_ISSECURE)
 done:
@@ -152,9 +141,6 @@ sudo_setspent(void)
 #endif
 #ifdef HAVE_GETPWANAM
     setpwaent();
-#endif
-#ifdef HAVE_GETAUTHUID
-    setauthent();
 #endif
     debug_return;
 }
@@ -175,9 +161,6 @@ sudo_endspent(void)
 #endif
 #ifdef HAVE_GETPWANAM
     endpwaent();
-#endif
-#ifdef HAVE_GETAUTHUID
-    endauthent();
 #endif
     debug_return;
 }