Commit: 980506c2ffeaa6647ce953f691b35432023fcda2 - Farhan-openssh (git)

Farhan/openssh

Commit MetaInfo

• Révision: 980506c2ffeaa6647ce953f691b35432023fcda2 (tree)
• l'heure: 2018-08-13 11:41:32
• Auteur: elliott10 <xiaoluoyuan@163....>
• Commiter: elliott10

Message de Log

Fix the segmentation fault of ssh, and configure scp to make it work properly

Change Summary

• modified: config.h
• modified: misc.c

Modification

--- a/config.h
+++ b/config.h
@@ -1603,4 +1603,4 @@
 
 #define _PATH_PRIVSEP_CHROOT_DIR SSHDIR "/empty"
 
-#define _PATH_SSH_PROGRAM "/system/bin/sftp"
+#define _PATH_SSH_PROGRAM "/system/bin/ssh"

--- a/misc.c
+++ b/misc.c
@@ -208,7 +208,10 @@ pwcopy(struct passwd *pw)
 	struct passwd *copy = xcalloc(1, sizeof(*copy));
 
 	copy->pw_name = xstrdup(pw->pw_name);
-	copy->pw_passwd = xstrdup(pw->pw_passwd);
+	/* Android does not do passwords and passes NULL for them. This breaks strlen */
+	if (pw->pw_passwd) {
+		copy->pw_passwd = xstrdup(pw->pw_passwd);
+	}
 #ifdef HAVE_STRUCT_PASSWD_PW_GECOS
 	copy->pw_gecos = xstrdup(pw->pw_gecos);
 #endif