Added missing contrib/platformtest.sh to distribution

Print "SSLOptionVar =" instead of omitting the option when
running --configtest with ssl enabled.
This better matches the behaviour of other options, e.g.  ChrootDir.

ChangeLog

@@ -10,7 +10,9 @@
                                -- ChangeLog --
 
 
-ngIRCd Release 15
+ngIRCd Release 15 (2009-11-07)
+
+  - "ngircd --configtest": print SSL configuration options even when unset.
 
   ngIRCd 15~rc1 (2009-10-15)
   - Do not add default listening port (6667) if SSL ports were specified, so

NEWS

@@ -10,7 +10,7 @@
                                   -- NEWS --
 
 
-ngIRCd Release 15
+ngIRCd Release 15 (2009-11-07)
 
   ngIRCd 15~rc1 (2009-10-15)
   - Do not add default listening port (6667) if SSL ports were specified, so

configure.in

@@ -12,7 +12,7 @@
 # -- Initialisation --
 
 AC_PREREQ(2.50)
-AC_INIT(ngircd, 15~rc1)
+AC_INIT(ngircd, 15)
 AC_CONFIG_SRCDIR(src/ngircd/ngircd.c)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(1.6)

contrib/Debian/changelog

@@ -1,3 +1,9 @@
+ngircd (15-0ab1) unstable; urgency=low
+
+  * New "upstream" release: ngIRCd 15.
+
+ -- Alexander Barton <alex@barton.de>  Thu,  7 Nov 2009 12:07:08 +0200
+
 ngircd (15~rc1-0ab1) unstable; urgency=low
 
   * New "upstream" release candidate 1 for ngIRCd Release 15.

contrib/Makefile.am

@@ -12,7 +12,7 @@
 SUBDIRS = Debian MacOSX
 
 EXTRA_DIST = README ngircd.spec systrace.policy ngindent ngircd-bsd.sh \
-	ngircd-redhat.init
+	ngircd-redhat.init platformtest.sh
 
 maintainer-clean-local:
 	rm -f Makefile Makefile.in

contrib/ngircd.spec

@@ -1,5 +1,5 @@
 %define name    ngircd
-%define version 15~rc1
+%define version 15
 %define release 1
 %define prefix  %{_prefix}
 

src/ngircd/conf.c

@@ -96,38 +96,42 @@ ConfSSL_Init(void)
 }
 
 static bool
-can_open(const char *name, const char *file)
+ssl_print_configvar(const char *name, const char *file)
 {
-	FILE *fp = fopen(file, "r");
+	FILE *fp;
+
+	if (!file) {
+		printf("  %s =\n", name);
+		return true;
+	}
+
+	fp = fopen(file, "r");
 	if (fp)
 		fclose(fp);
 	else
 		fprintf(stderr, "ERROR: %s \"%s\": %s\n",
 			name, file, strerror(errno));
+
+	printf("  %s = %s\n", name, file);
 	return fp != NULL;
 }
 
 static bool
 ConfSSL_Puts(void)
 {
-	bool ret = true;
+	bool ret;
 
-	if (Conf_SSLOptions.KeyFile) {
+	ret = ssl_print_configvar("SSLKeyFile", Conf_SSLOptions.KeyFile);
-		printf( "  SSLKeyFile = %s\n", Conf_SSLOptions.KeyFile);
+
-		ret = can_open("SSLKeyFile", Conf_SSLOptions.KeyFile);
+	if (!ssl_print_configvar("SSLCertFile", Conf_SSLOptions.CertFile))
-	}
-	if (Conf_SSLOptions.CertFile) {
-		printf( "  SSLCertFile = %s\n", Conf_SSLOptions.CertFile);
-		if (!can_open("SSLCertFile", Conf_SSLOptions.CertFile))
 		ret = false;
-	}
+
-	if (Conf_SSLOptions.DHFile) {
+	if (!ssl_print_configvar("SSLDHFile", Conf_SSLOptions.DHFile))
-		printf( "  SSLDHFile = %s\n", Conf_SSLOptions.DHFile);
-		if (!can_open("SSLDHFile", Conf_SSLOptions.DHFile))
 		ret = false;
-	}
+
 	if (array_bytes(&Conf_SSLOptions.KeyFilePassword))
-		puts("  SSLKeyFilePassword = <secret>"  );
+		puts("  SSLKeyFilePassword = <secret>");
+
 	array_free_wipe(&Conf_SSLOptions.KeyFilePassword);
 
 	return ret;