[Fedora-directory-commits] adminserver/admserv/newinst/src AdminUtil.pm.in, 1.14, 1.15 register-ds-admin.res.in, 1.2, 1.3 setup-ds-admin.res.in, 1.7, 1.8

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17005/adminserver/admserv/newinst/src

Modified Files:
	AdminUtil.pm.in register-ds-admin.res.in setup-ds-admin.res.in 
Log Message:
Resolves: bug 299261
Bug Description: setup-ds-admin: Error: unknown resource key error_connection_failed
Reviewed by: nhosoi (Thanks!)
Fix Description: Moved the resource key from register-ds-admin.res to setup-ds-admin.res since it's used by setup and migrate too.  I also added the host, port, user, and ldap error string to the 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: AdminUtil.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminUtil.pm.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AdminUtil.pm.in	23 Aug 2007 23:51:24 -0000	1.14
+++ AdminUtil.pm.in	20 Sep 2007 21:47:28 -0000	1.15
@@ -245,7 +245,9 @@
                                        $inf->{slapd}->{RootDNPwd},
                                        $inf->{General}->{certdir});
     if (!$conn) {
-        @{$errs} = ('error_connection_failed');
+        @{$errs} = ('error_connection_failed', $inf->{General}->{FullMachineName},
+                    $inf->{slapd}->{ServerPort}, $inf->{slapd}->{RootDN},
+                    $conn->getErrorString());
         return 0;
     }
 
@@ -330,7 +332,9 @@
                                        $inf->{slapd}->{RootDNPwd},
                                        $inf->{General}->{certdir});
     if (!$conn) {
-        @{$errs} = ('error_connection_failed');
+        @{$errs} = ('error_connection_failed', $inf->{General}->{FullMachineName},
+                    $inf->{slapd}->{ServerPort}, $inf->{slapd}->{RootDN},
+                    $conn->getErrorString());
         return 0;
     }
 


Index: register-ds-admin.res.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register-ds-admin.res.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- register-ds-admin.res.in	23 Aug 2007 23:51:24 -0000	1.2
+++ register-ds-admin.res.in	20 Sep 2007 21:47:28 -0000	1.3
@@ -39,5 +39,3 @@
 error_register_subds = Error: failed to register the additional server info to the Configuration Directory Server %s.\n
 
 error_unregister_ds = Error: failed to clean up the configuration info from the old Configuration\nDirectory Server %s.\n
-
-error_connection_failed = Error: failed to open an LDAP connection.\n


Index: setup-ds-admin.res.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/setup-ds-admin.res.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- setup-ds-admin.res.in	14 Sep 2007 21:26:08 -0000	1.7
+++ setup-ds-admin.res.in	20 Sep 2007 21:47:28 -0000	1.8
@@ -128,3 +128,4 @@
 error_return_certutil = The certutil program returned error code '%s' from attempting to add the CA certificate.  Error: %s
 error_return2_certutil = The certutil program returned error code '%s' from attempting to add the CA certificate.  Error: %s\nHere is the output of the command: %s
 cacert_already_exists = The certificate database in '%s' already contains a CA certificate.  Please remove it first, or use the certutil program to add the CA certificate with a different name.\n
+error_connection_failed = Error: failed to open an LDAP connection to host '%s' port '%s' as user '%s'.  Error: %s.\n