[Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm import-threads.c, 1.20, 1.21

Nathan Kinder nkinder at fedoraproject.org
Tue Mar 3 17:36:02 UTC 2009

Author: nkinder

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16184/ldap/servers/slapd/back-ldbm

Modified Files:
Log Message:
Resolves: bug 486400
Bug Description: During migration, if import fails for some reason,
 the exact cause of why it was unable to open the LDIF is not logged.
Reviewed by: nhosoi (thanks!)
Files: see diff
Branch: HEAD
Fix Description: As discussed in the bug council, the fix is to just
 report the actual error returned when the open() of the LDIF fails.
 This reports the errno and a string description of the error in the
 errors log (which is also output to stderr when running ldif2db).
Platforms tested: F9
Flag Day: no
Doc impact: no

Index: import-threads.c
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import-threads.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- import-threads.c	21 Nov 2008 16:38:34 -0000	1.20
+++ import-threads.c	3 Mar 2009 17:35:59 -0000	1.21
@@ -461,8 +461,8 @@
                 fd = dblayer_open_huge_file(curr_filename, o_flag, 0);
             if (fd < 0) {
-                import_log_notice(job, "Could not open LDIF file \"%s\"",
-                                  curr_filename);
+                import_log_notice(job, "Could not open LDIF file \"%s\", errno %d (%s)",
+                                  curr_filename, errno, slapd_system_strerror(errno));
                 goto error;
             if (fd == STDIN_FILENO) {

More information about the Fedora-directory-commits mailing list