Merge branch 'master' into debian

diff --git a/moonshot-dbus-launch b/moonshot-dbus-launch
index 6a44a9d..c91ec5c 100755 (executable)
--- a/moonshot-dbus-launch
+++ b/moonshot-dbus-launch
@@ -1,4 +1,5 @@
 #!/bin/sh
+mkdir ${HOME}/.cache 2>/dev/null
 eval `dbus-launch --sh-syntax`
 trap "kill $DBUS_SESSION_BUS_PID" hup pipe int term
 echo $DBUS_SESSION_BUS_ADDRESS

diff --git a/src/moonshot-server.vala b/src/moonshot-server.vala
index eb881d2..81fdccd 100644 (file)
--- a/src/moonshot-server.vala
+++ b/src/moonshot-server.vala
@@ -141,6 +141,8 @@ public class MoonshotServer : Object {
       idcard.display_name = display_name;
       idcard.username = user_name;
       idcard.password = password;
+      if ((password != null) && (password != ""))
+        idcard.store_password = true;
       idcard.issuer = realm;
       idcard.services = services;
       idcard.trust_anchor.ca_cert = ca_cert;