[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts DialogManager.pm, 1.5, 1.6 setup-ds.res.in, 1.13, 1.14

[Nathan Kinder]

Author: nkinder

Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8393/ldap/admin/src/scripts

Modified Files:
	DialogManager.pm setup-ds.res.in 
Log Message:
Resolves: 463776
Summary: Make "back" reponse in setup code work correctly.



Index: DialogManager.pm
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DialogManager.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DialogManager.pm	27 Jul 2007 01:46:10 -0000	1.5
+++ DialogManager.pm	17 Dec 2008 18:58:21 -0000	1.6
@@ -104,7 +104,7 @@
     }
 
     # the word "back"
-    if ($ans =~ /back/i) {
+    if ($ans =~ /^\s*back\s*$/i) {
         return 1;
     }
     # a Ctrl-B sequence


Index: setup-ds.res.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/setup-ds.res.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- setup-ds.res.in	14 Jul 2008 23:20:23 -0000	1.13
+++ setup-ds.res.in	17 Dec 2008 18:58:21 -0000	1.14
@@ -7,7 +7,7 @@
 dialog_use_different_type = When using Silent or Express mode, some of the\ndialogs are skipped, but validation is still performed\non the default or given answers.  You should run this program again and\nchoose Typical or Custom mode in order to provide a valid input\nfor the problem dialog.\n\n
 
 # ------------ Welcome Dialog Resource ------------
-dialog_welcome_text = This program will set up the %s Directory Server.\n\nIt is recommended that you have "root" privilege to set up the software.\nTips for using this  program:\n  - Press "Enter" to choose the default and go to the next screen\n  - Type "Control-B" then "Enter" to go back to the previous screen\n  - Type "Control-C" to cancel the setup program\n\n
+dialog_welcome_text = This program will set up the %s Directory Server.\n\nIt is recommended that you have "root" privilege to set up the software.\nTips for using this  program:\n  - Press "Enter" to choose the default and go to the next screen\n  - Type "Control-B" or the word "back" then "Enter" to go back to the previous screen\n  - Type "Control-C" to cancel the setup program\n\n
 # %s -> brand
 
 dialog_welcome_prompt = Would you like to continue with set up?
@@ -68,7 +68,7 @@
 dialog_dssuffix_error = The suffix '%s' is not a valid DN.  Please choose another one.\n\n
 
 # ----------- DS Root DN and password Dialog Resource  ----------------
-dialog_dsrootdn_text = Certain directory server operations require an administrative user.\nThis user is referred to as the Directory Manager and typically has a\nbind Distinguished Name (DN) of cn=Directory Manager.\nYou will also be prompted for the password for this user.  The password must\nbe at least 8 characters long, and contain no spaces.\nPress Control-B then Enter to back up and start over.\n\n
+dialog_dsrootdn_text = Certain directory server operations require an administrative user.\nThis user is referred to as the Directory Manager and typically has a\nbind Distinguished Name (DN) of cn=Directory Manager.\nYou will also be prompted for the password for this user.  The password must\nbe at least 8 characters long, and contain no spaces.\nPress Control-B or type the word "back", then Enter to back up and start over.\n\n
 dialog_dsrootdn_prompt = Directory Manager DN
 dialog_dsrootdn_error = The input '%s' is not a valid DN.  Please choose another one.\n\n
 dialog_dsrootpw_prompt1 = Password
@@ -126,4 +126,4 @@
 Please remove it first if you really want to recreate it,\
 or use a different ServerIdentifier to create another instance.\n
 error_opening_init_ldif = Could not open the initial LDIF file '%s'.\
-The file was not found or could not be read.\n
\ No newline at end of file
+The file was not found or could not be read.\n