generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patrick Monnerat's cleanup fix after my alloc-strings commit

Browse Source
This commit is contained in:
Daniel Stenberg
2007-08-02 14:42:16 +00:00
parent 6f750f3b57
commit 188b08ca55
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/connect.c
View File

@@ -242,7 +242,7 @@ static CURLcode bindlocal(struct connectdata *conn,
int in6 = -1; int in6 = -1;
/* First check if the given name is an IP address */ /* First check if the given name is an IP address */
in=inet_addr(dev); in=inet_addr((char *) dev);
if((in == CURL_INADDR_NONE) && if((in == CURL_INADDR_NONE) &&
Curl_if2ip(dev, myhost, sizeof(myhost))) { Curl_if2ip(dev, myhost, sizeof(myhost))) {

8
lib/qssl.c
View File

@@ -78,10 +78,10 @@ static CURLcode Curl_qsossl_init_session(struct SessionHandle * data)
* We first try to SSL_Init_Application(), then SSL_Init() if it failed. * We first try to SSL_Init_Application(), then SSL_Init() if it failed.
*/ */
certname = data->set.cert; certname = data->set.str[STRING_CERT];
if (!certname) { if (!certname) {
certname = data->set.ssl.CAfile; certname = data->set.str[STRING_SSL_CAFILE];
if (!certname) if (!certname)
return CURLE_OK; /* Use previous setup. */ return CURLE_OK; /* Use previous setup. */
@@ -96,7 +96,7 @@ static CURLcode Curl_qsossl_init_session(struct SessionHandle * data)
if (rc == SSL_ERROR_NOT_REGISTERED) { if (rc == SSL_ERROR_NOT_REGISTERED) {
initstr.keyringFileName = certname; initstr.keyringFileName = certname;
initstr.keyringPassword = data->set.key; initstr.keyringPassword = data->set.str[STRING_KEY];
initstr.cipherSuiteList = NULL; /* Use default. */ initstr.cipherSuiteList = NULL; /* Use default. */
initstr.cipherSuiteListLen = 0; initstr.cipherSuiteListLen = 0;
rc = SSL_Init(&initstr); rc = SSL_Init(&initstr);
@@ -190,7 +190,7 @@ static CURLcode Curl_qsossl_handshake(struct connectdata * conn, int sockindex)
/* Set-up protocol. */ /* Set-up protocol. */
switch(data->set.ssl.version) { switch (data->set.ssl.version) {
default: default:
case CURL_SSLVERSION_DEFAULT: case CURL_SSLVERSION_DEFAULT: