OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pam_mount?expand=0&rev=21

pam_mount-0.47-fix-replace-options.dif

@@ -0,0 +1,32 @@
+--- src/mount.c
++++ src/mount.c	2008/10/13 14:19:40
+@@ -785,6 +785,7 @@
+ {
+ 	const struct HXdeque_node *n;
+ 	struct HXdeque *argv;
++	struct HXdeque *argv2;
+ 	hmc_t *ll_password = NULL;
+ 	int child_exit = 0, cstdin = -1, cstderr = -1;
+ 	const char *mount_user;
+@@ -847,13 +848,20 @@
+ 
+ 	if ((argv = HXdeque_init()) == NULL)
+ 		misc_log("malloc: %s\n", strerror(errno));
++	if ((argv2 = HXdeque_init()) == NULL)
++		misc_log("malloc: %s\n", strerror(errno));
+ 	if (vpt->uses_ssh)
+ 		for (n = config->command[CMD_FD0SSH]->first;
+ 		     n != NULL; n = n->next)
+ 			arglist_add(argv, n->ptr, vinfo);
+ 
+ 	for (n = config->command[vpt->type]->first; n != NULL; n = n->next)
+-		arglist_add(argv, n->ptr, vinfo);
++		arglist_add(argv2, n->ptr, vinfo);
++        /* 
++	 * do a replacement a second time to catch also variables
++	 * specified in the options of a volume
++	 */
++        argv = arglist_build(argv2, vinfo);
+ 
+ 	if (vpt->type == CMD_LCLMOUNT &&
+ 	    !check_filesystem(config, vpt, vinfo, ll_password))

pam_mount.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 13 16:21:01 CEST 2008 - mc@suse.de
+
+- replace also options which are specified in a volume
+  (bnc#433845) 
+
 -------------------------------------------------------------------
 Thu Sep 25 14:59:05 CEST 2008 - mc@suse.de
 

pam_mount.spec

@@ -23,7 +23,7 @@ BuildRequires:  libHX-devel libxml2-devel lzma openssl-devel pam-devel perl-XML-
 BuildRequires:  linux-kernel-headers
 Summary:        A PAM Module that can Mount Volumes for a User Session
 Version:        0.47
-Release:        8
+Release:        9
 # psmisc: /bin/fuser
 Recommends:     cifs-mount psmisc
 Recommends:     cryptsetup
@@ -34,6 +34,7 @@ Group:          System/Libraries
 Source:         %{name}-%{version}.tar.lzma
 Patch1:         pam_mount-0.45-umount-home-dir.dif
 Patch2:         pam_mount-0.47-fix-decrypt-key.dif
+Patch3:         pam_mount-0.47-fix-replace-options.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://pam-mount.sourceforge.net/
 PreReq:         coreutils, perl-XML-Writer
@@ -71,6 +72,7 @@ include it and send me patches.
 %setup -q
 %patch1
 %patch2
+%patch3
 
 %build
 %{suse_update_config -f}
@@ -130,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man8/umount.crypt.8.gz
 
 %changelog
+* Mon Oct 13 2008 mc@suse.de
+- replace also options which are specified in a volume
+  (bnc#433845)
 * Thu Sep 25 2008 mc@suse.de
 - fix reading the key from harddisk.
 - using losteup command directly (bnc#427343)