]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD: ssl: previous patch failed
authorWilly Tarreau <w@1wt.eu>
Wed, 9 Apr 2014 13:40:42 +0000 (15:40 +0200)
committerWilly Tarreau <w@1wt.eu>
Wed, 9 Apr 2014 13:41:52 +0000 (15:41 +0200)
This is a minor error, s/SMP_T_CSTR/SMP_T_STR + SMP_F_CONST.

src/ssl_sock.c

index a40b445c3a726513c396560437503c286c7a977a..a11aed24d209d22f1f816145c86b597682b66bee 100644 (file)
@@ -2851,7 +2851,8 @@ smp_fetch_ssl_fc_unique_id(struct proxy *px, struct session *l4, void *l7, unsig
                return 0;
 
        smp->data.str.str = smp_trash->str;
-       smp->type = SMP_T_CSTR;
+       smp->type = SMP_T_STR;
+       smp->flags |= SMP_F_CONST;
        smp->data.str.len = b64_len;
 
        return 1;
@@ -3586,7 +3587,7 @@ static struct sample_fetch_kw_list sample_fetch_keywords = {ILH, {
        { "ssl_fc_alpn",            smp_fetch_ssl_fc_alpn,        0,                   NULL,    SMP_T_STR,  SMP_USE_L5CLI },
 #endif
        { "ssl_fc_protocol",        smp_fetch_ssl_fc_protocol,    0,                   NULL,    SMP_T_STR,  SMP_USE_L5CLI },
-       { "ssl_fc_unique_id",       smp_fetch_ssl_fc_unique_id,   0,                   NULL,    SMP_T_CSTR, SMP_USE_L5CLI },
+       { "ssl_fc_unique_id",       smp_fetch_ssl_fc_unique_id,   0,                   NULL,    SMP_T_STR,  SMP_USE_L5CLI },
        { "ssl_fc_use_keysize",     smp_fetch_ssl_fc_use_keysize, 0,                   NULL,    SMP_T_UINT, SMP_USE_L5CLI },
        { "ssl_fc_session_id",      smp_fetch_ssl_fc_session_id,  0,                   NULL,    SMP_T_BIN,  SMP_USE_L5CLI },
        { "ssl_fc_sni",             smp_fetch_ssl_fc_sni,         0,                   NULL,    SMP_T_STR,  SMP_USE_L5CLI },