diff options
| -rw-r--r-- | make/configure.pm | 4 | ||||
| -rw-r--r-- | make/gnutlscert.pm | 12 |
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 # |