admserv/newinst

[Richard Allen Megginson]

admserv/newinst/src/AdminUtil.pm.in       |   11 ++++++++++-
 admserv/newinst/src/setup-ds-admin.res.in |   15 ++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

New commits:
commit 7c7b49a7b50c60a5eb5a32cf5d757f4fc7e5612d
Author: Rich Megginson 
Date:   Wed Oct 2 16:17:39 2013 -0600

Ticket #47498 Error Message for Failed to create the configuration directory server

https://fedorahosted.org/389/ticket/47498
    Reviewed by: mreynolds (Thanks!)
    Branch: master
    Fix Description: The Mozilla::LDAP API does not allow retrieving the error
    code.  Print a generic error message for help with diagnosing connection
    problems.
    Platforms tested: RHEL6 x86_64
    Flag Day: no
    Doc impact: no

diff --git a/admserv/newinst/src/AdminUtil.pm.in b/admserv/newinst/src/AdminUtil.pm.in
index b33b601..27130e0 100644
--- a/admserv/newinst/src/AdminUtil.pm.in
+++ b/admserv/newinst/src/AdminUtil.pm.in
@@ -195,7 +195,16 @@ sub getConfigDSConn {
             $conn->close();
             $conn = 0;
         }
-        push @{$errs}, 'configds_open_error', $url, (($errstr eq "Success") ? 'unknown error' : $errstr);
+        if ($certdir) {
+            push @{$errs}, 'configds_open_error_ssl', $url,
+                 ($errstr eq "Success") ? 'unknown error' : $errstr,
+                 $h->{host}, $h->{port}, $h->{host}, $h->{host}, $certdir, $h->{host}, $h->{port};
+        } else {
+            push @{$errs}, 'configds_open_error', $url,
+                 ($errstr eq "Success") ? 'unknown error' : $errstr,
+                 $h->{host}, $h->{port}, $h->{host}, $h->{host}, $h->{host}, $h->{port};
+        }
+                                                     
         return $conn;
     }

diff --git a/admserv/newinst/src/setup-ds-admin.res.in b/admserv/newinst/src/setup-ds-admin.res.in
index ee3dfea..e83d045 100644
--- a/admserv/newinst/src/setup-ds-admin.res.in
+++ b/admserv/newinst/src/setup-ds-admin.res.in
@@ -78,7 +78,20 @@ dialog_configdsadmindomain_error = The string '%s' is not a valid administration
 dialog_configdsadmindomain_notadn = The administration domain must not be a DN.  The string '%s' looks like a DN.  Please choose another one.\n\n

# other messages
-configds_open_error = The server '%s' is not reachable.  Error: %s\n\n
+configds_open_error = The server at URL '%s' is not reachable.  Error: %s\
+Please make sure that:\
+* The host %s and port %d are correct and can be resolved\
+** getent hosts %s # returns correct IP address\
+** getent hosts CORRECTIP # returns %s\
+** nc %s %d # responds\n\n
+configds_open_error_ssl = The server at URL '%s' is not reachable.  Error: %s\
+Please make sure that:\
+* The host %s and port %d are correct and can be resolved\
+** The host %s is the fully qualified host and domain name (required for SSL)\
+** getent hosts %s # returns correct IP address\
+** getent hosts CORRECTIP # returns the correct FQDN\
+** certutil -d %s -L # lists your CA certificate\
+** nc %s %d # responds\n\n
 configds_finddn_error = Could not find the user '%s' in the server '%s'.  Error: %s\n\n
 configds_bindretry_error = You have made too many unsuccessful attempts to authenticate as '%s' to the server '%s'.  Please contact the administrator for that server.\n\n
 configds_bind_error = Could not authenticate as user '%s' to server '%s'.  Error: %s\n\n