Attachment 98 Details for Bug 252 – description? ... the proposed patch itself :-)

[patch] description? ... the proposed patch itself :-)

etc_default_login.patch.3.2.2p1 (text/plain), 4.30 KB, created by Robert Dahlem on 2002-05-20 20:44:49 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Dahlem

Created: 2002-05-20 20:44:49 AEST

Size: 4.30 KB

patch

obsolete

>diff -u -r openssh-3.2.2p1.orig/acconfig.h openssh-3.2.2p1/acconfig.h
>--- openssh-3.2.2p1.orig/acconfig.h	Mon May 13 05:15:43 2002
>+++ openssh-3.2.2p1/acconfig.h	Sun May 19 15:25:32 2002
>@@ -322,6 +322,9 @@
> /* Define in your struct dirent expects you to allocate extra space for d_name */
> #undef BROKEN_ONE_BYTE_DIRENT_D_NAME
> 
>+/* Define if your system has /etc/default/login */
>+#undef HAVE_ETC_DEFAULT_LOGIN
>+
> /* Define if your getopt(3) defines and uses optreset */
> #undef HAVE_GETOPT_OPTRESET
> 
>diff -u -r openssh-3.2.2p1.orig/configure.ac openssh-3.2.2p1/configure.ac
>--- openssh-3.2.2p1.orig/configure.ac	Mon May 13 07:14:08 2002
>+++ openssh-3.2.2p1/configure.ac	Sun May 19 15:26:35 2002
>@@ -2361,6 +2361,15 @@
> fi
> 
> AC_EXEEXT
>+# check for /etc/default/login. On some systems (i.e. Solaris 2.x, ReliantUNIX)
>+# this file defines some environment variables to be set at login time
>+AC_CHECK_FILE("/etc/default/login",
>+	[
>+		AC_DEFINE_UNQUOTED(HAVE_ETC_DEFAULT_LOGIN)
>+		have_etc_default_login=1
>+	]
>+)
>+
> AC_CONFIG_FILES([Makefile openbsd-compat/Makefile scard/Makefile ssh_prng_cmds])
> AC_OUTPUT
> 
>diff -u -r openssh-3.2.2p1.orig/session.c openssh-3.2.2p1/session.c
>--- openssh-3.2.2p1.orig/session.c	Mon May 13 02:48:58 2002
>+++ openssh-3.2.2p1/session.c	Sun May 19 15:39:07 2002
>@@ -771,6 +771,27 @@
> }
> 
> /*
>+ * Returns the value of the given variable from the environment.
>+ * Returns NULL, if the variable is not found.
>+ */
>+static char *
>+child_get_env(char **envp, const char *name)
>+{
>+	u_int i, namelen;
>+
>+	namelen = strlen(name);
>+	for (i = 0; envp[i]; i++) {
>+		if (strncmp(envp[i], name, namelen) == 0 &&
>+		    envp[i][namelen] == '=')
>+			break;
>+	}
>+	if(envp[i])
>+		return &envp[i][namelen + 1];
>+	
>+	return NULL;
>+}
>+
>+/*
>  * Reads environment variables from the given file and adds/overrides them
>  * into the environment.  If the file does not exist, this does nothing.
>  * Otherwise, it must consist of empty lines, comments (line starts with '#')
>@@ -811,6 +832,55 @@
> 	fclose(f);
> }
> 
>+#ifdef HAVE_ETC_DEFAULT_LOGIN
>+/*
>+ * Read /etc/default/login
>+ * This file is found and processed by login(1) at least on Solaris
>+ * and ReliantUNIX.
>+ *
>+ * Get PATH environment variable from:
>+ *	PATH (for mere mortals)
>+ *	SUPATH (for root)
>+ * Get umask setting from UMASK
>+ *
>+ * XXX  There are other reasonable things to process in this file:
>+ *	i.e. ALTSHELL, CONSOLE, DISABLE_RHOSTS, HZ, IDLEWEEKS, ULIMIT
>+ *
>+ */
>+static void
>+read_etc_default_login(char ***env, u_int *envsize, uid_t uid)
>+{
>+	char **edf_env, *edf;
>+	u_int i, edf_envsize;
>+	mode_t mask;
>+
>+	/*
>+	 * We don't want to copy the whole file to the childs environment,
>+	 * so we use our own temporary environment here.
>+	 */
>+	edf_envsize = 10;
>+	edf_env = xmalloc(edf_envsize * sizeof(char *));
>+	edf_env[0] = NULL;
>+
>+	read_environment_file(&edf_env, &edf_envsize, "/etc/default/login");
>+
>+	if(uid)
>+		edf = child_get_env(edf_env, "PATH");
>+	else
>+		edf = child_get_env(edf_env, "SUPATH");
>+	if(edf != NULL)
>+		child_set_env(env, envsize, "PATH", edf);
>+	
>+	if((edf = child_get_env(edf_env, "UMASK")) != NULL)
>+		if (sscanf(edf, "%o", &mask) == 1)
>+			umask(mask);
>+	
>+	for(i = 0; edf_env[i]; i++)
>+		xfree(edf_env[i]);
>+	xfree(edf_env);
>+}
>+#endif /* HAVE_ETC_DEFAULT_LOGIN */
>+
> void copy_environment(char **source, char ***env, u_int *envsize)
> {
> 	char *var_name, *var_val;
>@@ -871,15 +941,25 @@
> 		 * needed for loading shared libraries. So the path better
> 		 * remains intact here.
> 		 */
>-#  ifdef SUPERUSER_PATH
>-		child_set_env(&env, &envsize, "PATH", 
>-		    s->pw->pw_uid == 0 ? SUPERUSER_PATH : _PATH_STDPATH);
>-#  else 
>-		child_set_env(&env, &envsize, "PATH", _PATH_STDPATH);
>-#  endif /* SUPERUSER_PATH */
>+#  ifdef HAVE_ETC_DEFAULT_LOGIN
>+		read_etc_default_login(&env, &envsize, pw->pw_uid);
>+#  endif /* HAVE_ETC_DEFAULT_LOGIN */
> # endif /* HAVE_CYGWIN */
> #endif /* HAVE_LOGIN_CAP */
> 
>+		/*
>+		 * Paranoia check: set at least a standard path
>+		 * if none is set yet.
>+		 */
>+		if(child_get_env(env, "PATH") == NULL) {
>+#ifdef SUPERUSER_PATH
>+			child_set_env(&env, &envsize, "PATH", 
>+			    s->pw->pw_uid == 0 ?
>+				SUPERUSER_PATH : _PATH_STDPATH);
>+#else 
>+			child_set_env(&env, &envsize, "PATH", _PATH_STDPATH);
>+#endif /* SUPERUSER_PATH */
>+		}
> 		snprintf(buf, sizeof buf, "%.200s/%.50s",
> 			 _PATH_MAILDIR, pw->pw_name);
> 		child_set_env(&env, &envsize, "MAIL", buf);

Actions: View | Diff

Attachments on bug 252: 98 | 212 | 367 | 378 | 397 | 398