X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cde%2Fprograms%2Fdtlogin%2Fsession.c;h=c5b587fe2e15de995db7ab3d52946dbaf7436220;hb=419a7efff4541e7327bc1c4e28c4d8f16fb81035;hp=9a42844737f8f62f0cf4b8aa6723c4a205c404f0;hpb=1de5d477c998bcd91f438f95db877be97aa4ae81;p=oweals%2Fcde.git diff --git a/cde/programs/dtlogin/session.c b/cde/programs/dtlogin/session.c index 9a428447..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); @@ -644,8 +639,6 @@ int LoadXloginResources( struct display *d ) { char cmd[1024]; - char *language = NULL; - char *lang_key=""; char *authority=""; char *auth_key=""; char *resources = NULL; @@ -675,27 +668,6 @@ LoadXloginResources( struct display *d ) auth_key = "XAUTHORITY="; } - if (d->language && strlen(d->language) > 0 ) { - language = strdup(d->language); - lang_key = "-D"; - } - - /* - * replace any "-" or "." in the language name with "_". The C - * preprocessor used by xrdb does not accept "-" or "." in a name. - */ - - while ( (p = strchr(language, '-')) != NULL ) { - *p = '_'; - } - - while ( (p = strchr(language, '.')) != NULL ) { - *p = '_'; - } - - free(language); - - Debug("LoadXloginResources - loading resource db from %s\n", resources); if((XresourceDB = XrmGetFileDatabase(resources)) == NULL) Debug("LoadXloginResources - Loading resource db from %s failed\n", @@ -762,7 +734,7 @@ LoadAltDtsResources(struct display *d) if ( XrmGetResource(XresourceDB, "Dtlogin*altDts", "Dtlogin*AltDts", &rmtype, &rmvalue ) ) { - strcpy(tempbuf,rmvalue.addr); + snprintf(tempbuf, sizeof(tempbuf), "%s", rmvalue.addr); i = atoi(tempbuf); } @@ -777,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) @@ -790,18 +759,15 @@ LoadAltDtsResources(struct display *d) Debug("\t %s.\n", strerror(errno)); } else - strcpy(dirname[j], resources); + snprintf(dirname[j], sizeof(dirname[j]), "%s", resources); } else { - strcpy(dirname[j],resources); + snprintf(dirname[j], sizeof(dirname[j]), "%s", resources); Debug("LoadAltDtsResources- found resource dir %s\n", dirname[j]); } - if (resources) - { - free (resources); - resources = NULL; - } + free (resources); + resources = NULL; } @@ -833,13 +799,13 @@ LoadAltDtsResources(struct display *d) } if (file_count == 0) { - file_list = malloc (list_incr * sizeof(char **)); + file_list = malloc (list_incr * sizeof(char *)); num_allocated += list_incr; } if (file_count + 1 > num_allocated) { num_allocated += list_incr; file_list = realloc (file_list, - num_allocated * sizeof(char **)); + num_allocated * sizeof(char *)); } file_list[file_count] = strdup (res_file); file_count++; @@ -864,9 +830,9 @@ LoadAltDtsResources(struct display *d) * remove the trailing spaces */ if(strchr(rmvalue.addr,' ')) - strcpy(tempbuf, strtok(rmvalue.addr," ")); + snprintf(tempbuf, sizeof(tempbuf), "%s", strtok(rmvalue.addr," ")); else - strcpy(tempbuf, rmvalue.addr); + snprintf(tempbuf, sizeof(tempbuf), "%s", rmvalue.addr); if ((strcmp(tempbuf, "True") == 0) || (strcmp(tempbuf, "TRUE") == 0)) { @@ -1174,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) @@ -1447,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) ) { @@ -1513,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); @@ -1554,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 */ @@ -1654,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__) @@ -1686,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"); @@ -1941,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; @@ -2061,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 /* @@ -2088,7 +2023,7 @@ RunGreeter( struct display *d, struct greet_info *greet, if ( d->langList && strlen(d->langList) > 0 ) env = setEnv(env, LANGLIST, d->langList); #if !defined (ENABLE_DYNAMIC_LANGLIST) - else if (languageList && strlen(languageList) > 0 ) + else if (strlen(languageList) > 0 ) env = setEnv(env, LANGLIST, languageList); #endif /* ENABLE_DYNAMIC_LANGLIST */ @@ -2099,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); } @@ -2111,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"); @@ -2152,7 +2078,7 @@ RunGreeter( struct display *d, struct greet_info *greet, * figure out path to dtgreet... */ - strcpy(msg, progName); + snprintf(msg, sizeof(msg), "%s", progName); if ((p = (char *) strrchr(msg, '/')) == NULL) strcpy(msg,"./");