X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cde%2Fprograms%2Fdtlogin%2Fsession.c;h=c5b587fe2e15de995db7ab3d52946dbaf7436220;hb=419a7efff4541e7327bc1c4e28c4d8f16fb81035;hp=cf6ce6d1819c350e5e6742940bd36c94b2dfe6ce;hpb=13d3e1db507bce18b785a3215be0ba80e241b166;p=oweals%2Fcde.git

diff --git a/cde/programs/dtlogin/session.c b/cde/programs/dtlogin/session.c
index cf6ce6d1..c5b587fe 100644
--- a/cde/programs/dtlogin/session.c
+++ b/cde/programs/dtlogin/session.c
@@ -16,7 +16,7 @@
  * details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with these librararies and programs; if not, write
+ * License along with these libraries and programs; if not, write
  * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110-1301 USA
  */
@@ -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);
@@ -754,11 +749,8 @@ LoadAltDtsResources(struct display *d)
             Debug("LoadAltDtsResources- cant access %s.\n", resources);
             Debug("\t %s.  Falling back to C.\n", strerror(errno));
 
-            if (resources)
-	    {
-	        free (resources);
-	        resources = NULL;
-	    }
+	    free (resources);
+	    resources = NULL;
 
             resources = _ExpandLang(dirname[j], "C");
             if (access (resources, R_OK) != 0)
@@ -1148,7 +1140,7 @@ SessionExit( struct display *d, int status )
 
     /* make sure the server gets reset after the session is over */
     if (d->serverPid >= 2) {
-        Debug("Reseting server:  pid %d signal %d\n",
+        Debug("Resetting server:  pid %d signal %d\n",
 	      d->serverPid, d->resetSignal);
 
         if (d->terminateServer == 0 && d->resetSignal)
@@ -1421,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) ) {
@@ -1487,7 +1455,7 @@ StartClient( struct verify_info *verify, struct display *d, int *pidp )
 	 * the "setgroups()" call instead...
 	 */
 	 
-#      if (defined(__hpux) || defined(__osf__))
+#      if defined(__hpux)
 	initgroups(user, -1);
 #      else
 	setgroups (verify->ngroups, verify->groups);
@@ -1528,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 */
@@ -1628,8 +1594,6 @@ StartClient( struct verify_info *verify, struct display *d, int *pidp )
 	    failsafeArgv[i++] = "/usr/bin/X11/aixterm";
 #elif defined(sun)
 	    failsafeArgv[i++] = "/usr/openwin/bin/xterm";
-#elif defined (USL) || defined(__uxp__)
-            failsafeArgv[i++] = "/usr/X/bin/xterm";
 #elif defined(__hpux)
 	    failsafeArgv[i++] = "/usr/bin/X11/hpterm";
 #elif defined(__OpenBSD__)
@@ -1660,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");
@@ -1915,7 +1879,7 @@ RunGreeter( struct display *d, struct greet_info *greet,
     char	*p;
     char	**env;
     char	*path;
-    struct greet_state state = {};
+    struct greet_state state;
     int 	notify_dt;
     int		dupfp = -1;
     int		dupfp2 = -1;
@@ -2035,9 +1999,6 @@ RunGreeter( struct display *d, struct greet_info *greet,
 	    		
             if((path = getenv("NLSPATH")) != NULL)
                 env = setEnv(env, "NLSPATH", path);
-#ifdef __hp_osf
-	    env = setEnv(env, "NLSPATH", "/usr/lib/nls/msg/%L/%N.cat");
-#endif
 
 	    
 	    /*
@@ -2073,7 +2034,7 @@ RunGreeter( struct display *d, struct greet_info *greet,
                 language = d->language;
 #endif /* ENABLE_DYNAMIC_LANGLIST */
 
-	        if ( d->language && strlen(d->language) > 0 )
+	        if (env && d->language && strlen(d->language) > 0 )
 		  env = setLang(d, env, language);
 	    }
 
@@ -2085,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");