------------------------------------------------------------ revno: 11323 revision-id: squidadm@squid-cache.org-20110329001445-w80bomzqxyieq8qy parent: squid3@treenet.co.nz-20110328225209-37ls9ly90tvv6519 committer: Automatic source maintenance branch nick: trunk timestamp: Mon 2011-03-28 18:14:45 -0600 message: SourceFormat Enforcement ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squidadm@squid-cache.org-20110329001445-\ # w80bomzqxyieq8qy # target_branch: http://www.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 0129f71754fec6c9d787ce00e086ad094e3a4600 # timestamp: 2011-03-29 00:55:00 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20110328225209-\ # 37ls9ly90tvv6519 # # Begin patch === modified file 'helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc' --- helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc 2011-03-28 22:52:09 +0000 +++ helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc 2011-03-29 00:14:45 +0000 @@ -1338,7 +1338,7 @@ // broken? xstrncpy(l->userid, ber[j]->bv_val, min(sizeof(l->userid),static_cast(ber[j]->bv_len))); xstrncpy(l->userid, ber[j]->bv_val, sizeof(l->userid)); /* Using bv_len of min() breaks the result by 2 chars */ - } + } ldap_value_free_len(l->val); l->val = NULL; ldap_value_free_len(ber); @@ -1373,7 +1373,7 @@ // broken? xstrncpy(l->userid, ber[j]->bv_val, min(sizeof(l->userid),static_cast(ber[j]->bv_len))); xstrncpy(l->userid, ber[j]->bv_val, sizeof(l->userid)); /* Using bv_len of min() breaks the result by 2 chars */ - } + } ldap_value_free_len(l->val); l->val = NULL; ldap_value_free_len(ber); @@ -1965,7 +1965,7 @@ int main(int argc, char **argv) { - int x; - x = MainSafe(argc, argv); - return x; + int x; + x = MainSafe(argc, argv); + return x; } === modified file 'src/ssl/ErrorDetail.cc' --- src/ssl/ErrorDetail.cc 2011-03-28 08:01:07 +0000 +++ src/ssl/ErrorDetail.cc 2011-03-29 00:14:45 +0000 @@ -8,7 +8,7 @@ Ssl::ssl_error_t value; const char *name; const char *detail; ///< for error page %D macro expansion; may contain macros - const char *descr; ///< short error description (for use in debug messages or error pages) + const char *descr; ///< short error description (for use in debug messages or error pages) }; static const char *SslErrorDetailDefaultStr = "SSL certificate validation error (%err_name): %ssl_subject"; @@ -17,27 +17,27 @@ SslErrorDetails TheSslDetail; static SslErrorDetailEntry TheSslDetailArray[] = { - {X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT, - "X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT", - "%err_name: SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name", - "Unable to get issuer certificate"}, - {X509_V_ERR_UNABLE_TO_GET_CRL, + {X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT, + "X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT", + "%err_name: SSL Certficate error: certificate issuer (CA) not known: %ssl_ca_name", + "Unable to get issuer certificate"}, + {X509_V_ERR_UNABLE_TO_GET_CRL, "X509_V_ERR_UNABLE_TO_GET_CRL", "%err_name: %ssl_error_descr: %ssl_subject", "Unable to get certificate CRL"}, - {X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE, + {X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE, "X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE", "%err_name: %ssl_error_descr: %ssl_subject", "Unable to decrypt certificate's signature"}, - {X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE, + {X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE, "X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE", "%err_name: %ssl_error_descr: %ssl_subject", "Unable to decrypt CRL's signature"}, - {X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY, + {X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY, "X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY", "%err_name: Unable to decode issuer (CA) public key: %ssl_ca_name", "Unable to decode issuer public key"}, - {X509_V_ERR_CERT_SIGNATURE_FAILURE, + {X509_V_ERR_CERT_SIGNATURE_FAILURE, "X509_V_ERR_CERT_SIGNATURE_FAILURE", "%err_name: %ssl_error_descr: %ssl_subject", "Certificate signature failure"},