[prev in list] [next in list] [prev in thread] [next in thread]
List: subversion-cvs
Subject: svn commit: r39697 -
From: Senthil Kumaran S <senthil () collab ! net>
Date: 2009-09-30 10:31:48
Message-ID: 200909301031.n8UAVmIt032744 () svn2 ! sjc ! collab ! net
[Download RAW message or body]
Author: stylesen
Date: Wed Sep 30 03:31:47 2009
New Revision: 39697
Log:
On the 1.6.x-r39692 branch, merge r39692 from trunk and resolve
conflicts.
Modified:
branches/1.6.x-r39692/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
Modified: branches/1.6.x-r39692/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
URL: http://svn.collab.net/viewvc/svn/branches/1.6.x-r39692/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c?pathrev=39697&r1=39696&r2=39697
==============================================================================
--- branches/1.6.x-r39692/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c Wed \
Sep 30 03:26:35 2009 (r39696)
+++ branches/1.6.x-r39692/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c Wed \
Sep 30 03:31:47 2009 (r39697) @@ -390,36 +390,32 @@ \
simple_gnome_keyring_first_creds(void **
char *keyring_password;
- if (check_keyring_is_locked(default_keyring))
+ if (unlock_prompt_func && check_keyring_is_locked(default_keyring))
{
- if (unlock_prompt_func)
- {
- SVN_ERR((*unlock_prompt_func)(&keyring_password,
- default_keyring,
- unlock_prompt_baton,
- pool));
- unlock_gnome_keyring(default_keyring, keyring_password,
+ SVN_ERR((*unlock_prompt_func)(&keyring_password,
+ default_keyring,
+ unlock_prompt_baton,
+ pool));
+ unlock_gnome_keyring(default_keyring, keyring_password,
pool);
- }
}
}
-
- if (check_keyring_is_locked(default_keyring))
- {
- return svn_error_create(SVN_ERR_AUTHN_CREDS_UNAVAILABLE, NULL,
- _("GNOME Keyring is locked and "
- "we are non-interactive"));
- }
else
- {
- return svn_auth__simple_first_creds_helper
- (credentials,
- iter_baton, provider_baton,
- parameters, realmstring,
- password_get_gnome_keyring,
- SVN_AUTH__GNOME_KEYRING_PASSWORD_TYPE,
- pool);
+ {
+ if (check_keyring_is_locked(default_keyring))
+ {
+ return svn_error_create(SVN_ERR_AUTHN_CREDS_UNAVAILABLE, NULL,
+ _("GNOME Keyring is locked and "
+ "we are non-interactive"));
+ }
}
+ return svn_auth__simple_first_creds_helper
+ (credentials,
+ iter_baton, provider_baton,
+ parameters, realmstring,
+ password_get_gnome_keyring,
+ SVN_AUTH__GNOME_KEYRING_PASSWORD_TYPE,
+ pool);
}
/* Save encrypted credentials to the simple provider's cache. */
@@ -447,35 +443,32 @@ simple_gnome_keyring_save_creds(svn_bool
char *keyring_password;
- if (check_keyring_is_locked(default_keyring))
+ if (unlock_prompt_func && check_keyring_is_locked(default_keyring))
{
- if (unlock_prompt_func)
- {
- SVN_ERR((*unlock_prompt_func)(&keyring_password,
- default_keyring,
- unlock_prompt_baton,
- pool));
- unlock_gnome_keyring(default_keyring, keyring_password,
+ SVN_ERR((*unlock_prompt_func)(&keyring_password,
+ default_keyring,
+ unlock_prompt_baton,
+ pool));
+ unlock_gnome_keyring(default_keyring, keyring_password,
pool);
- }
}
}
- if (check_keyring_is_locked(default_keyring))
- {
- return svn_error_create(SVN_ERR_AUTHN_CREDS_NOT_SAVED, NULL,
- _("GNOME Keyring is locked and "
- "we are non-interactive"));
- }
else
{
- return svn_auth__simple_save_creds_helper
- (saved, credentials,
- provider_baton, parameters,
- realmstring,
- password_set_gnome_keyring,
- SVN_AUTH__GNOME_KEYRING_PASSWORD_TYPE,
- pool);
+ if (check_keyring_is_locked(default_keyring))
+ {
+ return svn_error_create(SVN_ERR_AUTHN_CREDS_NOT_SAVED, NULL,
+ _("GNOME Keyring is locked and "
+ "we are non-interactive"));
+ }
}
+ return svn_auth__simple_save_creds_helper
+ (saved, credentials,
+ provider_baton, parameters,
+ realmstring,
+ password_set_gnome_keyring,
+ SVN_AUTH__GNOME_KEYRING_PASSWORD_TYPE,
+ pool);
}
static void
@@ -540,35 +533,32 @@ ssl_client_cert_pw_gnome_keyring_first_c
char *keyring_password;
- if (check_keyring_is_locked(default_keyring))
+ if (unlock_prompt_func && check_keyring_is_locked(default_keyring))
{
- if (unlock_prompt_func)
- {
- SVN_ERR((*unlock_prompt_func)(&keyring_password,
- default_keyring,
- unlock_prompt_baton,
- pool));
+ SVN_ERR((*unlock_prompt_func)(&keyring_password,
+ default_keyring,
+ unlock_prompt_baton,
+ pool));
unlock_gnome_keyring(default_keyring, keyring_password,
pool);
- }
}
}
- if (check_keyring_is_locked(default_keyring))
- {
- return svn_error_create(SVN_ERR_AUTHN_CREDS_UNAVAILABLE, NULL,
- _("GNOME Keyring is locked and "
- "we are non-interactive"));
- }
else
{
- return svn_auth__ssl_client_cert_pw_file_first_creds_helper
- (credentials,
- iter_baton, provider_baton,
- parameters, realmstring,
- password_get_gnome_keyring,
- SVN_AUTH__GNOME_KEYRING_PASSWORD_TYPE,
- pool);
+ if (check_keyring_is_locked(default_keyring))
+ {
+ return svn_error_create(SVN_ERR_AUTHN_CREDS_UNAVAILABLE, NULL,
+ _("GNOME Keyring is locked and "
+ "we are non-interactive"));
+ }
}
+ return svn_auth__ssl_client_cert_pw_file_first_creds_helper
+ (credentials,
+ iter_baton, provider_baton,
+ parameters, realmstring,
+ password_get_gnome_keyring,
+ SVN_AUTH__GNOME_KEYRING_PASSWORD_TYPE,
+ pool);
}
/* Save encrypted credentials to the ssl client cert password provider's
@@ -597,35 +587,32 @@ ssl_client_cert_pw_gnome_keyring_save_cr
char *keyring_password;
- if (check_keyring_is_locked(default_keyring))
+ if (unlock_prompt_func && check_keyring_is_locked(default_keyring))
{
- if (unlock_prompt_func)
- {
- SVN_ERR((*unlock_prompt_func)(&keyring_password,
- default_keyring,
- unlock_prompt_baton,
- pool));
+ SVN_ERR((*unlock_prompt_func)(&keyring_password,
+ default_keyring,
+ unlock_prompt_baton,
+ pool));
unlock_gnome_keyring(default_keyring, keyring_password,
pool);
- }
}
}
- if (check_keyring_is_locked(default_keyring))
- {
- return svn_error_create(SVN_ERR_AUTHN_CREDS_UNAVAILABLE, NULL,
- _("GNOME Keyring is locked and "
- "we are non-interactive"));
- }
else
{
- return svn_auth__ssl_client_cert_pw_file_save_creds_helper
- (saved, credentials,
- provider_baton, parameters,
- realmstring,
- password_set_gnome_keyring,
- SVN_AUTH__GNOME_KEYRING_PASSWORD_TYPE,
- pool);
+ if (check_keyring_is_locked(default_keyring))
+ {
+ return svn_error_create(SVN_ERR_AUTHN_CREDS_UNAVAILABLE, NULL,
+ _("GNOME Keyring is locked and "
+ "we are non-interactive"));
+ }
}
+ return svn_auth__ssl_client_cert_pw_file_save_creds_helper
+ (saved, credentials,
+ provider_baton, parameters,
+ realmstring,
+ password_set_gnome_keyring,
+ SVN_AUTH__GNOME_KEYRING_PASSWORD_TYPE,
+ pool);
}
static const svn_auth_provider_t gnome_keyring_ssl_client_cert_pw_provider = {
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=2401986
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic