=== modified file 'lib/core/conf.c'
--- lib/core/conf.c     2011-05-25 17:41:59 +0000
+++ lib/core/conf.c     2011-05-27 11:39:21 +0000
@@ -1336,16 +1336,12 @@
 {
     switch (action) {
     case ACTION_ADD:
-        hip_conf_add_id_to_ip_map(msg, opt, optc);
-        break;
+        return hip_conf_add_id_to_ip_map(msg, opt, optc);
     case ACTION_GET:
-        hip_conf_get_id_to_ip_map(msg, opt, optc, send_only);
-        break;
+        return hip_conf_get_id_to_ip_map(msg, opt, optc, send_only);
     default:
         return -1;
     }
-
-    return -1;
 }
 
 /**