sftp-server: Fix home-directory extension to match the specification

openssh · Mar 26, 2024 · 233414b · 233414b
1 parent edcff77
commit 233414b
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/sftp-server.c b/sftp-server.c
@@ -1706,14 +1706,16 @@ process_extended_home_directory(u_int32_t id)
  fatal_fr(r, "parse");
 
  debug3("request %u: home-directory \"%s\"", id, username);
- if ((user_pw = getpwnam(username)) == NULL) {
+ if (username[0] != '\0') {
+ user_pw = pw;
+ } else if ((user_pw = getpwnam(username)) == NULL) {
  send_status(id, SSH2_FX_FAILURE);
  goto out;
  }
 
- verbose("home-directory \"%s\"", pw->pw_dir);
+ verbose("home-directory \"%s\"", user_pw->pw_dir);
  attrib_clear(&s.attrib);
- s.name = s.long_name = pw->pw_dir;
+ s.name = s.long_name = user_pw->pw_dir;
  send_names(id, 1, &s);
  out:
  free(username);