proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-30 18:43:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Address feedback

Browse Source
This commit is contained in:
Ben Straub 2013-02-04 13:52:18 -08:00
parent 15760c598d
commit 630146bd1b
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/transports/cred_helpers.c
View File

@ -23,7 +23,9 @@ int git_cred_userpass(
if (!userpass || !userpass->password) return -1; if (!userpass || !userpass->password) return -1;
/* Username resolution: a username can be passed with the URL, the /* Username resolution: a username can be passed with the URL, the
* credentials payload, or both. Here's what we do. * credentials payload, or both. Here's what we do. Note that if we get
* this far, we know that any password the url may contain has already
* failed at least once, so we ignore it.
* *
* | Payload | URL | Used | * | Payload | URL | Used |
* +-------------+----------+-----------+ * +-------------+----------+-----------+
@ -32,10 +34,12 @@ int git_cred_userpass(
* | no | yes | url | * | no | yes | url |
* | no | no | FAIL | * | no | no | FAIL |
*/ */
if (userpass->username)
effective_username = userpass->username; effective_username = userpass->username;
if (!userpass->username && user_from_url) else if (user_from_url)
effective_username = user_from_url; effective_username = user_from_url;
if (!effective_username) return -1; else
return -1;
if ((GIT_CREDTYPE_USERPASS_PLAINTEXT & allowed_types) == 0 || if ((GIT_CREDTYPE_USERPASS_PLAINTEXT & allowed_types) == 0 ||
git_cred_userpass_plaintext_new(cred, effective_username, userpass->password) < 0) git_cred_userpass_plaintext_new(cred, effective_username, userpass->password) < 0)

8
src/transports/git.c
View File

@ -201,8 +201,8 @@ static int _git_uploadpack_ls(
t->current_stream = s; t->current_stream = s;
git__free(host); git__free(host);
git__free(port); git__free(port);
if (user) git__free(user); git__free(user);
if (pass) git__free(pass); git__free(pass);
return 0; return 0;
on_error: on_error:
@ -257,8 +257,8 @@ static int _git_receivepack_ls(
t->current_stream = s; t->current_stream = s;
git__free(host); git__free(host);
git__free(port); git__free(port);
if (user) git__free(user); git__free(user);
if (pass) git__free(pass); git__free(pass);
return 0; return 0;
on_error: on_error: