X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=common-src%2Fsecurity.c;h=183b83699ee17001df20f25711aec10a5e71c8c4;hb=refs%2Fheads%2Fsqueeze;hp=76cf78ddc345427be060b7b01b483e749c0c0387;hpb=cdbbeef9cde260e429854dd313bc0bf7560e1e24;p=debian%2Famanda

diff --git a/common-src/security.c b/common-src/security.c
index 76cf78d..183b836 100644
--- a/common-src/security.c
+++ b/common-src/security.c
@@ -37,9 +37,6 @@
 #ifdef BSD_SECURITY
 extern const security_driver_t bsd_security_driver;
 #endif
-#ifdef KRB4_SECURITY
-extern const security_driver_t krb4_security_driver;
-#endif
 #ifdef KRB5_SECURITY
 extern const security_driver_t krb5_security_driver;
 #endif
@@ -55,14 +52,12 @@ extern const security_driver_t bsdtcp_security_driver;
 #ifdef BSDUDP_SECURITY
 extern const security_driver_t bsdudp_security_driver;
 #endif
+extern const security_driver_t local_security_driver;
 
 static const security_driver_t *drivers[] = {
 #ifdef BSD_SECURITY
     &bsd_security_driver,
 #endif
-#ifdef KRB4_SECURITY
-    &krb4_security_driver,
-#endif
 #ifdef KRB5_SECURITY
     &krb5_security_driver,
 #endif
@@ -78,6 +73,7 @@ static const security_driver_t *drivers[] = {
 #ifdef BSDUDP_SECURITY
     &bsdudp_security_driver,
 #endif
+    &local_security_driver,
 };
 #define	NDRIVERS	(size_t)(sizeof(drivers) / sizeof(drivers[0]))
 
@@ -94,12 +90,12 @@ 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(_("security_getdriver(name=%s) returns %p\n"),
+		      name, drivers[i]);
 	    return (drivers[i]);
 	}
     }
-    dbprintf(("security_getdriver(name=%s) returns NULL\n", name));
+    dbprintf(_("security_getdriver(name=%s) returns NULL\n"), name);
     return (NULL);
 }
 
@@ -111,33 +107,35 @@ 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(_("security_handleinit(handle=%p, driver=%p (%s))\n"),
+	      handle, driver, driver->name);
     handle->driver = driver;
-    handle->error = stralloc("unknown protocol error");
+    handle->error = stralloc(_("unknown protocol error"));
 }
 
 printf_arglist_function1(void security_seterror, security_handle_t *, handle,
     const char *, fmt)
 {
-    static char buf[256];
+    static char buf[1024];
     va_list argp;
 
     assert(handle->error != NULL);
     arglist_start(argp, fmt);
-    vsnprintf(buf, SIZEOF(buf), fmt, argp);
+    g_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(_("security_seterror(handle=%p, driver=%p (%s) error=%s)\n"),
+	      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(_("security_close(handle=%p, driver=%p (%s))\n"),
+	      handle, handle->driver,
+	      handle->driver->name);
     amfree(handle->error);
     (*handle->driver->close)(handle);
 }
@@ -150,31 +148,31 @@ 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(_("security_streaminit(stream=%p, driver=%p (%s))\n"),
+	      stream, driver, driver->name);
     stream->driver = driver;
-    stream->error = stralloc("unknown stream error");
+    stream->error = stralloc(_("unknown stream error"));
 }
 
 printf_arglist_function1(void security_stream_seterror,
     security_stream_t *, stream,
     const char *, fmt)
 {
-    static char buf[256];
+    static char buf[1024];
     va_list argp;
 
     arglist_start(argp, fmt);
-    vsnprintf(buf, SIZEOF(buf), fmt, argp);
+    g_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(_("security_stream_seterr(%p, %s)\n"), stream, stream->error);
 }
 
 void
 security_stream_close(
     security_stream_t *	stream)
 {
-    dbprintf(("security_stream_close(%p)\n", stream));
+    dbprintf(_("security_stream_close(%p)\n"), stream);
     amfree(stream->error);
     (*stream->driver->stream_close)(stream);
 }