[openssh-commits] [openssh] 02/02: upstream: revert bits that weren't ready for commit yet

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 23a7c4d1284694f9973ebdae7884cd25d33e5cf8
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Mon Jun 29 23:00:00 2026 +0000

    upstream: revert bits that weren't ready for commit yet
    
    OpenBSD-Commit-ID: ee8a219f02db32778444356ad2d93b983a38a704
---
 sftp.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/sftp.c b/sftp.c
index 838f9b862..db23a578e 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.254 2026/06/29 22:56:44 djm Exp $ */
+/* $OpenBSD: sftp.c,v 1.255 2026/06/29 23:00:00 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm at openbsd.org>
  *
@@ -327,6 +327,7 @@ local_do_shell(const char *args)
 		fatal("Couldn't fork: %s", strerror(errno));
 
 	if (pid == 0) {
+		/* XXX: child has pipe fds to ssh subproc open - issue? */
 		if (args) {
 			debug3("Executing %s -c \"%s\"", shell, args);
 			execl(shell, shell, "-c", args, (char *)NULL);
@@ -901,12 +902,12 @@ do_ls_dir(struct sftp_conn *conn, const char *path,
 				struct stat sb;
 				const char *user = NULL, *group = NULL;
 
-				memset(&sb, 0, sizeof(sb));
-				attrib_to_stat(&d[n]->a, &sb);
 				if ((lflag & LS_NUMERIC_VIEW) == 0) {
 					user = ruser_name(sb.st_uid);
 					group = rgroup_name(sb.st_gid);
 				}
+				memset(&sb, 0, sizeof(sb));
+				attrib_to_stat(&d[n]->a, &sb);
 				lname = ls_file(fname, &sb, 1,
 				    (lflag & LS_SI_UNITS), user, group);
 				mprintf("%s\n", lname);
@@ -2403,8 +2404,6 @@ connect_to_server(char *path, char **args, int *in, int *out)
 	*in = *out = inout[0];
 	c_in = c_out = inout[1];
 #endif /* USE_PIPES */
-	FD_CLOSEONEXEC(*in);
-	FD_CLOSEONEXEC(*out);
 
 	if ((sshpid = fork()) == -1)
 		fatal("fork: %s", strerror(errno));

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.