Fix uninit pointer on MySQL initial connection

[user/henk/code/inspircd.git] / make / opensslcert.pm

diff --git a/make/opensslcert.pm b/make/opensslcert.pm
index 2caad06cd8b2eb9976f17203fa1d500740af8445..99fee79970f008a44aca3f810274376b1ed7977b 100644 (file)
--- a/make/opensslcert.pm
+++ b/make/opensslcert.pm
@@ -1,8 +1,25 @@
+#       +------------------------------------+
+#       | Inspire Internet Relay Chat Daemon |
+#       +------------------------------------+
+#
+#  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+# See: http://wiki.inspircd.org/Credits
+#
+# This program is free but copyrighted software; see
+#      the file COPYING for details.
+#
+# ---------------------------------------------------
+
 package make::opensslcert;
 
+require 5.8.0;
+
+use strict;
+use warnings FATAL => qw(all);
+
 use Exporter 'import';
 use make::configure;
-@EXPORT = qw(make_openssl_cert);
+our @EXPORT = qw(make_openssl_cert);
 
 
 sub make_openssl_cert()
@@ -10,21 +27,25 @@ sub make_openssl_cert()
        open (FH, ">openssl.template");
        my $org = promptstring_s("Please enter the organization name", "My IRC Network");
        my $unit = promptstring_s("Please enter the unit Name", "Server Admins");
-       my $state = promptstring_s("Please enter your state or locality name", "Alaska");
        my $country = promptstring_s("Please enter your country (two letter code)", "US");
+       my $state = promptstring_s("Please enter your state or locality name", "Alaska");
        my $city = promptstring_s("Please enter your city", "Factory Town");
        my $email = promptstring_s("Please enter a contact email address", "oompa\@loompa.com");
+       my $commonname = promptstring_s("Please enter the common name (domain name) of the irc server", "example.inspircd.org");
        print FH <<__END__;
 $country
 $state
 $city
 $org
 $unit
+$commonname
 $email
-firstname.lastname@yourcompany.com
 __END__
 close(FH);
-system("cat openssl.template | openssl req -x509 -nodes -newkey rsa:1024 -keyout key.pem -out cert.pem 2>/dev/null");
+
+my $time = promptstring_s("Please enter the number of days that this certificate is valid for","365");
+
+system("cat openssl.template | openssl req -x509 -nodes -newkey rsa:1024 -keyout key.pem -out cert.pem -days $time 2>/dev/null");
 system("openssl dhparam -out dhparams.pem 1024");
 unlink("openssl.template");
 }