- updated to 4.5.1

[packages/screen.git] / screen-debian_fixed.patch

diff --git a/screen-debian_fixed.patch b/screen-debian_fixed.patch
index f2495353c090545af15b01e20c226a48de8bcddf..4f31d0951a5d27c80b2acb99d29f4a8cc44186a2 100644 (file)
--- a/screen-debian_fixed.patch
+++ b/screen-debian_fixed.patch
@@ -117,12 +117,12 @@
  #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;
 -  for (; n < 13; n++) {
 +  else if (!strncmp(ppp->pw_passwd, "$1$", 3)) {       /* MD5-based passwords */
-+        n = 13;
-+        len = 34;
++    n = 13;
++    len = 34;
 +  }
 +  for (; n < len; n++) {
      char c = ppp->pw_passwd[n];
@@ -190,15 +190,3 @@
  }
  
  #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;