From: Automatic source maintenance Date: Tue, 5 Jun 2012 11:27:52 +0000 (-0600) Subject: SourceFormat Enforcement X-Git-Tag: SQUID_3_2_0_18~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a32be2f3559283e4677920d91c94affc071e988c;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/src/adaptation/ecap/XactionRep.cc b/src/adaptation/ecap/XactionRep.cc index ceb5668cbd..85fecf563a 100644 --- a/src/adaptation/ecap/XactionRep.cc +++ b/src/adaptation/ecap/XactionRep.cc @@ -145,7 +145,7 @@ Adaptation::Ecap::XactionRep::usernameValue() const if (char const *name = request->auth_user_request->username()) return libecap::Area::FromTempBuffer(name, strlen(name)); else if (request->extacl_user.defined() && request->extacl_user.size()) - return libecap::Area::FromTempBuffer(request->extacl_user.rawBuf(), + return libecap::Area::FromTempBuffer(request->extacl_user.rawBuf(), request->extacl_user.size()); } #endif diff --git a/src/adaptation/icap/ModXact.cc b/src/adaptation/icap/ModXact.cc index b2c0502a9c..8891606579 100644 --- a/src/adaptation/icap/ModXact.cc +++ b/src/adaptation/icap/ModXact.cc @@ -1345,11 +1345,11 @@ void Adaptation::Icap::ModXact::makeRequestHeaders(MemBuf &buf) String vh=virgin.header->header.getByName("Proxy-Authorization"); buf.Printf("Proxy-Authorization: " SQUIDSTRINGPH "\r\n", SQUIDSTRINGPRINT(vh)); } else if (request->extacl_user.defined() && request->extacl_user.size() && request->extacl_passwd.defined() && request->extacl_passwd.size()) { - char loginbuf[256]; - snprintf(loginbuf, sizeof(loginbuf), SQUIDSTRINGPH ":" SQUIDSTRINGPH, - SQUIDSTRINGPRINT(request->extacl_user), - SQUIDSTRINGPRINT(request->extacl_passwd)); - buf.Printf("Proxy-Authorization: Basic %s\r\n", old_base64_encode(loginbuf)); + char loginbuf[256]; + snprintf(loginbuf, sizeof(loginbuf), SQUIDSTRINGPH ":" SQUIDSTRINGPH, + SQUIDSTRINGPRINT(request->extacl_user), + SQUIDSTRINGPRINT(request->extacl_passwd)); + buf.Printf("Proxy-Authorization: Basic %s\r\n", old_base64_encode(loginbuf)); } // share the cross-transactional database records if needed