diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-09-30 04:10:30 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-09-30 04:10:30 +0000 |
| commit | d195ee786dbd0f0e6ca4819216ec7eed440b7750 (patch) | |
| tree | b47b371d8ef62228efbaf651a9759fd0b440012e /usr.bin/ssh/sshd.c | |
| parent | 3472125cd9054dc46444acd616e38e372d0e3a8c (diff) | |
rely on paths.h more
Diffstat (limited to 'usr.bin/ssh/sshd.c')
| -rw-r--r-- | usr.bin/ssh/sshd.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index 8f5583db89f..600c4879fb0 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -18,7 +18,7 @@ agent connections. */ #include "includes.h" -RCSID("$Id: sshd.c,v 1.8 1999/09/29 22:08:13 dugsong Exp $"); +RCSID("$Id: sshd.c,v 1.9 1999/09/30 04:10:29 deraadt Exp $"); #include "xmalloc.h" #include "rsa.h" @@ -47,20 +47,6 @@ int allow_severity = LOG_INFO; int deny_severity = LOG_WARNING; #endif /* LIBWRAP */ -#ifdef _PATH_BSHELL -#define DEFAULT_SHELL _PATH_BSHELL -#else -#define DEFAULT_SHELL "/bin/sh" -#endif - -#ifndef DEFAULT_PATH -#ifdef _PATH_USERPATH -#define DEFAULT_PATH _PATH_USERPATH -#else -#define DEFAULT_PATH "/bin:/usr/bin:/usr/ucb:/usr/bin/X11:/usr/local/bin" -#endif -#endif /* DEFAULT_PATH */ - #ifndef O_NOCTTY #define O_NOCTTY 0 #endif @@ -2004,7 +1990,7 @@ void read_etc_default_login(char ***env, unsigned int *envsize, if (def != NULL) child_set_env(env, envsize, "PATH", def); else - child_set_env(env, envsize, "PATH", DEFAULT_PATH); + child_set_env(env, envsize, "PATH", _PATH_STDPATH); /* Set TZ if TIMEZONE is defined and we haven't inherited a value for TZ. */ @@ -2123,7 +2109,7 @@ void do_child(const char *command, struct passwd *pw, const char *term, /* Get the shell from the password data. An empty shell field is legal, and means /bin/sh. */ - shell = (pw->pw_shell[0] == '\0') ? DEFAULT_SHELL : pw->pw_shell; + shell = (pw->pw_shell[0] == '\0') ? _PATH_BSHELL : pw->pw_shell; #ifdef AFS /* Try to get AFS tokens for the local cell. */ @@ -2147,7 +2133,7 @@ void do_child(const char *command, struct passwd *pw, const char *term, child_set_env(&env, &envsize, "USER", pw->pw_name); child_set_env(&env, &envsize, "LOGNAME", pw->pw_name); child_set_env(&env, &envsize, "HOME", pw->pw_dir); - child_set_env(&env, &envsize, "PATH", DEFAULT_PATH); + child_set_env(&env, &envsize, "PATH", _PATH_STDPATH); /* Let it inherit timezone if we have one. */ if (getenv("TZ")) |