ldap/admin/src/scripts/DSCreate.pm.in | 2 +- ldap/admin/src/scripts/setup-ds.res.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

New commits: commit 54112e4c4867bf7b1d9dcf928155dc4160304464 Author: Mark Reynolds mreynolds@redhat.com Date: Wed Jan 30 10:28:14 2013 -0500

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

diff --git a/ldap/admin/src/scripts/DSCreate.pm.in b/ldap/admin/src/scripts/DSCreate.pm.in index a3b8fe7..46ca578 100644 --- a/ldap/admin/src/scripts/DSCreate.pm.in +++ b/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}) { diff --git a/ldap/admin/src/scripts/setup-ds.res.in b/ldap/admin/src/scripts/setup-ds.res.in index 401722e..ddda771 100644 --- a/ldap/admin/src/scripts/setup-ds.res.in +++ b/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