Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3517A112D3 for ; Sat, 26 Jul 2014 17:48:50 +0000 (UTC) Received: (qmail 4788 invoked by uid 500); 26 Jul 2014 17:48:50 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 4758 invoked by uid 500); 26 Jul 2014 17:48:50 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 4748 invoked by uid 99); 26 Jul 2014 17:48:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Jul 2014 17:48:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Jul 2014 17:48:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CBB7523889BB; Sat, 26 Jul 2014 17:48:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1613693 - /subversion/branches/svn-auth-x509/subversion/svn/auth-cmd.c Date: Sat, 26 Jul 2014 17:48:28 -0000 To: commits@subversion.apache.org From: breser@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140726174828.CBB7523889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: breser Date: Sat Jul 26 17:48:28 2014 New Revision: 1613693 URL: http://svn.apache.org/r1613693 Log: On svn-auth-x509 branch, do some cleanup on the auth cmd implementation. * subversion/svn/auth-cmd.c (show_cert): Remove dead code. (list_credentials): Remove dead code and trailing whitespace. Modified: subversion/branches/svn-auth-x509/subversion/svn/auth-cmd.c Modified: subversion/branches/svn-auth-x509/subversion/svn/auth-cmd.c URL: http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/svn/auth-cmd.c?rev=1613693&r1=1613692&r2=1613693&view=diff ============================================================================== --- subversion/branches/svn-auth-x509/subversion/svn/auth-cmd.c (original) +++ subversion/branches/svn-auth-x509/subversion/svn/auth-cmd.c Sat Jul 26 17:48:28 2014 @@ -201,12 +201,6 @@ show_cert(const svn_string_t *pem_cert, if (v) SVN_ERR(svn_cmdline_printf(scratch_pool, _("Hostnames: %s\n"), v)); -#if 0 - SVN_ERR(svn_cmdline_printf(scratch_pool, _("Subject: %s\n"), cert->subject_id.p)); - SVN_ERR(svn_cmdline_printf(iterpool, _("Issuer: %s\n"), value->data)); - SVN_ERR(svn_cmdline_printf(iterpool, _("Fingerprint: %s\n"), - value->data)); -#endif return SVN_NO_ERROR; } @@ -231,7 +225,7 @@ list_credential(const char *cred_kind, svn_sort__item_t item; const char *key; svn_string_t *value; - + svn_pool_clear(iterpool); item = APR_ARRAY_IDX(cred_items, i, svn_sort__item_t); key = item.key; @@ -262,21 +256,6 @@ list_credential(const char *cred_kind, SVN_ERR(svn_cmdline_printf(iterpool, _("Username: %s\n"), value->data)); else if (strcmp(key, SVN_CONFIG_AUTHN_ASCII_CERT_KEY) == 0) SVN_ERR(show_cert(value, iterpool)); -#if 0 - else if (strcmp(key, SVN_CONFIG_AUTHN_HOSTNAME_KEY) == 0) - SVN_ERR(svn_cmdline_printf(iterpool, _("Hostname: %s\n"), value->data)); - else if (strcmp(key, SVN_CONFIG_AUTHN_VALID_FROM_KEY) == 0) - SVN_ERR(svn_cmdline_printf(iterpool, _("Valid from: %s\n"), - value->data)); - else if (strcmp(key, SVN_CONFIG_AUTHN_VALID_UNTIL_KEY) == 0) - SVN_ERR(svn_cmdline_printf(iterpool, _("Valid until: %s\n"), - value->data)); - else if (strcmp(key, SVN_CONFIG_AUTHN_ISSUER_DN_KEY) == 0) - SVN_ERR(svn_cmdline_printf(iterpool, _("Issuer: %s\n"), value->data)); - else if (strcmp(key, SVN_CONFIG_AUTHN_FINGERPRINT_KEY) == 0) - SVN_ERR(svn_cmdline_printf(iterpool, _("Fingerprint: %s\n"), - value->data)); -#endif else if (strcmp(key, SVN_CONFIG_AUTHN_FAILURES_KEY) == 0) SVN_ERR(show_cert_failures(value->data, iterpool)); else