/[winpt]/trunk/Src/wptKeyserver.cpp
ViewVC logotype

Diff of /trunk/Src/wptKeyserver.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 230 by twoaday, Mon Jun 19 14:04:31 2006 UTC revision 231 by twoaday, Tue Jun 20 09:18:44 2006 UTC
# Line 169  parse_keyserver_error (const char *resp, Line 169  parse_keyserver_error (const char *resp,
169    
170      /* If we find no 'Error' substring, we assume a success. */      /* If we find no 'Error' substring, we assume a success. */
171      if (!stristr (resp, "Error"))      if (!stristr (resp, "Error"))
172          return 0;          return -1;
173    
174      memset (txt, 0, txtlen);      memset (txt, 0, txtlen);
175      p = strstr (resp, "\r\n\r\n");      p = strstr (resp, "\r\n\r\n");
# Line 213  check_hkp_response (const char *resp, in Line 213  check_hkp_response (const char *resp, in
213          !strstr (resp, "HTTP/1.1 500 OK"))          !strstr (resp, "HTTP/1.1 500 OK"))
214          return ec; /* http error */          return ec; /* http error */
215    
216      if (parse_keyserver_error (resp, hkp_errmsg, sizeof (hkp_errmsg)-2)) {      if (!parse_keyserver_error (resp, hkp_errmsg, sizeof (hkp_errmsg)-2)) {
217          if (!strlen (hkp_errmsg))          if (!strlen (hkp_errmsg))
218              _snprintf (hkp_errmsg, sizeof (hkp_errmsg)-1,              _snprintf (hkp_errmsg, sizeof (hkp_errmsg)-1,
219                          "Unknown keyserver error");                          "Unknown keyserver error");
# Line 676  kserver_load_conf (const char *conf) Line 676  kserver_load_conf (const char *conf)
676          update_proxy_user (user, pass);          update_proxy_user (user, pass);
677      else if (user && !pass || !user && pass) {      else if (user && !pass || !user && pass) {
678          msg_box (NULL, _("Invalid proxy configuration."          msg_box (NULL, _("Invalid proxy configuration."
679                           "You need to set a user and a password"                           "You need to set a user and a password "
680                           "to use proxy authentication!"),                           "to use proxy authentication!"),
681                           _("Proxy Error"), MB_ERR);                           _("Proxy Error"), MB_ERR);
682      }      }
Legend:
Removed from v.230  
changed lines
  Added in v.231
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26