Changeset 964:992ef1167344 in freeDiameter

Timestamp:

Mar 10, 2013, 12:55:20 AM (11 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Children:

965:9b37f34c1b1f, 967:bbc08d58325a

Parents:

963:8702913eb443 (diff), 936:8ee9f8183ab8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge latest 1.1.x version.

File:

• libfdcore/fdd.y (modified) (1 diff)

libfdcore/fdd.y

@@ -328 +328 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG_ERROR("Unable to open extension file %s for reading: %s\n", fname, strerror(ret));
-                                        yyerror (&yylloc, conf, "Error adding extension"); 
-                                        YYERROR;
-                                }
-                                fclose(fd);
+                                        TRACE_DEBUG_ERROR("WARNING: Unable to open extension file %s for reading: %s\nLD_LIBRARY_PATH will be used.\n", fname, strerror(ret));
+                                } else {
+                                        fclose(fd);
+                                }
                                 
                                 /* Try and open the configuration file (optional) */