{"thread":{"id":"33997","subject":"[PATCH v3] credential-osxkeychain: support more protocols","startedAt":"2013-05-31T04:07:55Z","lastAt":"2013-06-02T19:46:40Z","messageCount":2,"participants":["Xidorn Quan","Junio C Hamano"],"isPatch":true,"patchVersion":3,"patchTotal":null},"messages":[{"id":"219055","messageId":"1369973275-13353-1-git-send-email-quanxunzhen@gmail.com","threadId":"33997","inReplyTo":null,"subject":"[PATCH v3] credential-osxkeychain: support more protocols","fromName":"Xidorn Quan","fromEmail":"quanxunzhen@gmail.com","sentAt":"2013-05-31T04:07:55Z","receivedAt":"2013-05-31T04:07:55Z","isPatch":true,"sender":{"key":"quanxunzhen@gmail.com","avatar":"https://avatars.githubusercontent.com/u/333750?v=4"},"body":"Add protocol imap, imaps, ftp and smtp for credential-osxkeychain.\n\nSigned-off-by: Xidorn Quan <quanxunzhen@gmail.com>\nAcked-by: John Szakmeister <john@szakmeister.net>\nAcked-by: Jeff King <peff@peff.net>\n---\n contrib/credential/osxkeychain/git-credential-osxkeychain.c | 12 +++++++++++-\n 1 file changed, 11 insertions(+), 1 deletion(-)\n\ndiff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c b/contrib/credential/osxkeychain/git-credential-osxkeychain.c\nindex 3940202..bcd3f57 100644\n--- a/contrib/credential/osxkeychain/git-credential-osxkeychain.c\n+++ b/contrib/credential/osxkeychain/git-credential-osxkeychain.c\n@@ -127,10 +127,20 @@ static void read_credential(void)\n \t\t*v++ = '\\0';\n \n \t\tif (!strcmp(buf, \"protocol\")) {\n-\t\t\tif (!strcmp(v, \"https\"))\n+\t\t\tif (!strcmp(v, \"imap\"))\n+\t\t\t\tprotocol = kSecProtocolTypeIMAP;\n+\t\t\telse if (!strcmp(v, \"imaps\"))\n+\t\t\t\tprotocol = kSecProtocolTypeIMAPS;\n+\t\t\telse if (!strcmp(v, \"ftp\"))\n+\t\t\t\tprotocol = kSecProtocolTypeFTP;\n+\t\t\telse if (!strcmp(v, \"ftps\"))\n+\t\t\t\tprotocol = kSecProtocolTypeFTPS;\n+\t\t\telse if (!strcmp(v, \"https\"))\n \t\t\t\tprotocol = kSecProtocolTypeHTTPS;\n \t\t\telse if (!strcmp(v, \"http\"))\n \t\t\t\tprotocol = kSecProtocolTypeHTTP;\n+\t\t\telse if (!strcmp(v, \"smtp\"))\n+\t\t\t\tprotocol = kSecProtocolTypeSMTP;\n \t\t\telse /* we don't yet handle other protocols */\n \t\t\t\texit(0);\n \t\t}\n-- \n1.8.3\n"},{"id":"219186","messageId":"7vbo7onvmn.fsf@alter.siamese.dyndns.org","threadId":"33997","inReplyTo":"1369973275-13353-1-git-send-email-quanxunzhen@gmail.com","subject":"Re: [PATCH v3] credential-osxkeychain: support more protocols","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-06-02T19:46:40Z","receivedAt":"2013-06-02T19:46:40Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Xidorn Quan <quanxunzhen@gmail.com> writes:\n\n> Add protocol imap, imaps, ftp and smtp for credential-osxkeychain.\n>\n> Signed-off-by: Xidorn Quan <quanxunzhen@gmail.com>\n> Acked-by: John Szakmeister <john@szakmeister.net>\n> Acked-by: Jeff King <peff@peff.net>\n> ---\n\nHmph, I think I already have an identical copy in my tree.  Sent a\nwrong patch?\n\n>  contrib/credential/osxkeychain/git-credential-osxkeychain.c | 12 +++++++++++-\n>  1 file changed, 11 insertions(+), 1 deletion(-)\n>\n> diff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c b/contrib/credential/osxkeychain/git-credential-osxkeychain.c\n> index 3940202..bcd3f57 100644\n> --- a/contrib/credential/osxkeychain/git-credential-osxkeychain.c\n> +++ b/contrib/credential/osxkeychain/git-credential-osxkeychain.c\n> @@ -127,10 +127,20 @@ static void read_credential(void)\n>  \t\t*v++ = '\\0';\n>  \n>  \t\tif (!strcmp(buf, \"protocol\")) {\n> -\t\t\tif (!strcmp(v, \"https\"))\n> +\t\t\tif (!strcmp(v, \"imap\"))\n> +\t\t\t\tprotocol = kSecProtocolTypeIMAP;\n> +\t\t\telse if (!strcmp(v, \"imaps\"))\n> +\t\t\t\tprotocol = kSecProtocolTypeIMAPS;\n> +\t\t\telse if (!strcmp(v, \"ftp\"))\n> +\t\t\t\tprotocol = kSecProtocolTypeFTP;\n> +\t\t\telse if (!strcmp(v, \"ftps\"))\n> +\t\t\t\tprotocol = kSecProtocolTypeFTPS;\n> +\t\t\telse if (!strcmp(v, \"https\"))\n>  \t\t\t\tprotocol = kSecProtocolTypeHTTPS;\n>  \t\t\telse if (!strcmp(v, \"http\"))\n>  \t\t\t\tprotocol = kSecProtocolTypeHTTP;\n> +\t\t\telse if (!strcmp(v, \"smtp\"))\n> +\t\t\t\tprotocol = kSecProtocolTypeSMTP;\n>  \t\t\telse /* we don't yet handle other protocols */\n>  \t\t\t\texit(0);\n>  \t\t}\n"}]}