[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts DSDialogs.pm, 1.5, 1.6 Util.pm.in, 1.12, 1.13 setup-ds.res.in, 1.11, 1.12

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19191/ldapserver/ldap/admin/src/scripts

Modified Files:
	DSDialogs.pm Util.pm.in setup-ds.res.in 
Log Message:
Resolves: bug 371771
Bug Description: '.' (dot) in the server ID
Reviewed by: nkinder (Thanks!)
Fix Description: Remove . and , from the characters allowed in the server ID.  Also use the more descriptive error message.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none



Index: DSDialogs.pm
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSDialogs.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DSDialogs.pm	15 Aug 2007 22:04:31 -0000	1.5
+++ DSDialogs.pm	21 Nov 2007 20:27:38 -0000	1.6
@@ -99,9 +99,9 @@
         my $res = $DialogManager::SAME;
         my $path = $self->{manager}->{setup}->{configdir} . "/slapd-" . $ans;
         if (!isValidServerID($ans)) {
-            $self->{manager}->alert("dialog_dsserverid_error", $ans);
+            $self->{manager}->alert("error_invalid_serverid", $ans);
         } elsif (-d $path) {
-            $self->{manager}->alert("dialog_dsserverid_inuse", $ans);
+            $self->{manager}->alert("error_server_already_exists", $path);
         } else {
             $res = $DialogManager::NEXT;
             $self->{manager}->{inf}->{slapd}->{ServerIdentifier} = $ans;


Index: Util.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Util.pm.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Util.pm.in	14 Sep 2007 02:41:13 -0000	1.12
+++ Util.pm.in	21 Nov 2007 20:27:38 -0000	1.13
@@ -107,7 +107,7 @@
 
 sub isValidServerID {
     my $servid = shift;
-    my $validchars = '#%,.:\w at _-';
+    my $validchars = '#%:\w at _-';
     return $servid =~ /^[$validchars]+$/o;
 }
 


Index: setup-ds.res.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/setup-ds.res.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- setup-ds.res.in	11 Oct 2007 14:10:00 -0000	1.11
+++ setup-ds.res.in	21 Nov 2007 20:27:38 -0000	1.12
@@ -108,7 +108,7 @@
 program, or low port restriction.  Please choose another value for\
 ServerPort.  Error: $!\n
 error_invalid_serverid = The ServerIdentifier '%s' contains invalid characters.  It must\
-contain only alphanumeric characters and the following: #%,.:@_-\n
+contain only alphanumeric characters and the following: #%:@_-\n\n
 error_opening_scripttmpl = Could not open the script template file '%s'.  Error: %s\n
 error_creating_directory = Could not create directory '%s'.  Error: %s\n
 error_chowning_directory = Could not change ownership of directory '%s' to userid '%s': Error: %s\n