diff -rupd dovecot-1.0.beta2.original/src/lib/failures.c dovecot-1.0.beta2/src/lib/failures.c
--- dovecot-1.0.beta2.original/src/lib/failures.c	Sun Oct 16 12:35:00 2005
+++ dovecot-1.0.beta2/src/lib/failures.c	Mon Jan 23 14:37:10 2006
@@ -165,7 +165,7 @@ static void default_info_handler(const c
 	errno = old_errno;
 }
 
-void i_panic(const char *format, ...)
+void _i_panic(const char *format, ...)
 {
 	va_list args;
 
@@ -174,7 +174,7 @@ void i_panic(const char *format, ...)
 	va_end(args);
 }
 
-void i_fatal(const char *format, ...)
+void _i_fatal(const char *format, ...)
 {
 	va_list args;
 
@@ -183,7 +183,7 @@ void i_fatal(const char *format, ...)
 	va_end(args);
 }
 
-void i_fatal_status(int status, const char *format, ...)
+void _i_fatal_status(int status, const char *format, ...)
 {
 	va_list args;
 
@@ -192,7 +192,7 @@ void i_fatal_status(int status, const ch
 	va_end(args);
 }
 
-void i_error(const char *format, ...)
+void _i_error(const char *format, ...)
 {
 	va_list args;
 
@@ -201,7 +201,7 @@ void i_error(const char *format, ...)
 	va_end(args);
 }
 
-void i_warning(const char *format, ...)
+void _i_warning(const char *format, ...)
 {
 	va_list args;
 
@@ -210,7 +210,7 @@ void i_warning(const char *format, ...)
 	va_end(args);
 }
 
-void i_info(const char *format, ...)
+void _i_info(const char *format, ...)
 {
 	va_list args;
 
diff -rupd dovecot-1.0.beta2.original/src/lib/failures.h dovecot-1.0.beta2/src/lib/failures.h
--- dovecot-1.0.beta2.original/src/lib/failures.h	Mon May 10 18:05:10 2004
+++ dovecot-1.0.beta2/src/lib/failures.h	Mon Jan 23 14:37:10 2006
@@ -17,14 +17,28 @@ enum fatal_exit_status {
 typedef void failure_callback_t(const char *, va_list);
 typedef void fatal_failure_callback_t(int status, const char *, va_list);
 
-void i_panic(const char *format, ...) __attr_format__(1, 2) __attr_noreturn__;
-void i_fatal(const char *format, ...) __attr_format__(1, 2) __attr_noreturn__;
-void i_error(const char *format, ...) __attr_format__(1, 2);
-void i_warning(const char *format, ...) __attr_format__(1, 2);
-void i_info(const char *format, ...) __attr_format__(1, 2);
+void _i_panic(const char *format, ...) __attr_format__(1, 2) __attr_noreturn__;
+void _i_fatal(const char *format, ...) __attr_format__(1, 2) __attr_noreturn__;
+void _i_error(const char *format, ...) __attr_format__(1, 2);
+void _i_warning(const char *format, ...) __attr_format__(1, 2);
+void _i_info(const char *format, ...) __attr_format__(1, 2);
 
-void i_fatal_status(int status, const char *format, ...)
+void _i_fatal_status(int status, const char *format, ...)
 	__attr_format__(2, 3) __attr_noreturn__;
+
+#define i_panic(format, ...) _i_panic("%s:%u: " format, __FILE__, __LINE__, \
+                                      ##__VA_ARGS__)
+#define i_fatal(format, ...) _i_fatal("%s:%u: " format, __FILE__, __LINE__, \
+                                      ##__VA_ARGS__)
+#define i_error(format, ...) _i_error("%s:%u: " format, __FILE__, __LINE__, \
+                                      ##__VA_ARGS__)
+#define i_warning(format, ...) _i_warning("%s:%u: " format, __FILE__, \
+                                          __LINE__, ##__VA_ARGS__)
+#define i_info(format, ...) _i_info("%s:%u: " format, __FILE__, __LINE__, \
+                                    ##__VA_ARGS__)
+#define i_fatal_status(status, format, ...) \
+        _i_fatal_status(status, "%s:%u: " format, __FILE__, __LINE__, \
+                        ##__VA_ARGS__)
 
 /* Change failure handlers. Make sure they don't modify errno. */
 void i_set_panic_handler(failure_callback_t *callback __attr_noreturn__);