Fix delayjoin adding an extra @ prefix mode

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

diff --git a/make/gnutlscert.pm b/make/gnutlscert.pm
index d05f6f6a20b0c3c9041b97a93bb0650325c1cb02..822c27268471ec5501a6df083ccd4f3468091eb5 100644 (file)
--- a/make/gnutlscert.pm
+++ b/make/gnutlscert.pm
@@ -1,20 +1,37 @@
+#       +------------------------------------+
+#       | Inspire Internet Relay Chat Daemon |
+#       +------------------------------------+
+#
+#  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+# See: http://www.inspircd.org/wiki/index.php/Credits
+#
+# This program is free but copyrighted software; see
+#      the file COPYING for details.
+#
+# ---------------------------------------------------
+
 package make::gnutlscert;
 
+require 5.8.0;
+
+use strict;
+use warnings FATAL => qw(all);
+
 use Exporter 'import';
 use make::configure;
-@EXPORT = qw(make_gnutls_cert);
+our @EXPORT = qw(make_gnutls_cert);
 
 
 sub make_gnutls_cert()
 {
        open (FH, ">certtool.template");
        my $timestr = time();
-       my $org = promptstring("Please enter the organization name", "My IRC Network");
-       my $unit = promptstring("Please enter the unit Name", "Server Admins");
-       my $state = promptstring("Pleae enter your state (two letter code)", "CA");
-       my $country = promptstring("Please enter your country", "Oompa Loompa Land");
-       my $commonname = promptstring("Please enter the certificate common name (hostname)", "irc.mynetwork.com");
-       my $email = promptstring("Please enter a contact email address", "oompa\@loompa.com");
+       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("Pleae enter your state (two letter code)", "CA");
+       my $country = promptstring_s("Please enter your country", "Oompa Loompa Land");
+       my $commonname = promptstring_s("Please enter the certificate common name (hostname)", "irc.mynetwork.com");
+       my $email = promptstring_s("Please enter a contact email address", "oompa\@loompa.com");
        print FH <<__END__;
 # X.509 Certificate options
 #
@@ -106,9 +123,11 @@ ocsp_signing_key
 time_stamping_key
 __END__
 close(FH);
-system("certtool --generate-privkey --outfile key.pem");
-system("certtool --generate-self-signed --load-privkey key.pem --outfile cert.pem --template certtool.template");
+if ( (my $status = system("certtool --generate-privkey --outfile key.pem")) ne 0) { return 1; }
+if ( (my $status = system("certtool --generate-self-signed --load-privkey key.pem --outfile cert.pem --template certtool.template")) ne 0) { return 1; }
 unlink("certtool.template");
+return 0;
 }
 
 1;
+