=== modified file 'mandos-ctl'
--- mandos-ctl	2009-01-31 10:33:17 +0000
+++ mandos-ctl	2009-02-06 01:15:52 +0000
@@ -26,12 +26,12 @@
     }
 defaultkeywords = ('name', 'enabled', 'timeout', 'last_checked_ok',
                    'checker')
-busname = 'org.mandos-system.Mandos'
-server_path = '/Mandos'
-server_interface = 'org.mandos_system.Mandos'
-client_interface = 'org.mandos_system.Mandos.Client'
+domain = 'se.bsnet.fukt'
+busname = domain + '.Mandos'
+server_path = '/'
+server_interface = domain + '.Mandos'
+client_interface = domain + '.Mandos.Client'
 version = "1.0.5"
-
 bus = dbus.SystemBus()
 mandos_dbus_objc = bus.get_object(busname, server_path)
 mandos_serv = dbus.Interface(mandos_dbus_objc,

=== modified file 'plugin-runner.c'
--- plugin-runner.c	2009-02-07 03:38:17 +0000
+++ plugin-runner.c	2009-02-09 02:05:15 +0000
@@ -936,6 +936,7 @@
   
   closedir(dir);
   dir = NULL;
+  free_plugin(getplugin(NULL));
   
   for(plugin *p = plugin_list; p != NULL; p = p->next){
     if(p->pid != 0){

=== modified file 'plugins.d/mandos-client.c'
--- plugins.d/mandos-client.c	2009-02-09 02:01:13 +0000
+++ plugins.d/mandos-client.c	2009-02-09 02:05:15 +0000
@@ -130,11 +130,11 @@
 } mandos_context;
 
 /*
- * Make room in "buffer" for at least BUFFER_SIZE additional bytes.
- * "buffer_capacity" is how much is currently allocated,
- * "buffer_length" is how much is already used.
+ * Make additional room in "buffer" for at least BUFFER_SIZE
+ * additional bytes. "buffer_capacity" is how much is currently
+ * allocated, "buffer_length" is how much is already used.
  */
-size_t adjustbuffer(char **buffer, size_t buffer_length,
+size_t incbuffer(char **buffer, size_t buffer_length,
 		  size_t buffer_capacity){
   if(buffer_length + BUFFER_SIZE > buffer_capacity){
     *buffer = realloc(*buffer, buffer_capacity + BUFFER_SIZE);
@@ -326,11 +326,11 @@
   
   *plaintext = NULL;
   while(true){
-    plaintext_capacity = adjustbuffer(plaintext,
+    plaintext_capacity = incbuffer(plaintext,
 				      (size_t)plaintext_length,
 				      plaintext_capacity);
     if(plaintext_capacity == 0){
-	perror("adjustbuffer");
+	perror("incbuffer");
 	plaintext_length = -1;
 	goto decrypt_end;
     }
@@ -685,10 +685,10 @@
   }
   
   while(true){
-    buffer_capacity = adjustbuffer(&buffer, buffer_length,
+    buffer_capacity = incbuffer(&buffer, buffer_length,
 				   buffer_capacity);
     if(buffer_capacity == 0){
-      perror("adjustbuffer");
+      perror("incbuffer");
       retval = -1;
       goto mandos_end;
     }