X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/b51259f6a879f69bec5348bddb604d9b3d499941..d2c2927496535d8d67042980001fadede5e19b99:/unix/uxplink.c

diff --git a/unix/uxplink.c b/unix/uxplink.c
index e8b616eb..16919337 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -74,48 +74,11 @@ static Config cfg;
 char *platform_default_s(const char *name)
 {
     if (!strcmp(name, "X11Display"))
-	return getenv("DISPLAY");
+	return dupstr(getenv("DISPLAY"));
     if (!strcmp(name, "TermType"))
-	return getenv("TERM");
-    if (!strcmp(name, "UserName")) {
-	/*
-	 * Remote login username will default to the local username.
-	 */
-	struct passwd *p;
-	uid_t uid = getuid();
-	char *user, *ret = NULL;
-
-	/*
-	 * First, find who we think we are using getlogin. If this
-	 * agrees with our uid, we'll go along with it. This should
-	 * allow sharing of uids between several login names whilst
-	 * coping correctly with people who have su'ed.
-	 */
-	user = getlogin();
-	setpwent();
-	if (user)
-	    p = getpwnam(user);
-	else
-	    p = NULL;
-	if (p && p->pw_uid == uid) {
-	    /*
-	     * The result of getlogin() really does correspond to
-	     * our uid. Fine.
-	     */
-	    ret = user;
-	} else {
-	    /*
-	     * If that didn't work, for whatever reason, we'll do
-	     * the simpler version: look up our uid in the password
-	     * file and map it straight to a name.
-	     */
-	    p = getpwuid(uid);
-	    ret = p->pw_name;
-	}
-	endpwent();
-
-	return ret;
-    }
+	return dupstr(getenv("TERM"));
+    if (!strcmp(name, "UserName"))
+	return get_username();
     return NULL;
 }
 
@@ -207,8 +170,6 @@ int from_backend(void *frontend_handle, int is_stderr,
 {
     int osize, esize;
 
-    assert(len > 0);
-
     if (is_stderr) {
 	bufchain_add(&stderr_data, data, len);
 	try_output(1);
@@ -257,17 +218,19 @@ static void usage(void)
     printf("  -batch    disable all interactive prompts\n");
     printf("The following options only apply to SSH connections:\n");
     printf("  -pw passw login with specified password\n");
-    printf("  -D listen-port   Dynamic SOCKS-based port forwarding\n");
-    printf("  -L listen-port:host:port   Forward local port to "
-	   "remote address\n");
-    printf("  -R listen-port:host:port   Forward remote port to"
-	   " local address\n");
+    printf("  -D [listen-IP:]listen-port\n");
+    printf("            Dynamic SOCKS-based port forwarding\n");
+    printf("  -L [listen-IP:]listen-port:host:port\n");
+    printf("            Forward local port to remote address\n");
+    printf("  -R [listen-IP:]listen-port:host:port\n");
+    printf("            Forward remote port to local address\n");
     printf("  -X -x     enable / disable X11 forwarding\n");
     printf("  -A -a     enable / disable agent forwarding\n");
     printf("  -t -T     enable / disable pty allocation\n");
     printf("  -1 -2     force use of particular protocol version\n");
     printf("  -C        enable compression\n");
     printf("  -i key    private key file for authentication\n");
+    printf("  -s        remote command is an SSH subsystem (SSH-2 only)\n");
     exit(1);
 }
 
@@ -281,6 +244,7 @@ int main(int argc, char **argv)
     int connopen;
     int exitcode;
     int errors;
+    int use_subsystem = 0;
     void *ldisc, *logctx;
 
     ssh_get_line = console_get_line;
@@ -334,6 +298,9 @@ int main(int argc, char **argv)
 		continue;
 	    } else if (!strcmp(p, "-batch")) {
 		console_batch_mode = 1;
+	    } else if (!strcmp(p, "-s")) {
+                /* Save status to write to cfg later. */
+		use_subsystem = 1;
 	    } else if (!strcmp(p, "-o")) {
                 if (argc <= 1) {
                     fprintf(stderr,
@@ -504,6 +471,12 @@ int main(int argc, char **argv)
     cmdline_run_saved(&cfg);
 
     /*
+     * Apply subsystem status.
+     */
+    if (use_subsystem)
+        cfg.ssh_subsys = TRUE;
+
+    /*
      * Trim a colon suffix off the hostname if it's there.
      */
     cfg.host[strcspn(cfg.host, ":")] = '\0';