threads / patch / 33997

v3credential-osxkeychain: support more protocols

Subject: [PATCH v3] credential-osxkeychain: support more protocols

## tl;dr

2 messages between May 31, 2013 and Jun 2, 2013. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Xidorn Quan· May 31, 2013, 04:07 UTC · lore
Add protocol imap, imaps, ftp and smtp for credential-osxkeychain.
Signed-off-by: Xidorn Quan <quanxunzhen@gmail.com>
Acked-by: John Szakmeister <john@szakmeister.net>
Acked-by: Jeff King <peff@peff.net>
---
 contrib/credential/osxkeychain/git-credential-osxkeychain.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
Show changes to contrib/credential/osxkeychain/git-credential-osxkeychain.c +11 −1
diff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c b/contrib/credential/osxkeychain/git-credential-osxkeychain.c
index 3940202..bcd3f57 100644
--- a/contrib/credential/osxkeychain/git-credential-osxkeychain.c
+++ b/contrib/credential/osxkeychain/git-credential-osxkeychain.c
@@ -127,10 +127,20 @@ static void read_credential(void)
 		*v++ = '\0';
 
 		if (!strcmp(buf, "protocol")) {
-			if (!strcmp(v, "https"))
+			if (!strcmp(v, "imap"))
+				protocol = kSecProtocolTypeIMAP;
+			else if (!strcmp(v, "imaps"))
+				protocol = kSecProtocolTypeIMAPS;
+			else if (!strcmp(v, "ftp"))
+				protocol = kSecProtocolTypeFTP;
+			else if (!strcmp(v, "ftps"))
+				protocol = kSecProtocolTypeFTPS;
+			else if (!strcmp(v, "https"))
 				protocol = kSecProtocolTypeHTTPS;
 			else if (!strcmp(v, "http"))
 				protocol = kSecProtocolTypeHTTP;
+			else if (!strcmp(v, "smtp"))
+				protocol = kSecProtocolTypeSMTP;
 			else /* we don't yet handle other protocols */
 				exit(0);
 		}
-- 
1.8.3
Junio C Hamano· Jun 2, 2013, 19:46 UTC · re: Xidorn Quan · lore

Re: [PATCH v3] credential-osxkeychain: support more protocols

Xidorn Quan <quanxunzhen@gmail.com> writes:
Show 6 quoted lines
> Add protocol imap, imaps, ftp and smtp for credential-osxkeychain.
>
> Signed-off-by: Xidorn Quan <quanxunzhen@gmail.com>
> Acked-by: John Szakmeister <john@szakmeister.net>
> Acked-by: Jeff King <peff@peff.net>
> ---

Hmph, I think I already have an identical copy in my tree. Sent a wrong patch?

Show 29 quoted lines
>  contrib/credential/osxkeychain/git-credential-osxkeychain.c | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c b/contrib/credential/osxkeychain/git-credential-osxkeychain.c
> index 3940202..bcd3f57 100644
> --- a/contrib/credential/osxkeychain/git-credential-osxkeychain.c
> +++ b/contrib/credential/osxkeychain/git-credential-osxkeychain.c
> @@ -127,10 +127,20 @@ static void read_credential(void)
>  		*v++ = '\0';
>  
>  		if (!strcmp(buf, "protocol")) {
> -			if (!strcmp(v, "https"))
> +			if (!strcmp(v, "imap"))
> +				protocol = kSecProtocolTypeIMAP;
> +			else if (!strcmp(v, "imaps"))
> +				protocol = kSecProtocolTypeIMAPS;
> +			else if (!strcmp(v, "ftp"))
> +				protocol = kSecProtocolTypeFTP;
> +			else if (!strcmp(v, "ftps"))
> +				protocol = kSecProtocolTypeFTPS;
> +			else if (!strcmp(v, "https"))
>  				protocol = kSecProtocolTypeHTTPS;
>  			else if (!strcmp(v, "http"))
>  				protocol = kSecProtocolTypeHTTP;
> +			else if (!strcmp(v, "smtp"))
> +				protocol = kSecProtocolTypeSMTP;
>  			else /* we don't yet handle other protocols */
>  				exit(0);
>  		}

← back to recent threads