From 21cbdec02d8b4a0c6864f673d43b50965e0ec1b3 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 04 2015 15:49:59 +0000
Subject: import screen-4.1.0-0.22.20120314git3c2946.el7


---

diff --git a/SOURCES/screen-reattach.patch b/SOURCES/screen-reattach.patch
new file mode 100644
index 0000000..d309d1a
--- /dev/null
+++ b/SOURCES/screen-reattach.patch
@@ -0,0 +1,141 @@
+diff --git a/src/attacher.c b/src/attacher.c
+index 460f1ea..5982a93 100644
+--- a/src/attacher.c
++++ b/src/attacher.c
+@@ -133,6 +133,48 @@ struct msg *m;
+   return 0;
+ }
+ 
++int
++WriteOldMessage(struct msg *m)
++{
++  sleep(1); /* give the server some time to reopen the pipe */
++  if (m->type == MSG_ATTACH && (m->m.attach.detachfirst == MSG_ATTACH ||
++				m->m.attach.detachfirst == MSG_DETACH ||
++				m->m.attach.detachfirst == MSG_POW_DETACH))
++    {
++      struct old_msg old_m;
++      int s;
++      int r, l = sizeof(old_m);
++
++      s = MakeClientSocket(0);
++      if (s < 0)
++	return 0;
++      old_m.protocol_revision = (('m'<<24) | ('s'<<16) | ('g'<<8) | 2);
++      old_m.type = m->type;
++      memcpy(old_m.m_tty, m->m_tty, sizeof(old_m.m_tty));
++      memcpy(old_m.m.attach.auser, m->m.attach.auser, sizeof(old_m.m.attach.auser));
++      old_m.m.attach.apid = m->m.attach.apid;
++      old_m.m.attach.adaptflag = m->m.attach.adaptflag;
++      old_m.m.attach.lines = m->m.attach.lines;
++      old_m.m.attach.columns = m->m.attach.columns;
++      memcpy(old_m.m.attach.preselect, m->m.attach.preselect, sizeof(old_m.m.attach.preselect));
++      old_m.m.attach.esc = m->m.attach.esc;
++      old_m.m.attach.meta_esc = m->m.attach.meta_esc;
++      memcpy(old_m.m.attach.envterm, m->m.attach.envterm, sizeof(old_m.m.attach.envterm));
++      old_m.m.attach.encoding = m->m.attach.encoding;
++      while(l > 0)
++        {
++          r = write(s, (char *)&old_m + (sizeof(struct old_msg) - l), l);
++          if (r == -1 && errno == EINTR)
++    	continue;
++          if (r == -1 || r == 0)
++    	return -1;
++          l -= r;
++        }
++      close(s);
++    }
++  return 0;
++}
++
+ 
+ int
+ Attach(how)
+@@ -397,6 +439,7 @@ int how;
+   if (WriteMessage(lasts, &m))
+     Panic(errno, "WriteMessage");
+   close(lasts);
++  WriteOldMessage(&m);
+   debug1("Attach(%d): sent\n", m.type);
+ #ifdef MULTIUSER
+   if (multi && (how == MSG_ATTACH || how == MSG_CONT))
+diff --git a/src/screen.h b/src/screen.h
+index b95f8a2..fb4a8d4 100644
+--- a/src/screen.h
++++ b/src/screen.h
+@@ -240,6 +240,60 @@ struct msg
+     } m;
+ };
+ 
++struct old_msg
++{
++  int protocol_revision;	/* reduce harm done by incompatible messages */
++  int type;
++  char m_tty[MAXPATHLEN];	/* ttyname */
++  union
++    {
++      struct
++	{
++	  int lflag;
++	  int aflag;
++	  int flowflag;
++	  int hheight;		/* size of scrollback buffer */
++	  int nargs;
++	  char line[MAXPATHLEN];
++	  char dir[MAXPATHLEN];
++	  char screenterm[20];	/* is screen really "screen" ? */
++	}
++      create;
++      struct
++	{
++	  char auser[20 + 1];	/* username */
++	  int apid;		/* pid of frontend */
++	  int adaptflag;	/* adapt window size? */
++	  int lines, columns;	/* display size */
++	  char preselect[20];
++	  int esc;		/* his new escape character unless -1 */
++	  int meta_esc;		/* his new meta esc character unless -1 */
++	  char envterm[40 + 1];	/* terminal type */
++	  int encoding;		/* encoding of display */
++      int detachfirst;
++	}
++      attach;
++      struct 
++	{
++	  char duser[20 + 1];	/* username */
++	  int dpid;		/* pid of frontend */
++	}
++      detach;
++      struct 
++	{
++	  char auser[20 + 1];	/* username */
++	  int nargs;
++	  char cmd[MAXPATHLEN];	/* command */
++	  int apid;		/* pid of frontend */
++	  char preselect[20];
++      char writeback[MAXPATHLEN];
++	}
++      command;
++      char message[MAXPATHLEN * 2];
++    } m;
++};
++
++
+ /*
+  * And the signals the attacher receives from the backend
+  */
+diff --git a/src/socket.c b/src/socket.c
+index 32c5047..d5a3d74 100644
+--- a/src/socket.c
++++ b/src/socket.c
+@@ -1067,7 +1067,9 @@ ReceiveMsg()
+     }
+   if (left > 0)
+     {
+-      if (left != sizeof(m))
++      if (left == sizeof(struct msg) - sizeof(struct old_msg))
++	    ;/* old format message, ignore */
++      else if (left != sizeof(m))
+         Msg(0, "Message %d of %d bytes too small", left, (int)sizeof(m));
+       else
+ 	debug("No data on socket.\n");
diff --git a/SPECS/screen.spec b/SPECS/screen.spec
index 063dfed..b9a4b3a 100644
--- a/SPECS/screen.spec
+++ b/SPECS/screen.spec
@@ -4,7 +4,7 @@
 Summary: A screen manager that supports multiple logins on one terminal
 Name: screen
 Version: 4.1.0
-Release: 0.21.20120314git3c2946%{?dist}
+Release: 0.22.20120314git3c2946%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnu.org/software/screen
@@ -34,6 +34,7 @@ Patch9: screen-4.1.0-long-term.patch
 Patch10: screen-help-update.patch
 Patch11: screen-altscreen.patch
 Patch12: screen-fix-term.patch
+Patch13: screen-reattach.patch
 
 %description
 The screen utility allows you to have multiple logins on just one
@@ -59,6 +60,7 @@ support multiple logins on one terminal.
 %patch10 -p2 -b .help-update
 %patch11 -p2 -b .altscreen.patch
 %patch12 -p2 -b .fix-term
+%patch13 -p2 -b .cannot-reattach
 
 
 %build
@@ -155,6 +157,10 @@ fi
 %endif
 
 %changelog
+* Tue Jun 30 2015 Petr Hracek <phracek@redhat.com> - 4.1.0-0.22.20120314git3c2946
+- cannot reattach to screen sessions (regression 'LoginName to long')
+- Resolves: #1253697
+
 * Tue Jun 30 2015 Petr Hracek <phracek@redhat.com> - 4.1.0-0.21.20120314git3c2946
 - 'LoginName too long' with login name greater then 20 characters
 - Resolves: #1119794