LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File 40e1b19511a1b0c17f0fbf4f6e6e47f209aee1c4.diff of Package pam_mount.3055 (Project DISCONTINUED:openSUSE:11.3:Update)

commit 40e1b19511a1b0c17f0fbf4f6e6e47f209aee1c4
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Fri May 14 17:18:13 2010 +0200

    rdconf: do not warn about missing fskeyhash when no fskey specified
    
    References: http://bugs.debian.org/580430

Index: pam_mount-1.34/doc/changelog.txt
===================================================================
--- pam_mount-1.34.orig/doc/changelog.txt
+++ pam_mount-1.34/doc/changelog.txt
@@ -4,6 +4,11 @@ For details, see the history as recorded
 HEAD
 ====
 
+v2.2 (May 16 2010) only the fix to rdconf
+==================
+Fixes:
+- rdconf: do not warn about missing fskeyhash when no fskey specified
+
 
 v1.34 (April 08 2009)
 =====================
Index: pam_mount-1.34/src/rdconf1.c
===================================================================
--- pam_mount-1.34.orig/src/rdconf1.c
+++ pam_mount-1.34/src/rdconf1.c
@@ -1313,6 +1313,10 @@ static const char *rc_volume(xmlNode *no
 		free(vpt->cipher);
 		vpt->cipher = tmp;
 	}
+	if ((tmp = xml_getprop(node, "fskeypath")) != NULL) {
+		free(vpt->fs_key_path);
+		vpt->fs_key_path = tmp;
+	}
 	if ((tmp = xml_getprop(node, "fskeycipher")) != NULL) {
 		free(vpt->fs_key_cipher);
 		vpt->fs_key_cipher = tmp;
@@ -1320,15 +1324,11 @@ static const char *rc_volume(xmlNode *no
 	if ((tmp = xml_getprop(node, "fskeyhash")) != NULL) {
 		free(vpt->fs_key_hash);
 		vpt->fs_key_hash = tmp;
-	} else {
+	} else if (vpt->fs_key_path != NULL) {
 		l0g("Volume %s: consider specifying the fskeyhash\n",
 		    (vpt->volume != NULL) ? vpt->volume : "(null)");
 		vpt->fs_key_hash = HX_strdup("md5");
 	}
-	if ((tmp = xml_getprop(node, "fskeypath")) != NULL) {
-		free(vpt->fs_key_path);
-		vpt->fs_key_path = tmp;
-	}
 
 	if (fstype_nodev(vpt->fstype) == 1 && vpt->volume == NULL)
 		vpt->volume = xstrdup("none");