summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-07-01 13:24:21 +1000
committerDamien Miller <djm@mindrot.org>2000-07-01 13:24:21 +1000
commit7b413d2d1702997152051a54dcda984e288eeea5 (patch)
tree8cd4bc0a9dd3d58ddbdcef3f43f3366400117856
parent8e81ed3081412b3525d6819216ec3eb3f8b65c7e (diff)
- (djm) Replace "/bin/sh" with _PATH_BSHELL
- (djm) Replace "/usr/bin/login" with LOGIN_PROGRAM
-rw-r--r--ChangeLog2
-rw-r--r--session.c10
-rw-r--r--sshconnect.c6
3 files changed, 10 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 06ed24d5..ad858a99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
20000701
- (djm) Fix Tru64 SIA problems reported by John P Speno <speno@isc.upenn.edu>
- (djm) Login fixes from Tom Bertelson <tbert@abac.com>
+ - (djm) Replace "/bin/sh" with _PATH_BSHELL
+ - (djm) Replace "/usr/bin/login" with LOGIN_PROGRAM
20000628
- (djm) Fixes to lastlog code for Irix
diff --git a/session.c b/session.c
index ca4a994e..29956777 100644
--- a/session.c
+++ b/session.c
@@ -1057,9 +1057,9 @@ do_child(const char *command, struct passwd * pw, const char *term,
if (!options.use_login) {
if (stat(SSH_USER_RC, &st) >= 0) {
if (debug_flag)
- fprintf(stderr, "Running /bin/sh %s\n", SSH_USER_RC);
+ fprintf(stderr, "Running "_PATH_BSHELL" %s\n", SSH_USER_RC);
- f = popen("/bin/sh " SSH_USER_RC, "w");
+ f = popen(_PATH_BSHELL " " SSH_USER_RC, "w");
if (f) {
if (auth_proto != NULL && auth_data != NULL)
fprintf(f, "%s %s\n", auth_proto, auth_data);
@@ -1068,9 +1068,9 @@ do_child(const char *command, struct passwd * pw, const char *term,
fprintf(stderr, "Could not run %s\n", SSH_USER_RC);
} else if (stat(SSH_SYSTEM_RC, &st) >= 0) {
if (debug_flag)
- fprintf(stderr, "Running /bin/sh %s\n", SSH_SYSTEM_RC);
+ fprintf(stderr, "Running "_PATH_BSHELL" %s\n", SSH_SYSTEM_RC);
- f = popen("/bin/sh " SSH_SYSTEM_RC, "w");
+ f = popen(_PATH_BSHELL " " SSH_SYSTEM_RC, "w");
if (f) {
if (auth_proto != NULL && auth_data != NULL)
fprintf(f, "%s %s\n", auth_proto, auth_data);
@@ -1160,7 +1160,7 @@ do_child(const char *command, struct passwd * pw, const char *term,
} else {
/* Launch login(1). */
- execl("/usr/bin/login", "login", "-h", get_remote_ipaddr(),
+ execl(LOGIN_PROGRAM, "login", "-h", get_remote_ipaddr(),
"-p", "-f", "--", pw->pw_name, NULL);
/* Login couldn't be executed, die. */
diff --git a/sshconnect.c b/sshconnect.c
index 835ca7b3..79b6856d 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -108,15 +108,15 @@ ssh_proxy_connect(const char *host, u_short port, uid_t original_real_uid,
/* Stderr is left as it is so that error messages get
printed on the user's terminal. */
- argv[0] = "/bin/sh";
+ argv[0] = _PATH_BSHELL;
argv[1] = "-c";
argv[2] = command_string;
argv[3] = NULL;
/* Execute the proxy command. Note that we gave up any
extra privileges above. */
- execv("/bin/sh", argv);
- perror("/bin/sh");
+ execv(_PATH_BSHELL, argv);
+ perror(_PATH_BSHELL);
exit(1);
}
/* Parent. */