Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 16 Aug 2015 23:25:19 +0000 (UTC)
From:      Ashish SHUKLA <ashish@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r394432 - in head/mail/opensmtpd: . files
Message-ID:  <201508162325.t7GNPJaA032514@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: ashish
Date: Sun Aug 16 23:25:19 2015
New Revision: 394432
URL: https://svnweb.freebsd.org/changeset/ports/394432

Log:
  - Fix typos in the patch committed in r394424
  
  Reported by:	adamw

Modified:
  head/mail/opensmtpd/Makefile
  head/mail/opensmtpd/files/patch-usernamelen

Modified: head/mail/opensmtpd/Makefile
==============================================================================
--- head/mail/opensmtpd/Makefile	Sun Aug 16 22:32:20 2015	(r394431)
+++ head/mail/opensmtpd/Makefile	Sun Aug 16 23:25:19 2015	(r394432)
@@ -3,7 +3,7 @@
 
 PORTNAME=	opensmtpd
 PORTVERSION=	5.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.opensmtpd.org/archives/ \

Modified: head/mail/opensmtpd/files/patch-usernamelen
==============================================================================
--- head/mail/opensmtpd/files/patch-usernamelen	Sun Aug 16 22:32:20 2015	(r394431)
+++ head/mail/opensmtpd/files/patch-usernamelen	Sun Aug 16 23:25:19 2015	(r394432)
@@ -6,7 +6,7 @@ index 3a0ca2a..404ee50 100644
  	SF_BADINPUT		= 0x0080,
  	SF_FILTERCONN		= 0x0100,
  	SF_FILTERDATA		= 0x0200,
-+	SF_USERTOLONG		= 0x0400,
++	SF_USERTOOLONG		= 0x0400,
  };
  
  enum message_flags {
@@ -24,11 +24,11 @@ index 3a0ca2a..404ee50 100644
  		s = tree_xpop(&wait_parent_auth, reqid);
  		strnvis(user, s->username, sizeof user, VIS_WHITE | VIS_SAFE);
 +
-+		if (s->flags & SF_USERTOLONG) {
++		if (s->flags & SF_USERTOOLONG) {
 +			log_info("smtp-in: sesson %016"PRIx64
-+				": auth failed because username to long",
++				": auth failed because username too long",
 +				s->id);
-+			s->flags &= (~SF_USERTOLONG);
++			s->flags &= (~SF_USERTOOLONG);
 +			success = LKA_PERMFAIL;
 +		}
 +
@@ -40,7 +40,7 @@ index 3a0ca2a..404ee50 100644
  		if (strlcpy(s->username, user, sizeof(s->username))
  		    >= sizeof(s->username))
 -			goto abort;
-+			s->flags |= SF_USERTOLONG;
++			s->flags |= SF_USERTOOLONG;
  
  		pass = memchr(user, '\0', len - (user - buf));
  		if (pass == NULL || pass >= buf + len - 2)
@@ -55,7 +55,7 @@ index 3a0ca2a..404ee50 100644
  			goto abort;
 +		if (strlcpy(s->username, buf, sizeof(s->username))
 +		    >= sizeof(s->username))
-+			s->flags |= SF_USERTOLONG;
++			s->flags |= SF_USERTOOLONG;
  
  		smtp_enter_state(s, STATE_AUTH_PASSWORD);
  		smtp_reply(s, "334 UGFzc3dvcmQ6");

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508162325.t7GNPJaA032514>