Imported Upstream version 2.5.2p1

[debian/amanda] / common-src / security.c

diff --git a/common-src/security.c b/common-src/security.c
index 76cf78ddc345427be060b7b01b483e749c0c0387..4ee8eb7c25eb84937b0d317429324ed8f659d45d 100644 (file)
--- a/common-src/security.c
+++ b/common-src/security.c
@@ -94,12 +94,13 @@ security_getdriver(
 
     for (i = 0; i < NDRIVERS; i++) {
        if (strcasecmp(name, drivers[i]->name) == 0) {
-           dbprintf(("security_getdriver(name=%s) returns %p\n",
-                       name, drivers[i]));
+           dbprintf(("%s: security_getdriver(name=%s) returns %p\n",
+                     debug_prefix_time(NULL), name, drivers[i]));
            return (drivers[i]);
        }
     }
-    dbprintf(("security_getdriver(name=%s) returns NULL\n", name));
+    dbprintf(("%s: security_getdriver(name=%s) returns NULL\n",
+             debug_prefix_time(NULL), name));
     return (NULL);
 }
 
@@ -111,8 +112,8 @@ security_handleinit(
     security_handle_t *                handle,
     const security_driver_t *  driver)
 {
-    dbprintf(("security_handleinit(handle=%p, driver=%p (%s))\n",
-               handle, driver, driver->name));
+    dbprintf(("%s: security_handleinit(handle=%p, driver=%p (%s))\n",
+             debug_prefix_time(NULL), handle, driver, driver->name));
     handle->driver = driver;
     handle->error = stralloc("unknown protocol error");
 }
@@ -128,16 +129,18 @@ printf_arglist_function1(void security_seterror, security_handle_t *, handle,
     vsnprintf(buf, SIZEOF(buf), fmt, argp);
     arglist_end(argp);
     handle->error = newstralloc(handle->error, buf);
-    dbprintf(("security_seterror(handle=%p, driver=%p (%s) error=%s)\n",
-               handle, handle->driver, handle->driver->name, handle->error));
+    dbprintf(("%s: security_seterror(handle=%p, driver=%p (%s) error=%s)\n",
+             debug_prefix_time(NULL), handle, handle->driver,
+             handle->driver->name, handle->error));
 }
 
 void
 security_close(
     security_handle_t *        handle)
 {
-    dbprintf(("security_close(handle=%p, driver=%p (%s))\n",
-               handle, handle->driver, handle->driver->name));
+    dbprintf(("%s: security_close(handle=%p, driver=%p (%s))\n",
+             debug_prefix_time(NULL), handle, handle->driver,
+             handle->driver->name));
     amfree(handle->error);
     (*handle->driver->close)(handle);
 }
@@ -150,8 +153,8 @@ security_streaminit(
     security_stream_t *                stream,
     const security_driver_t *  driver)
 {
-    dbprintf(("security_streaminit(stream=%p, driver=%p (%s))\n",
-               stream, driver, driver->name));
+    dbprintf(("%s: security_streaminit(stream=%p, driver=%p (%s))\n",
+             debug_prefix_time(NULL), stream, driver, driver->name));
     stream->driver = driver;
     stream->error = stralloc("unknown stream error");
 }
@@ -167,14 +170,16 @@ printf_arglist_function1(void security_stream_seterror,
     vsnprintf(buf, SIZEOF(buf), fmt, argp);
     arglist_end(argp);
     stream->error = newstralloc(stream->error, buf);
-    dbprintf(("security_stream_seterr(%p, %s)\n", stream, stream->error));
+    dbprintf(("%s: security_stream_seterr(%p, %s)\n",
+             debug_prefix_time(NULL), stream, stream->error));
 }
 
 void
 security_stream_close(
     security_stream_t *        stream)
 {
-    dbprintf(("security_stream_close(%p)\n", stream));
+    dbprintf(("%s: security_stream_close(%p)\n",
+             debug_prefix_time(NULL), stream));
     amfree(stream->error);
     (*stream->driver->stream_close)(stream);
 }