- up to 5.49

[packages/stunnel.git] / stunnel-libwrap_srv_name_log.patch

diff --git a/stunnel-libwrap_srv_name_log.patch b/stunnel-libwrap_srv_name_log.patch
index cfb2a2fd938f97b747dbab77ab1f13f43c299627..87e469d50583e80a3e604ee79b4e63ea1023e916 100644 (file)
--- a/stunnel-libwrap_srv_name_log.patch
+++ b/stunnel-libwrap_srv_name_log.patch
@@ -1,13 +1,12 @@
---- stunnel-4.46/src/client.c.orig     2011-11-04 10:58:06.000000000 +0100
-+++ stunnel-4.46/src/client.c  2011-11-06 06:54:08.073382056 +0100
-@@ -858,8 +858,8 @@
+--- stunnel-5.49/src/client.c~ 2018-08-26 19:36:09.000000000 +0200
++++ stunnel-5.49/src/client.c  2018-09-20 18:32:38.330919447 +0200
+@@ -1202,7 +1202,8 @@ NOEXPORT void auth_user(CLI *c) {
+     while(*user==' ') /* skip leading spaces */
          ++user;
      if(strcmp(user, c->opt->username)) {
-         safestring(user);
--        s_log(LOG_WARNING, "Connection from %s REFUSED by IDENT (user %s)",
--            accepted_address, user);
-+        s_log(LOG_WARNING, "Connection to service %s from %s REFUSED by IDENT (user %s)",
-+            c->opt->servname, accepted_address, user);
+-        s_log(LOG_WARNING, "Connection from %s REFUSED by IDENT (user \"%s\")",
++        s_log(LOG_WARNING, "Connection to service %s from %s REFUSED by IDENT (user \"%s\")",
++            c->opt->servname,
+             c->accepted_address, user);
          str_free(line);
-         longjmp(c->err, 1);
-     }
+         throw_exception(c, 1);