rpms/gdm/devel gdm-2.19.1-security-tokens.patch, 1.7, 1.8 gdm.spec, 1.291, 1.292

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3585

Modified Files:
	gdm-2.19.1-security-tokens.patch gdm.spec 
Log Message:
- The previously mentioned typo didn't matter before because the
  compiled in default matched what the config file was supposed to
  say.  This commit restores matched default behavior (bug 301031)


gdm-2.19.1-security-tokens.patch:

Index: gdm-2.19.1-security-tokens.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-2.19.1-security-tokens.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gdm-2.19.1-security-tokens.patch	27 Sep 2007 16:39:14 -0000	1.7
+++ gdm-2.19.1-security-tokens.patch	27 Sep 2007 17:20:23 -0000	1.8
@@ -189,7 +189,7 @@
 +        goto out;
 +    }
 +
-+    if (!g_key_file_get_boolean (cfg, GDM_SECURITY_TOKENS_GROUP, GDM_SECURITY_TOKENS_KEY_ENABLED, NULL)) {
++    if (g_key_file_has_key (cfg, GDM_SECURITY_TOKENS_GROUP, GDM_SECURITY_TOKENS_KEY_ENABLED, NULL) && !g_key_file_get_boolean (cfg, GDM_SECURITY_TOKENS_GROUP, GDM_SECURITY_TOKENS_KEY_ENABLED, NULL)) {
 +
 +          gdm_debug ("security token support is not enabled");
 +          goto out;


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- gdm.spec	27 Sep 2007 16:39:14 -0000	1.291
+++ gdm.spec	27 Sep 2007 17:20:23 -0000	1.292
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -355,6 +355,11 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Thu Sep 27 2007 Ray Strode <rstrode at redhat.com> - 1:2.20.0-6
+- The previously mentioned typo didn't matter before because the
+  compiled in default matched what the config file was supposed to
+  say.  This commit restores matched default behavior (bug 301031)
+
 * Thu Sep 27 2007 Ray Strode <rstrode at redhat.com> - 1:2.20.0-5
 - Fix an apparent typo in the securitytokens.conf config file
   (bug 301031)