diff options
| author | Stefan Walter <stefw@src.gnome.org> | 2008-09-10 04:03:00 +0000 |
|---|---|---|
| committer | Stefan Walter <stefw@src.gnome.org> | 2008-09-10 04:03:00 +0000 |
| commit | 6513ab0f0777f048956e330df507f1474f343815 (patch) | |
| tree | c77e7ab09c7a32741a6e8fe35910192bee8f0bf8 | |
| parent | 1db4935d8cb9c17c7b86e8efe238910bd8b5a6ae (diff) | |
| download | gnome-keyring-6513ab0f0777f048956e330df507f1474f343815.tar.gz | |
When prompting for a password on import, don't go into an endless loop for
* daemon/gkr-pk-import.c: When prompting for a password on
import, don't go into an endless loop for blank passwords.
svn path=/trunk/; revision=1315
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | daemon/pk/gkr-pk-import.c | 1 |
2 files changed, 6 insertions, 0 deletions
@@ -1,5 +1,10 @@ 2008-09-09 Stef Walter <stef@memberwebs.com> + * daemon/gkr-pk-import.c: When prompting for a password on + import, don't go into an endless loop for blank passwords. + +2008-09-09 Stef Walter <stef@memberwebs.com> + * daemon/keyrings/gkr-keyring-item.c: Fix bugs when cloning a keyring item to be part of another keyring. This fixes issues with items in PK indexes overwriting each other. diff --git a/daemon/pk/gkr-pk-import.c b/daemon/pk/gkr-pk-import.c index 6ef96711..0f2b7e6b 100644 --- a/daemon/pk/gkr-pk-import.c +++ b/daemon/pk/gkr-pk-import.c @@ -148,6 +148,7 @@ parser_ask_password (GkrPkixParser *parser, GQuark loc, gkrconstid digest, #define LAST_WAS_BLANK 1 if (*state == LAST_WAS_BLANK) { *result = NULL; + *state = 0; return TRUE; } |