fix bug introduced in aa2c6389

http://git.savannah.gnu.org/cgit/screen.git/commit/?id=aa2c638997290a3edc4d1c98dd3e7a4f40599922

diff --git a/screen-debian_fixed.patch b/screen-debian_fixed.patch
index c37fe44a1c2bc9833d37122ee42eed7d9d3fd772..f09bb744cdade27e5513a9835cf4ac3cd36d479f 100644 (file)
--- a/screen-debian_fixed.patch
+++ b/screen-debian_fixed.patch
@@ -190,3 +190,15 @@
  }
  
  #endif /* PSEUDOS */
+# fix bug introduced in http://git.savannah.gnu.org/cgit/screen.git/commit/?id=aa2c638997290a3edc4d1c98dd3e7a4f40599922
+--- screen-4.5.0/screen.c~     2017-01-19 12:10:38.000000000 +0200
++++ screen-4.5.0/screen.c      2017-01-19 12:10:56.279887885 +0200
+@@ -304,7 +304,7 @@
+ #endif
+   n = 0;
+   len = 13;
+-  if (ppp->pw_passwd[0] == '#' && ppp->pw_passwd[1] == '#' & strcmp(ppp->pw_passwd + 2, ppp->pw_name) == 0)
++  if (ppp->pw_passwd[0] == '#' && ppp->pw_passwd[1] == '#' && strcmp(ppp->pw_passwd + 2, ppp->pw_name) == 0)
+     n = 13;
+   else if (!strncmp(ppp->pw_passwd, "$1$", 3)) {       /* MD5-based passwords */
+         n = 13;