summaryrefslogtreecommitdiff
path: root/daemon
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2016-02-15 12:20:13 -0500
committerStef Walter <stefw@gnome.org>2016-02-15 19:45:32 +0100
commitc5da2060b1b6f7649463dacdfcb55dd6bee803af (patch)
tree0662e552fecdc7286adc2e56bc6c44d7b7cf27ec /daemon
parent324f2d2e1a7c7391c9b7d794265c07af7767dd95 (diff)
downloadgnome-keyring-c5da2060b1b6f7649463dacdfcb55dd6bee803af.tar.gz
Don't reject empty passwords for --unlock
gnome-initial-setup is creating a keyring by calling gnome-keyring-daemon --unlock. Since we don't have a password at that time yet, it passes "" as the password. Just accept this and create an unencrypted keyring. https://bugzilla.gnome.org/show_bug.cgi?id=762095
Diffstat (limited to 'daemon')
-rw-r--r--daemon/login/gkd-login.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/daemon/login/gkd-login.c b/daemon/login/gkd-login.c
index a79828bf..a189c5e9 100644
--- a/daemon/login/gkd-login.c
+++ b/daemon/login/gkd-login.c
@@ -273,8 +273,8 @@ gkd_login_unlock (const gchar *master)
GList *modules;
gboolean result;
- /* We don't support null or empty master passwords */
- if (!master || !master[0])
+ /* We don't support null as master password */
+ if (!master)
return FALSE;
modules = module_instances ();