Attachment #251851 for bug #342527




    try{
        if(term) pam.setenv("TERM", term);
        pam.setenv("HOME", pw->pw_dir);
        pam.setenv("PWD", pw->pw_dir);
        pam.setenv("SHELL", pw->pw_shell);
        pam.setenv("USER", pw->pw_name);
        pam.setenv("LOGNAME", pw->pw_name);

        char** child_env = pam.getenvlist();
        pam.end();
#else
        const int Num_Of_Variables = 11; // Number of env. variables + 1
        char** child_env = static_cast<char**>(malloc(sizeof(char*)*Num_Of_Variables));
        int n = 0;
        if(term) child_env[n++]=StrConcat("TERM=", term);
        child_env[n++]=StrConcat("HOME=", pw->pw_dir);
        child_env[n++]=StrConcat("PWD=", pw->pw_dir);
        child_env[n++]=StrConcat("SHELL=", pw->pw_shell);
        child_env[n++]=StrConcat("USER=", pw->pw_name);
        child_env[n++]=StrConcat("LOGNAME=", pw->pw_name);

Return to bug 342527

Lines 542-547 Link Here

(-)slim-1.3.2.old/app.cpp (-1 / +3 lines)
542	try{	542	try{
543	if(term) pam.setenv("TERM", term);	543	if(term) pam.setenv("TERM", term);
544	pam.setenv("HOME", pw->pw_dir);	544	pam.setenv("HOME", pw->pw_dir);
		545	pam.setenv("PWD", pw->pw_dir);
545	pam.setenv("SHELL", pw->pw_shell);	546	pam.setenv("SHELL", pw->pw_shell);
546	pam.setenv("USER", pw->pw_name);	547	pam.setenv("USER", pw->pw_name);
547	pam.setenv("LOGNAME", pw->pw_name);	548	pam.setenv("LOGNAME", pw->pw_name);
Lines 565-575 Link Here
565	char** child_env = pam.getenvlist();	566	char** child_env = pam.getenvlist();
566	pam.end();	567	pam.end();
567	#else	568	#else
568	const int Num_Of_Variables = 10; // Number of env. variables + 1	569	const int Num_Of_Variables = 11; // Number of env. variables + 1
569	char child_env = static_cast<char>(malloc(sizeof(char)Num_Of_Variables));	570	char child_env = static_cast<char>(malloc(sizeof(char)Num_Of_Variables));
570	int n = 0;	571	int n = 0;
571	if(term) child_env[n++]=StrConcat("TERM=", term);	572	if(term) child_env[n++]=StrConcat("TERM=", term);
572	child_env[n++]=StrConcat("HOME=", pw->pw_dir);	573	child_env[n++]=StrConcat("HOME=", pw->pw_dir);
		574	child_env[n++]=StrConcat("PWD=", pw->pw_dir);
573	child_env[n++]=StrConcat("SHELL=", pw->pw_shell);	575	child_env[n++]=StrConcat("SHELL=", pw->pw_shell);
574	child_env[n++]=StrConcat("USER=", pw->pw_name);	576	child_env[n++]=StrConcat("USER=", pw->pw_name);
575	child_env[n++]=StrConcat("LOGNAME=", pw->pw_name);	577	child_env[n++]=StrConcat("LOGNAME=", pw->pw_name);