[Openvas-commits] r5448 - trunk/openvas-scanner

[scm-commit@wald.intevation.org]

Author: jan
Date: 2009-10-09 09:23:05 +0200 (Fri, 09 Oct 2009)
New Revision: 5448

Modified:
   trunk/openvas-scanner/ChangeLog
   trunk/openvas-scanner/openvas-mkcert-client.in
   trunk/openvas-scanner/openvas-mkcert.in
Log:
* openvas-mkcert-client.in, openvas-mkcert.in: Changed Paris to Berlin
for the default.



Modified: trunk/openvas-scanner/ChangeLog
===================================================================
--- trunk/openvas-scanner/ChangeLog	2009-10-08 22:41:39 UTC (rev 5447)
+++ trunk/openvas-scanner/ChangeLog	2009-10-09 07:23:05 UTC (rev 5448)
@@ -1,3 +1,8 @@
+2009-10-09  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
+
+	* openvas-mkcert-client.in, openvas-mkcert.in: Changed Paris to Berlin
+	for the default.
+
 2009-10-08  Michael Wiegand <michael.wiegand at intevation.de>
 
 	* openvassd/otp_1_0.c (otp_1_0_server_send_certificates): Added todo

Modified: trunk/openvas-scanner/openvas-mkcert-client.in
===================================================================
--- trunk/openvas-scanner/openvas-mkcert-client.in	2009-10-08 22:41:39 UTC (rev 5447)
+++ trunk/openvas-scanner/openvas-mkcert-client.in	2009-10-09 07:23:05 UTC (rev 5448)
@@ -206,11 +206,11 @@
 if [ ! -z "$LANG" ]; then
     DC=`echo $LANG | sed -n 's/^..*_\(..\)$/\1/p'`
 fi
-X=${DC:=FR}
+X=${DC:=DE}
 eval_gettext "Your country \${Bo}two letter code\${Bc} [\$X]: "; read x
 DFL_COUNTRY=${x:-$DC}
 gettext "Your state or province name [none]: "; read DFL_PROVINCE
-X=Paris; 
+X=Berlin; 
 eval_gettext "Your location \${Bo}e.g. town\${Bc} [\$X]: "; read x
 DFL_LOCATION=${x:-$X}
 gettext "Your organization [none]: "; read DFL_ORGANIZATION
@@ -263,7 +263,7 @@
 
 [ req_distinguished_name ]
 countryName			= Country Name (2 letter code)
-countryName_default		= FR
+countryName_default		= DE
 countryName_min			= 2
 countryName_max			= 2
 

Modified: trunk/openvas-scanner/openvas-mkcert.in
===================================================================
--- trunk/openvas-scanner/openvas-mkcert.in	2009-10-08 22:41:39 UTC (rev 5447)
+++ trunk/openvas-scanner/openvas-mkcert.in	2009-10-09 07:23:05 UTC (rev 5448)
@@ -204,13 +204,13 @@
 
 # Default country = France
 # Too bad for you, but quicker for my tests!
-X=${DC:=FR}
+X=${DC:=DE}
 eval_gettext "Your country \${Bo}two letter code\${Bc} [\$X]: "; read x
 COUNTRY=${x:-$DC}
 #
 gettext "Your state or province name [none]: "; read x
 PROVINCE=${x:-.}
-X=Paris; eval_gettext "Your location \${Bo}e.g. town\${Bc} [\$X]: "; read x
+X=Berlin; eval_gettext "Your location \${Bo}e.g. town\${Bc} [\$X]: "; read x
 LOCATION=${x:-$X}
 X="OpenVAS Users United"; eval_gettext "Your organization [\$X]: "; read x
 ORGANIZATION=${x:-$X}
@@ -221,9 +221,9 @@
 else 
 CACERT_LIFETIME="1460"
 SRVCERT_LIFETIME="365"
-COUNTRY="FR"
+COUNTRY="DE"
 PROVINCE="none"
-LOCATION="Paris"
+LOCATION="Berlin"
 ORGANIZATION="OpenVAS Users United"
 fi
 
@@ -273,7 +273,7 @@
 
 [ req_distinguished_name ]
 countryName			= Country Name (2 letter code)
-countryName_default		= FR
+countryName_default		= DE
 countryName_min			= 2
 countryName_max			= 2