Remove legacysun code blocks

diff --git a/cde/programs/dtcalc/calctool.c b/cde/programs/dtcalc/calctool.c
index 36827f1540d4c724206d752b43a86c7a0655e8c3..28bae5b5f641731cf9ea564f00131fbad5124564 100644 (file)
--- a/cde/programs/dtcalc/calctool.c
+++ b/cde/programs/dtcalc/calctool.c
@@ -46,19 +46,6 @@
 #include "calctool.h"
 #include "ds_common.h"
 
 #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] = {
 time_t time() ;
 
 double max_fix[4] = {

diff --git a/cde/programs/dtlogin/pam_svc.c b/cde/programs/dtlogin/pam_svc.c
index 449156540648540e10e5ec7a2c82f9d7f8896ba8..de7ec06a90976c5a883b168dabe61893a8b87b00 100644 (file)
--- 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);
         }
 
            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) {
        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++;
 
            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) {
           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); 
                }
                     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); 
                session_type = SOLARIS_LOGIN;
                status = solaris_setutmp_mgmt(user, tty_line, display_name, 
                                        session_type, entry_type, entry_id);