dtprintinfo: Coverity 89561

[oweals/cde.git] / cde / programs / dtlogin / session.c

diff --git a/cde/programs/dtlogin/session.c b/cde/programs/dtlogin/session.c
index e8fe43e9ea43837ff59f5f8fea59f92dea671da9..c5b587fe2e15de995db7ab3d52946dbaf7436220 100644 (file)
--- a/cde/programs/dtlogin/session.c
+++ b/cde/programs/dtlogin/session.c
@@ -134,11 +134,6 @@ static int sia_exit_proc_reg = FALSE;
 
 #endif /* SIA */
 
-
-#ifdef __apollo
-  extern char *getenv();
-#endif 
-
 #define GREET_STATE_LOGIN             0
 #define GREET_STATE_AUTHENTICATE      1
 #define GREET_STATE_EXIT              2
@@ -262,12 +257,12 @@ catchAlrm( int arg )
     longjmp (pingTime, 1);
 }
 
-static int
-FileNameCompare (a, b)
 #if defined(__STDC__)
-       const void *a, *b;
+static int
+FileNameCompare (const char *a, const char *b)
 #else
-       char *a, *b;
+static int
+FileNameCompare (char *a, char *b)
 #endif
 {
     return strcoll (*(char **)a, *(char **)b);
@@ -1418,30 +1413,6 @@ StartClient( struct verify_info *verify, struct display *d, int *pidp )
        Debug("BLS - Session setup complete.\n");
     } else {
 #endif /* BLS */
-                       
-#ifdef __apollo
-
-       /* 
-        * This should never fail since everything has been verified already.
-        * If it does it must mean registry strangeness, so exit, and try
-        * again...
-        */
-
-       if (!DoLogin (user, greet.password, d->name)) exit (1);
-       
-       /*
-        * extract the SYSTYPE and ISP environment values and set into user's 
-        * environment. This is necessary since we do an execve below...
-        */
-        
-       verify->userEnviron = setEnv(verify->userEnviron, "SYSTYPE",
-                                    getenv("SYSTYPE"));
-
-       verify->userEnviron = setEnv(verify->userEnviron, "ISP",
-                                    getenv("ISP"));
-
-#else /* ! __apollo */
-
 
 #  ifdef __AFS
        if ( IsVerifyName(VN_AFS) ) {
@@ -1525,8 +1496,6 @@ StartClient( struct verify_info *verify, struct display *d, int *pidp )
        }
 #endif
 
-#endif /* __apollo */
-
 #ifdef BLS
     }  /* ends the else clause of if ( ISSECURE ) */
 #endif /* BLS */
@@ -1655,7 +1624,7 @@ StartClient( struct verify_info *verify, struct display *d, int *pidp )
 
            failsafeArgv[i++] = "-e";
            failsafeArgv[i++] = "/bin/passwd";
-#if defined (__apollo) || defined(__PASSWD_ETC)
+#if defined(__PASSWD_ETC)
            failsafeArgv[i++] = "-n";
 #endif
            failsafeArgv[i++] = getEnv (verify->userEnviron, "USER");
@@ -2077,15 +2046,6 @@ RunGreeter( struct display *d, struct greet_info *greet,
                 env = setEnv(env, "OPENWINHOME", path);
 #endif
 
-#ifdef __apollo
-           /*
-            *  set environment for Domain machines...
-            */
-           env = setEnv(env, "ENVIRONMENT", "bsd");
-           env = setEnv(env, "SYSTYPE", "bsd4.3");
-#endif
-               
-
            Debug ("Greeter environment:\n");
            printEnv(env);
            Debug ("End of Greeter environment:\n");