rpms/gdm/devel gdm-2.16.0-security-tokens.patch, 1.5, 1.6 gdm.spec, 1.199, 1.200

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21585

Modified Files:
	gdm-2.16.0-security-tokens.patch gdm.spec 
Log Message:
- fix a problem recently introduced in the smart card forking
  code


gdm-2.16.0-security-tokens.patch:
 config/Makefile.am            |   31 
 config/gdm.conf.in            |    4 
 config/securitytokens.conf.in |    3 
 configure.ac                  |    3 
 daemon/Makefile.am            |    7 
 daemon/gdm.c                  |   93 ++
 daemon/securitytoken.c        |  580 +++++++++++++++
 daemon/securitytoken.h        |   91 ++
 daemon/securitytokenmonitor.c | 1623 ++++++++++++++++++++++++++++++++++++++++++
 daemon/securitytokenmonitor.h |   84 ++
 10 files changed, 2514 insertions(+), 5 deletions(-)

Index: gdm-2.16.0-security-tokens.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.16.0-security-tokens.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gdm-2.16.0-security-tokens.patch	18 Sep 2006 17:36:39 -0000	1.5
+++ gdm-2.16.0-security-tokens.patch	18 Sep 2006 19:29:26 -0000	1.6
@@ -1,4 +1,4 @@
---- /dev/null	2006-09-18 09:23:19.303978694 -0400
+--- /dev/null	2006-09-18 14:45:43.343998235 -0400
 +++ gdm-2.16.0/config/securitytokens.conf.in	2006-09-15 17:50:02.000000000 -0400
 @@ -0,0 +1,3 @@
 +[SecurityTokens]
@@ -99,9 +99,9 @@
  AC_SUBST(DAEMON_CFLAGS)
  AC_SUBST(DAEMON_LIBS)
  
---- /dev/null	2006-09-18 09:23:19.303978694 -0400
-+++ gdm-2.16.0/daemon/securitytokenmonitor.c	2006-09-18 13:35:13.000000000 -0400
-@@ -0,0 +1,1617 @@
+--- /dev/null	2006-09-18 14:45:43.343998235 -0400
++++ gdm-2.16.0/daemon/securitytokenmonitor.c	2006-09-18 15:28:20.000000000 -0400
+@@ -0,0 +1,1623 @@
 +/* securitytokenmonitor.c - monitor for security token insertion and
 + *                          removal events
 + * 
@@ -700,8 +700,13 @@
 +	    /* otherwise write out the pid of the child and exit
 +	     */
 +	    if (child_pid != 0) {
-+		    if (!sc_write_bytes (input_fd, &child_pid, sizeof (child_pid)))
++
++		    signal (SIGPIPE, SIG_IGN);
++
++		    if (!sc_write_bytes (input_fd, &child_pid, sizeof (child_pid))) {
++			    kill (SIGKILL, child_pid);
 +			    _exit (2);
++		    }
 +		    close (input_fd);
 +		    _exit (0);
 +	    }
@@ -716,14 +721,15 @@
 +
 +    /* close the end of the pipe we're not going to use
 +     */
-+    close (output_fd);
++    close (input_fd);
 +
 +    grandchild_pid = -1;
 +    if (!sc_read_bytes (output_fd, &grandchild_pid, sizeof (grandchild_pid))) {
 +	    grandchild_pid = -1;
-+	    saved_errno = errno;
 +    }
 +
++    saved_errno = errno;
++
 +    /* close the other end of the pipe since we're done with it
 +     */
 +    close (output_fd);
@@ -1719,7 +1725,7 @@
 +    return 0;
 +}
 +#endif
---- /dev/null	2006-09-18 09:23:19.303978694 -0400
+--- /dev/null	2006-09-18 14:45:43.343998235 -0400
 +++ gdm-2.16.0/daemon/securitytoken.h	2006-09-15 17:50:02.000000000 -0400
 @@ -0,0 +1,91 @@
 +/* securitytoken.h - api for reading and writing data to a security token 
@@ -1813,7 +1819,7 @@
 +
 +G_END_DECLS
 +#endif				/* SC_SECURITY_TOKEN_H */
---- /dev/null	2006-09-18 09:23:19.303978694 -0400
+--- /dev/null	2006-09-18 14:45:43.343998235 -0400
 +++ gdm-2.16.0/daemon/securitytoken.c	2006-09-15 17:50:02.000000000 -0400
 @@ -0,0 +1,580 @@
 +/* securitytoken.c - security token
@@ -2561,7 +2567,7 @@
 +    ve_config_destroy (cfg);
 +}
  /* EOF */
---- /dev/null	2006-09-18 09:23:19.303978694 -0400
+--- /dev/null	2006-09-18 14:45:43.343998235 -0400
 +++ gdm-2.16.0/daemon/securitytokenmonitor.h	2006-09-15 17:50:02.000000000 -0400
 @@ -0,0 +1,84 @@
 +/* securitytokenmonitor.h - monitor for security token insertion and


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- gdm.spec	18 Sep 2006 17:36:40 -0000	1.199
+++ gdm.spec	18 Sep 2006 19:29:26 -0000	1.200
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.16.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -301,6 +301,10 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Mon Sep 18 2006 Ray Strode <rstrode at redhat.com> - 1:2.16.0-7.fc6
+- fix a problem recently introduced in the smart card forking
+  code
+
 * Mon Sep 18 2006 Ray Strode <rstrode at redhat.com> - 1:2.16.0-6.fc6
 - fix a problem recently introduced in the smart card driver
   loading code (bug 206882)