Commit a846fbbe authored by Steve Holme's avatar Steve Holme
Browse files

sasl-ir: Added CURLOPT_SASL_IR to enable/disable the SASL initial response

parent 64206728

include/curl/curl.h

+4 −1
Original line number Diff line number Diff line
@@ -1527,9 +1527,12 @@ typedef enum { 
  /* Enable/disable specific SSL features with a bitmask, see CURLSSLOPT_* */

  CINIT(SSL_OPTIONS, LONG, 216),



  /* set the SMTP auth originator */

  /* Set the SMTP auth originator */

  CINIT(MAIL_AUTH, OBJECTPOINT, 217),



  /* Enable/disable SASL initial response */

  CINIT(SASL_IR, LONG, 218),



  CURLOPT_LASTENTRY /* the last unused */

} CURLoption;

lib/url.c

+8 −1
Original line number Diff line number Diff line
@@ -2246,20 +2246,27 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, 
    break;



  case CURLOPT_MAIL_FROM:

    /* Set the SMTP mail originator */

    result = setstropt(&data->set.str[STRING_MAIL_FROM],

                       va_arg(param, char *));

    break;



  case CURLOPT_MAIL_AUTH:

    /* Set the SMTP auth originator */

    result = setstropt(&data->set.str[STRING_MAIL_AUTH],

                       va_arg(param, char *));

    break;



  case CURLOPT_MAIL_RCPT:

    /* get a list of mail recipients */

    /* Set the list of mail recipients */

    data->set.mail_rcpt = va_arg(param, struct curl_slist *);

    break;



  case CURLOPT_SASL_IR:

    /* Enable/disable SASL initial response */

    data->set.sasl_ir = (0 != va_arg(param, long)) ? TRUE : FALSE;

    break;



  case CURLOPT_RTSP_REQUEST:

    {

      /*

lib/urldata.h

+1 −0
Original line number Diff line number Diff line
@@ -1563,6 +1563,7 @@ struct UserDefined { 
  long socks5_gssapi_nec; /* flag to support nec socks5 server */

#endif

  struct curl_slist *mail_rcpt; /* linked list of mail recipients */

  bool sasl_ir;         /* Enable/disable SASL initial response */

  /* Common RTSP header options */

  Curl_RtspReq rtspreq; /* RTSP request type */

  long rtspversion; /* like httpversion, for RTSP */