From: Christos Tsantilas Date: Wed, 1 Dec 2010 08:41:19 +0000 (+0200) Subject: Try to fix compile problems on FreeBSD6.4 X-Git-Tag: take1~53 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70554b80435d23f92ce6a8e9215355ada49b15af;p=thirdparty%2Fsquid.git Try to fix compile problems on FreeBSD6.4 The X509_NAME_add_entry_by_txt on FreeBSD 6.4 declared as: int X509_NAME_add_entry_by_txt(X509_NAME *,char *,int,unsigned char *,int,int,int); The second argument declared as "char *". Use a static char * variable to avoid compile errors. --- diff --git a/src/ssl/gadgets.cc b/src/ssl/gadgets.cc index a18aee5734..9410957533 100644 --- a/src/ssl/gadgets.cc +++ b/src/ssl/gadgets.cc @@ -14,7 +14,11 @@ static bool addCnToRequest(Ssl::X509_REQ_Pointer & request, char const * cn) Ssl::X509_NAME_Pointer name(X509_REQ_get_subject_name(request.get())); if (!name) return false; - if (!X509_NAME_add_entry_by_txt(name.get(), "CN", MBSTRING_ASC, (unsigned char *)cn, -1, -1, 0)) + + // The second argument of the X509_NAME_add_entry_by_txt declared as + // "char *" on some OS. Use cn_name to avoid compile warnings. + static char cn_name[3] = "CN"; + if (!X509_NAME_add_entry_by_txt(name.get(), cn_name, MBSTRING_ASC, (unsigned char *)cn, -1, -1, 0)) return false; name.release(); return true;