Imported Upstream version 2.5.1

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

diff --git a/common-src/security.c b/common-src/security.c
index 795d64eda86df73eacd91f34a4f2de0c586a9e33..76cf78ddc345427be060b7b01b483e749c0c0387 100644 (file)
--- a/common-src/security.c
+++ b/common-src/security.c
@@ -24,7 +24,7 @@
  * file named AUTHORS, in the root directory of this distribution.
  */
 /*
- * $Id: security.c,v 1.26 2004/03/16 19:09:39 martinea Exp $
+ * $Id: security.c,v 1.28 2006/05/25 01:47:12 johnfranks Exp $
  *
  * Security driver interface for the Amanda backup system.
  */
@@ -49,6 +49,12 @@ extern const security_driver_t rsh_security_driver;
 #ifdef SSH_SECURITY
 extern const security_driver_t ssh_security_driver;
 #endif
+#ifdef BSDTCP_SECURITY
+extern const security_driver_t bsdtcp_security_driver;
+#endif
+#ifdef BSDUDP_SECURITY
+extern const security_driver_t bsdudp_security_driver;
+#endif
 
 static const security_driver_t *drivers[] = {
 #ifdef BSD_SECURITY
@@ -66,23 +72,34 @@ static const security_driver_t *drivers[] = {
 #ifdef SSH_SECURITY
     &ssh_security_driver,
 #endif
+#ifdef BSDTCP_SECURITY
+    &bsdtcp_security_driver,
+#endif
+#ifdef BSDUDP_SECURITY
+    &bsdudp_security_driver,
+#endif
 };
-#define        NDRIVERS        (sizeof(drivers) / sizeof(drivers[0]))
+#define        NDRIVERS        (size_t)(sizeof(drivers) / sizeof(drivers[0]))
 
 /*
  * Given a name of a security type, returns the driver structure
  */
 const security_driver_t *
-security_getdriver(name)
-    const char *name;
+security_getdriver(
+    const char *       name)
 {
-    int i;
+    size_t i;
 
     assert(name != NULL);
 
-    for (i = 0; i < NDRIVERS; i++)
-       if (strcasecmp(name, drivers[i]->name) == 0)
+    for (i = 0; i < NDRIVERS; i++) {
+       if (strcasecmp(name, drivers[i]->name) == 0) {
+           dbprintf(("security_getdriver(name=%s) returns %p\n",
+                       name, drivers[i]));
            return (drivers[i]);
+       }
+    }
+    dbprintf(("security_getdriver(name=%s) returns NULL\n", name));
     return (NULL);
 }
 
@@ -90,11 +107,12 @@ security_getdriver(name)
  * For the drivers: initialize the common part of a security_handle_t
  */
 void
-security_handleinit(handle, driver)
-    security_handle_t *handle;
-    const security_driver_t *driver;
+security_handleinit(
+    security_handle_t *                handle,
+    const security_driver_t *  driver)
 {
-
+    dbprintf(("security_handleinit(handle=%p, driver=%p (%s))\n",
+               handle, driver, driver->name));
     handle->driver = driver;
     handle->error = stralloc("unknown protocol error");
 }
@@ -107,16 +125,19 @@ printf_arglist_function1(void security_seterror, security_handle_t *, handle,
 
     assert(handle->error != NULL);
     arglist_start(argp, fmt);
-    vsnprintf(buf, sizeof(buf), fmt, argp);
+    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));
 }
 
 void
-security_close(handle)
-    security_handle_t *handle;
+security_close(
+    security_handle_t *        handle)
 {
-
+    dbprintf(("security_close(handle=%p, driver=%p (%s))\n",
+               handle, handle->driver, handle->driver->name));
     amfree(handle->error);
     (*handle->driver->close)(handle);
 }
@@ -125,11 +146,12 @@ security_close(handle)
  * For the drivers: initialize the common part of a security_stream_t
  */
 void
-security_streaminit(stream, driver)
-    security_stream_t *stream;
-    const security_driver_t *driver;
+security_streaminit(
+    security_stream_t *                stream,
+    const security_driver_t *  driver)
 {
-
+    dbprintf(("security_streaminit(stream=%p, driver=%p (%s))\n",
+               stream, driver, driver->name));
     stream->driver = driver;
     stream->error = stralloc("unknown stream error");
 }
@@ -141,18 +163,18 @@ printf_arglist_function1(void security_stream_seterror,
     static char buf[256];
     va_list argp;
 
-    assert(stream->error != NULL);
     arglist_start(argp, fmt);
-    vsnprintf(buf, sizeof(buf), fmt, argp);
+    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));
 }
 
 void
-security_stream_close(stream)
-    security_stream_t *stream;
+security_stream_close(
+    security_stream_t *        stream)
 {
-
+    dbprintf(("security_stream_close(%p)\n", stream));
     amfree(stream->error);
     (*stream->driver->stream_close)(stream);
 }