Browse Source

Ticket 433 - multiple bugs in start-dirsrv, stop-dirsrv, restart-dirsrv scripts

Description:  Need to use error_reserved_serverid in DSCreate.pm, and fix inconsistent
              quoting in error_reserved_serverid

Reviewed by: richm(Thanks!)

https://fedorahosted.org/389/ticket/433
Mark Reynolds 13 years ago
parent
commit
54112e4c48
2 changed files with 2 additions and 2 deletions
  1. 1 1
      ldap/admin/src/scripts/DSCreate.pm.in
  2. 1 1
      ldap/admin/src/scripts/setup-ds.res.in

+ 1 - 1
ldap/admin/src/scripts/DSCreate.pm.in

@@ -123,7 +123,7 @@ sub sanityCheckParams {
     }
 
     if($inf->{slapd}->{ServerIdentifier} eq "admin"){
-        return ('error_invalid_serverid - "admin" is reserved for the Admininstration Server, please choose a different server identifier');
+        return ('error_reserved_serverid' ,"admin");
     } elsif (!isValidServerID($inf->{slapd}->{ServerIdentifier})) {
         return ('error_invalid_serverid', $inf->{slapd}->{ServerIdentifier});
     } elsif (-d $inf->{slapd}->{config_dir}) {

+ 1 - 1
ldap/admin/src/scripts/setup-ds.res.in

@@ -105,7 +105,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\n
-error_reserved_serverid = The ServerIdentifier '%s" is reserved for the Administration Server, please choose a different server identifier.\n
+error_reserved_serverid = The ServerIdentifier '%s' is reserved for the Administration Server, please choose a different server identifier.\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