← Back to branch summary

~vanhoof/+junk/znc

« back to all changes in this revision

Viewing changes to Csocket.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Patrick Matthäi
  • Date: 2009-07-24 13:46:00 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20090724134600-uaxedj9f92i72ru1
Tags: 0.074-1
http://bugs.debian.org/537977
* New upstream release.
  - Bump urgency to high. This release fixes an high-impact directory
    traversal buf, where unpriviliged users can save about DCC SEND files on
    the server with the rights of the znc process. The attacker could also
    use the exploit to get a shell on the server.
    Closes: #537977
  - Use c-ares for DNS resolving, add libc-ares-dev and pkg-config as
    build-dependency.
* Merge 0.058-2+lenny2, 0.058-2+lenny3, 0.070-1~bpo40+1 and 0.070-1~bpo50+1
  changelog.
* Bump Standards-Version to 3.8.2 (no changes needed).

Show diffs side-by-side

added added

removed removed

Lines of Context:
Csocket.cpp
2051
2051
                iRet = GetAddrInfo( m_shostname, m_address );
2052
2052
        }
2053
2053
 
2054
 
        if( !CreateSocksFD() )
2055
 
                iRet = ETIMEDOUT;
2056
 
 
2057
2054
        if ( iRet == 0 )
2058
2055
        {
 
2056
                if( !CreateSocksFD() )
 
2057
                {
 
2058
                        m_iDNSTryCount = 0;
 
2059
                        return ETIMEDOUT;
 
2060
                }
 
2061
 
2059
2062
                if ( m_eConState != CST_OK )
2060
2063
                        m_eConState = ( ( eDNSLType == DNS_VHOST ) ? CST_BINDVHOST : CST_CONNECT );
2061
2064
                m_iDNSTryCount = 0;