Merge it in here now.

When prompting for a passphrase that isn't for a key, don't give
the option to save the password for later use.

Before changing login keyring password or unlocking, check that daemon
is initialized.

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=632352

When the user's unix login password doesn't match their login keyring
(due to perhaps a change by an administrator) we need to prompt for
the password to unlock. Now we keep track of the old one that failed
and change their login keyring password to match their unix login.

On some systems this caused build problems.

Printing of prompt IO could conceivably contain information that's
sensitive. Added extra guard so the debug printing can only be
turned on with --enable-debug also enabled.

Thanks to Romain Françoise

Fix invalid memory access in gkm_rpc_mechanism_list_purge().

Pointed out by Tim Hudson.