rpms/pam_mount/devel pam_mount-0.41-missing_initialization_or.patch, NONE, 1.1 pam_mount.spec, 1.36, 1.37

[Till Maas (till)]

Author: till

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

Modified Files:
	pam_mount.spec 
Added Files:
	pam_mount-0.41-missing_initialization_or.patch 
Log Message:
* Mon Jun 23 2008 Till Maas <opensource at till.name> - 0.41-2
- Add patch to fix <or> handling in config file, reference:
  Red Hat Bugzilla #448485 comment 9
  http://sourceforge.net/tracker/index.php?func=detail&aid=1974442&group_id=41452&atid=430593
  comment from 2008-06-19 10:29


pam_mount-0.41-missing_initialization_or.patch:

--- NEW FILE pam_mount-0.41-missing_initialization_or.patch ---
X-Git-Url: http://dev.medozas.de/gitweb.cgi?p=pam_mount;a=blobdiff_plain;f=src%2Frdconf1.c;h=593ae9dd68f159be374a43a8eda706f1f40897a2;hp=e743d48232695b6e1b4a7b9b4edb2793d1b87fab;hb=3760bbe48ae89398d5ee895034e9ee7cf3cd0d84;hpb=464d1c0a1b9e0f2f696ae423c91ddfaf9797bac6

diff --git a/src/rdconf1.c b/src/rdconf1.c
index e743d48..593ae9d 100644
--- a/src/rdconf1.c
+++ b/src/rdconf1.c
@@ -729,7 +729,7 @@ static int rc_volume_cond_and(const struct passwd *pwd, xmlNode *node)
  */
 static int rc_volume_cond_or(const struct passwd *pwd, xmlNode *node)
 {
-	unsigned int count;
+	unsigned int count = 0;
 	int ret;
 
 	for (node = node->children; node != NULL; node = node->next) {
@@ -794,7 +794,7 @@ static int rc_volume_cond_xor(const struct passwd *pwd, xmlNode *node)
 static int rc_volume_cond_not(const struct passwd *pwd, xmlNode *node)
 {
 	unsigned int count = 0;
-	bool ret;
+	bool ret = true;
 
 	for (node = node->children; node != NULL; node = node->next) {
 		if (node->type != XML_ELEMENT_NODE)


Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- pam_mount.spec	17 Jun 2008 09:38:46 -0000	1.36
+++ pam_mount.spec	23 Jun 2008 12:23:02 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           pam_mount
 Version:        0.41
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
 Group:          System Environment/Base
@@ -8,6 +8,9 @@
 License:        LGPLv2+ and GPLv2+
 URL:            http://pam-mount.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.bz2
+# from Upstream:
+# http://dev.medozas.de/gitweb.cgi?p=pam_mount;a=blobdiff;f=src/rdconf1.c;h=593ae9dd68f159be374a43a8eda706f1f40897a2;hp=e743d48232695b6e1b4a7b9b4edb2793d1b87fab;hb=3760bbe48ae89398d5ee895034e9ee7cf3cd0d84;hpb=464d1c0a1b9e0f2f696ae423c91ddfaf9797bac6
+Patch0:         pam_mount-0.41-missing_initialization_or.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel, pam-devel, openssl-devel
@@ -40,6 +43,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .missing_initialization_or
 
 
 %build
@@ -90,6 +94,12 @@
 
 
 %changelog
+* Mon Jun 23 2008 Till Maas <opensource at till.name> - 0.41-2
+- Add patch to fix <or> handling in config file, reference:
+  Red Hat Bugzilla #448485 comment 9
+  http://sourceforge.net/tracker/index.php?func=detail&aid=1974442&group_id=41452&atid=430593
+  comment from 2008-06-19 10:29
+
 * Tue Jun 17 2008 Till Maas <opensource till name> - 0.41-1
 - Update to new version