summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-05-05 20:53:26 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-05-05 20:53:26 +0000
commit3f8f4808f239f05d20da3e320d20974c3fb02263 (patch)
tree657505df21d8aff5549509adcb4b8c1887bef52a
parent4934648e234538a7324c0a47836350a9be8b1fc0 (diff)
Fix for bug typo, dont let it creep into the release!
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6892 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--make/configure.pm4
-rw-r--r--make/gnutlscert.pm12
2 files changed, 8 insertions, 8 deletions
diff --git a/make/configure.pm b/make/configure.pm
index dd2dc9089..f7b1b16e0 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -11,7 +11,7 @@ package make::configure;
use Exporter 'import';
use POSIX;
use make::utilities;
-@EXPORT = qw(promptnumeric dumphash is_dir getmodules getrevision getcompilerflags getlinkerflags getdependencies resolve_directory yesno showhelp promptstring);
+@EXPORT = qw(promptnumeric dumphash is_dir getmodules getrevision getcompilerflags getlinkerflags getdependencies resolve_directory yesno showhelp promptstring_s);
my $no_svn = 0;
@@ -148,7 +148,7 @@ sub promptnumeric($$)
}
}
-sub promptstring($$)
+sub promptstring_s($$)
{
my ($prompt,$default) = @_;
my $var;
diff --git a/make/gnutlscert.pm b/make/gnutlscert.pm
index d05f6f6a2..a28131f3e 100644
--- a/make/gnutlscert.pm
+++ b/make/gnutlscert.pm
@@ -9,12 +9,12 @@ 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
#