INN commit: trunk (include/inn/nntp.h include/nntp.h nnrpd/sasl.c)

[INN Commit]

    Date: Saturday, September 20, 2008 @ 01:19:28
  Author: iulius
Revision: 8036

Return 482 instead of 483 after a failure in AUTHINFO SASL.
Add new NNTP_FAIL_PRIVACY_NEEDED 483 code.

Modified:
  trunk/include/inn/nntp.h
  trunk/include/nntp.h
  trunk/nnrpd/sasl.c

--------------------+
 include/inn/nntp.h |   15 ++++++++++++---
 include/nntp.h     |   13 -------------
 nnrpd/sasl.c       |    2 +-
 3 files changed, 13 insertions(+), 17 deletions(-)

Modified: include/inn/nntp.h
===================================================================
--- include/inn/nntp.h	2008-09-20 07:22:30 UTC (rev 8035)
+++ include/inn/nntp.h	2008-09-20 08:19:28 UTC (rev 8036)
@@ -90,7 +90,12 @@
     NNTP_FAIL_CHECK_REFUSE      = 438,
     NNTP_FAIL_TAKETHIS_REJECT   = 439,
 
-    /* Authentication extension. */
+    /*
+    **  Authentication extensions:
+    **    - Generic 480 code;
+    **    - AUTHINFO capability;
+    **    - SASL capability.
+    */
     NNTP_OK_AUTHINFO            = 281,
     NNTP_OK_SASL                = 283,
     NNTP_CONT_AUTHINFO          = 381,
@@ -99,9 +104,13 @@
     NNTP_FAIL_AUTHINFO_BAD      = 481,
     NNTP_FAIL_AUTHINFO_REJECT   = 482,
 
-    /* TLS extension.  (These codes will change.) */
+    /*
+    **  Privacy extensions:
+    **    - Generic 483 code;
+    **    - STARTTLS capability.
+    */
     NNTP_CONT_STARTTLS          = 382,
-    NNTP_FAIL_STARTTLS          = 483,
+    NNTP_FAIL_PRIVACY_NEEDED    = 483,
     NNTP_ERR_STARTTLS           = 580,
 
     /* XGTITLE extension (deprecated, use LIST NEWSGROUPS). */

Modified: include/nntp.h
===================================================================
--- include/nntp.h	2008-09-20 07:22:30 UTC (rev 8035)
+++ include/nntp.h	2008-09-20 08:19:28 UTC (rev 8036)
@@ -75,22 +75,9 @@
 #define NNTP_AUTH_NEEDED		"480"
 #define NNTP_AUTH_BAD			"481"
 #define NNTP_AUTH_NEXT			"381"
-#define NNTP_AUTH_SASL_CHAL		"383"
 #define NNTP_AUTH_OK			"281"
-#define NNTP_AUTH_SASL_OK		"283"
 
 /*
-**  Starttls commands (not official).
-*/
-#define NNTP_STARTTLS_NEXT		"382"
-#define NNTP_STARTTLS_DONE		"483"
-#define NNTP_STARTTLS_BAD		"580"
-
-/*
-**  XGTITLE, from ANU news.
-*/
-
-/*
 **  MODE CANCEL extension.
 */
 #define NNTP_OK_CANCELLED       "289"

Modified: nnrpd/sasl.c
===================================================================
--- nnrpd/sasl.c	2008-09-20 07:22:30 UTC (rev 8035)
+++ nnrpd/sasl.c	2008-09-20 08:19:28 UTC (rev 8036)
@@ -223,7 +223,7 @@
 	    resp_code = NNTP_ERR_SYNTAX;
 	    break;
 	case SASL_ENCRYPT:
-	    resp_code = NNTP_FAIL_STARTTLS;
+	    resp_code = NNTP_FAIL_AUTHINFO_REJECT;
 	    break;
 	default:
 	    resp_code = NNTP_FAIL_AUTHINFO_BAD;