INN commit: trunk/nnrpd (sasl.c)

INN Commit Russ_Allbery at isc.org
Sun Mar 15 10:00:38 UTC 2009


    Date: Sunday, March 15, 2009 @ 03:00:38
  Author: iulius
Revision: 8381

Revert commit 8268 about AUTHINFO SASL:

The knowledge acquired since the beginning of a session
should not be reset when no security layer has been negotiated
during the SASL exchange.

Modified:
  trunk/nnrpd/sasl.c

--------+
 sasl.c |   30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

Modified: sasl.c
===================================================================
--- sasl.c	2009-03-10 20:07:49 UTC (rev 8380)
+++ sasl.c	2009-03-15 10:00:38 UTC (rev 8381)
@@ -305,20 +305,22 @@
 	sasl_maxout =
 	    (*maxoutp == 0 || *maxoutp > NNTP_MAXLEN_COMMAND) ? NNTP_MAXLEN_COMMAND : *maxoutp;
 
-        /* Close out any existing article, report group stats.
-         * RFC 4643 requires the reset of any knowledge about the client. */
-        if (GRPcur) {
-            bool boolval;
-            ARTclose();
-            GRPreport();
-            OVctl(OVCACHEFREE, &boolval);
-            free(GRPcur);
-            GRPcur = NULL;
-            if (ARTcount)
-                syslog(L_NOTICE, "%s exit for AUTHINFO SASL articles %ld groups %ld",
-                       Client.host, ARTcount, GRPcount);
-            GRPcount = 0;
-            PERMgroupmadeinvalid = false;
+        if (sasl_ssf > 0) {
+            /* Close out any existing article, report group stats.
+             * RFC 4643 requires the reset of any knowledge about the client. */
+            if (GRPcur) {
+                bool boolval;
+                ARTclose();
+                GRPreport();
+                OVctl(OVCACHEFREE, &boolval);
+                free(GRPcur);
+                GRPcur = NULL;
+                if (ARTcount)
+                    syslog(L_NOTICE, "%s exit for AUTHINFO SASL articles %ld groups %ld",
+                           Client.host, ARTcount, GRPcount);
+                GRPcount = 0;
+                PERMgroupmadeinvalid = false;
+            }
         }
     } else {
 	/* Failure. */




More information about the inn-committers mailing list