[packages/screen] fix bug introduced in aa2c6389

glen glen at pld-linux.org
Thu Jan 19 11:14:13 CET 2017


commit b997f4e7bb7b8656c4b66cd62e7698cbc4533b68
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Jan 19 12:09:25 2017 +0200

    fix bug introduced in aa2c6389
    
    http://git.savannah.gnu.org/cgit/screen.git/commit/?id=aa2c638997290a3edc4d1c98dd3e7a4f40599922

 screen-debian_fixed.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)
---
diff --git a/screen-debian_fixed.patch b/screen-debian_fixed.patch
index c37fe44..f09bb74 100644
--- 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;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/screen.git/commitdiff/46910f0d452a325a12e7f9caa7f884db0e22de8e



More information about the pld-cvs-commit mailing list