INN commit: branches/2.6/nnrpd (Makefile perm.c sasl.c)

[INN Commit]

    Date: Sunday, November 6, 2016 @ 06:23:27
  Author: iulius
Revision: 10117

Fix build when SASL support is enabled but not TLS support

Modified:
  branches/2.6/nnrpd/Makefile
  branches/2.6/nnrpd/perm.c
  branches/2.6/nnrpd/sasl.c

----------+
 Makefile |    4 ++--
 perm.c   |    7 ++++---
 sasl.c   |    1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

Modified: Makefile
===================================================================
--- Makefile	2016-11-06 14:23:01 UTC (rev 10116)
+++ Makefile	2016-11-06 14:23:27 UTC (rev 10117)
@@ -233,7 +233,7 @@
   ../include/inn/libinn.h ../include/inn/concat.h ../include/inn/xmalloc.h \
   ../include/inn/xwrite.h ../include/inn/nntp.h ../include/inn/paths.h \
   ../include/inn/storage.h ../include/inn/options.h \
-  ../include/inn/vector.h ../include/inn/timer.h
+  ../include/inn/vector.h ../include/inn/timer.h tls.h
 post.o: post.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/macros.h \
   ../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
@@ -271,7 +271,7 @@
   ../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/nntp.h \
   ../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
   ../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
-  ../include/inn/history.h ../include/inn/storage.h
+  ../include/inn/history.h ../include/inn/storage.h tls.h
 tls.o: tls.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/macros.h \
   ../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \

Modified: perm.c
===================================================================
--- perm.c	2016-11-06 14:23:01 UTC (rev 10116)
+++ perm.c	2016-11-06 14:23:27 UTC (rev 10117)
@@ -15,6 +15,7 @@
 #include "inn/innconf.h"
 #include "innperl.h"
 #include "nnrpd.h"
+#include "tls.h"
 
 /* Needed on AIX 4.1 to get fd_set and friends. */
 #ifdef HAVE_SYS_SELECT_H
@@ -633,7 +634,7 @@
 authdecl_parse(AUTHGROUP *curauth, CONFFILE *f, CONFTOKEN *tok)
 {
     int oldtype;
-#ifdef HAVE_OPENSSL
+#if defined(HAVE_OPENSSL) || defined(HAVE_SASL)
     int boolval;
 #endif
     METHOD *m;
@@ -655,7 +656,7 @@
 	ReportError(f, buff);
     }
 
-#ifdef HAVE_OPENSSL
+#if defined(HAVE_OPENSSL) || defined(HAVE_SASL)
     if (strcasecmp(tok->name, "on") == 0
         || strcasecmp(tok->name, "true") == 0
         || strcasecmp(tok->name, "yes") == 0)
@@ -1415,7 +1416,7 @@
 #else
     PERMcanauthenticate = false;
 #endif
-#ifdef HAVE_OPENSSL
+#if defined(HAVE_OPENSSL) || defined(HAVE_SASL)
     PERMcanauthenticatewithoutSSL = false;
 #endif
     PERMgroupmadeinvalid = false;

Modified: sasl.c
===================================================================
--- sasl.c	2016-11-06 14:23:01 UTC (rev 10116)
+++ sasl.c	2016-11-06 14:23:27 UTC (rev 10117)
@@ -12,6 +12,7 @@
 
 /* Outside the ifdef so that make depend works even ifndef HAVE_OPENSSL. */
 #include "inn/ov.h"
+#include "tls.h"
 
 #if defined(HAVE_OPENSSL)
 extern int tls_cipher_usebits;