From 2055bc9a0abd96819229c8d15af8eb6b579c730c Mon Sep 17 00:00:00 2001
From: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Date: Sat, 19 Sep 2015 01:58:07 +0300
Subject: [PATCH 1/3] Fix parsability of shipped config file

Double hyphen inside of comment breaks xml.dom.minidom XML parser, which
is considered "not a bug" by mantainer: http://bugs.python.org/issue24197
---
 doc/pamusb.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/pamusb.conf b/doc/pamusb.conf
index 3a00875..0d46132 100644
--- a/doc/pamusb.conf
+++ b/doc/pamusb.conf
@@ -40,8 +40,8 @@ See http://www.pamusb.org/doc/configuring
 			<user id="scox">
 				<device>MyDevice</device>
 				<option name="quiet">true</option>
-				<agent event="lock">gnome-screensaver-command --lock</agent>
-				<agent event="unlock">gnome-screensaver-command --deactivate</agent>
+				<agent event="lock">gnome-screensaver-command -\-lock</agent>
+				<agent event="unlock">gnome-screensaver-command -\-deactivate</agent>
 			</user>
 
 			Configure user root to authenticate using MyDevice, but update one

From a8a346c1a0dfc1583ee7f3ca0ad7a4ff64a6b688 Mon Sep 17 00:00:00 2001
From: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Date: Sat, 19 Sep 2015 02:01:14 +0300
Subject: [PATCH 2/3] Invoke python version 2 explicitly for tools

Because it doesn't work with python3.
---
 tools/pamusb-agent | 2 +-
 tools/pamusb-conf  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/pamusb-agent b/tools/pamusb-agent
index 2a29d75..ffb6b3d 100755
--- a/tools/pamusb-agent
+++ b/tools/pamusb-agent
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
 #
diff --git a/tools/pamusb-conf b/tools/pamusb-conf
index 03678fc..c253fb2 100755
--- a/tools/pamusb-conf
+++ b/tools/pamusb-conf
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #
 # Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
 #

From 52c59e7ec6403f1488bcc50589265b90163477b5 Mon Sep 17 00:00:00 2001
From: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Date: Thu, 24 Sep 2015 03:28:46 +0300
Subject: [PATCH 3/3] Umount if failed?

---
 src/volume.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/volume.c b/src/volume.c
index 1b8fe86..c5a55e6 100644
--- a/src/volume.c
+++ b/src/volume.c
@@ -143,6 +143,7 @@ char *pusb_volume_get(t_pusb_options *opts, DBusConnection *dbus)
 	if (!mount_point)
 	{
 		log_error("Unable to retrieve %s mount point\n", volume_udi);
+		pusb_volume_destroy(mount_point);
 		return (NULL);
 	}
 	return (mount_point);