[stunnel-users] Upcoming stunnel 5.29 release

[Michal Trojnara]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

On 05.01.2016 05:46, Jose Alf. wrote:
> The following patch fixed the issue for me:
> 
> --- options.c.old       Tue Dec 22 18:09:39 2015 +++ options.c
> Mon Jan 04 23:14:29 2016 @@ -272,8 +272,11 @@ } else #endif { -
> name=arg1; -        type=CONF_FILE; +        if (arg1) +       { +
> name=arg1; +               type=CONF_FILE; +       } }
> 
> #ifdef HAVE_REALPATH

Thank you for reporting this issue.  I made a really dumb mistake.

My patch (restoring the intended control flow) is:

- --- a/src/options.c
+++ b/src/options.c
@@ -227,6 +227,9 @@ int options_cmdline(char *arg1, char *arg2) {
     char *name;
     CONF_TYPE type;

+#ifdef USE_WIN32
+    (void)arg2; /* squash the unused parameter warning */
+#endif
     if(!arg1) {
         name=
 #ifdef CONFDIR
@@ -258,9 +261,7 @@ int options_cmdline(char *arg1, char *arg2) {
         log_flush(LOG_MODE_INFO);
         return 2;
     } else
- -#ifdef USE_WIN32
- -    (void)arg2; /* squash the unused parameter warning */
- -#else
+#ifndef USE_WIN32
     if(!strcasecmp(arg1, "-fd")) {
         if(!arg2) {
             s_log(LOG_ERR, "No file descriptor specified");

I have uploaded stunnel-5.29b4 to https://www.stunnel.org/downloads.html

Best regards,
	Mike
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJWi5FeAAoJEC78f/DUFuAUz+0QALconnbPd1NM0gihc2Jv8vUN
2EjpUJtb+TsqwiSMDx1/5dPflKr6iE8XbdGvgBKDuW3+4yGd5zKflIITe3ZfrbUa
qniSCOFgbAHONPwyUbFgcOaXuUzYsfNIg72I10+Jlk5F6QS9wLa0I1w4tgTOab6F
HH0MXMmxprEQQ2Bn01Hd5nkGEECDWtTrkO3PuuoQ4AQ7u82BtRBcW5hdChx9UEao
Gsg88Rj6wf4LYpibWj1cZTuEvC/QVuwLIi1ah0nipxTW6/dgklITvR7naw/styDn
VAbAtVfvI/Kegx6zFTwnMGp+7BpANpLQsWgfDJCz9snbqSGj0N8UPwKWzudJtoCH
WMBQTvhqKjAJLib936ddpCKIyuf4lWlC84R5qwnJE569PAWXkZzuhThQ3O3Z1Low
UhtKT3bKwLvLkxCPOwyxY6WUuU9ULssjEar9vfo77JKUeqa7WDgWM2UBf32YVSji
myFQQtHMJjPCinXrVuxstqec4BFCQRQ7qtNYNrLE71fWX+E/aKwTNDf1otYXtPhc
/Dvh66BpuBwWK9+DuCpKnkuiLuekz1oHOTneEgcy0iLfQ7Jq81ERO0pyLWJTYGC4
rpWlzVffvPmMcKxg8rUe4Juthj6QjE49Rm42sQHAgTCjeZazn+9zyxtmUrTm00Ri
QrIKYx4BsLYvMdQM40Ts
=itMk
-----END PGP SIGNATURE-----