From: wmoxam <wes@wmoxam.com>
Date: Mon, 14 Oct 2019 03:12:13 +0000 (-0400)
Subject: Remove legacysun code blocks
X-Git-Tag: 2.3.1~18
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d380b0fac6a64e8adac998ec72a70fbffd68a960;p=oweals%2Fcde.git

Remove legacysun code blocks
---

diff --git a/cde/programs/dtcalc/calctool.c b/cde/programs/dtcalc/calctool.c
index 36827f15..28bae5b5 100644
--- a/cde/programs/dtcalc/calctool.c
+++ b/cde/programs/dtcalc/calctool.c
@@ -46,19 +46,6 @@
 #include "calctool.h"
 #include "ds_common.h"
 
-#ifdef legacysun
-
-/* Copied from math.h */
-struct exception {
-        int type;
-        char *name;
-        double arg1;
-        double arg2;
-        double retval;
-};
-
-#endif
-
 time_t time() ;
 
 double max_fix[4] = {
diff --git a/cde/programs/dtlogin/pam_svc.c b/cde/programs/dtlogin/pam_svc.c
index 44915654..de7ec06a 100644
--- a/cde/programs/dtlogin/pam_svc.c
+++ b/cde/programs/dtlogin/pam_svc.c
@@ -150,14 +150,6 @@ PamAuthenticate ( char*   prog_name,
 	    return(PAM_AUTH_ERR);
         }
 
-#ifdef legacysun
-        /* Solaris BSM Audit trail */
-
-	audit_login_save_host(display_name);
-	audit_login_save_ttyn(line_dev);
-	audit_login_save_port();
-#endif
-
 	status = PamInit(prog_name, user, line_dev, display_name);
 
 	if (status == PAM_SUCCESS) {
@@ -167,23 +159,6 @@ PamAuthenticate ( char*   prog_name,
            status = pam_authenticate( pamh, 0 );
 	   pam_auth_trys++;
 
-#ifdef legacysun
-	   pwd = getpwnam(user);
-	   audit_login_save_pw(pwd);
-
-	   if (status != PAM_SUCCESS) {
-	      audit_login_bad_pw();
-
-              if (status == PAM_MAXTRIES) {
-		 pam_auth_trys = PAM_LOGIN_MAXTRIES+1;
-	      }	
-
-	      if (pam_auth_trys > PAM_LOGIN_MAXTRIES) {
-		 audit_login_maxtrys();
-	      }
-	   }
-#endif
-
 	   if (status != PAM_SUCCESS) {
 	      sleep(PAM_LOGIN_SLEEPTIME);
 	      if (pam_auth_trys > PAM_LOGIN_MAXTRIES) {
@@ -262,9 +237,6 @@ PamAccounting( char*   prog_name,
                     Debug("PamAccounting: USER_PROCESS open_session error=%d\n",
 								 status); 
 		}
-#ifdef legacysun
-	        if (status == PAM_SUCCESS) audit_login_success();
-#endif
 		session_type = SOLARIS_LOGIN;
 		status = solaris_setutmp_mgmt(user, tty_line, display_name, 
 					session_type, entry_type, entry_id);