[Fedora-directory-commits] adminserver/admserv/newinst/src AdminUtil.pm.in, 1.15, 1.16

Richard Allen Megginson (rmeggins) fedora-directory-commits at redhat.com
Tue Oct 2 23:35:03 UTC 2007


Author: rmeggins

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

Modified Files:
	AdminUtil.pm.in 
Log Message:
Resolves: bug 315731
Description: SNMP Show-stopper - Can't install DS80 on Rhel4-32 bit
Fix Description: If conn is NULL, we can't use it to get the error message, so just use a message of unknown in that case.



Index: AdminUtil.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminUtil.pm.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- AdminUtil.pm.in	20 Sep 2007 21:47:28 -0000	1.15
+++ AdminUtil.pm.in	2 Oct 2007 23:35:01 -0000	1.16
@@ -244,10 +244,17 @@
                                        $inf->{slapd}->{RootDN},
                                        $inf->{slapd}->{RootDNPwd},
                                        $inf->{General}->{certdir});
-    if (!$conn) {
+    my $errstr;
+    if ($conn) {
+        $errstr = $conn->getErrorString();
+    }
+    if (!$conn or ($errstr ne "Success")) {
         @{$errs} = ('error_connection_failed', $inf->{General}->{FullMachineName},
                     $inf->{slapd}->{ServerPort}, $inf->{slapd}->{RootDN},
-                    $conn->getErrorString());
+                    ($conn ? $errstr : "unknown"));
+        if ($conn) {
+            $conn->close();
+        }
         return 0;
     }
 




More information about the Fedora-directory-commits mailing list