Merged in sandervrijders/ouroboros/be-irm-enroll (pull request #207)

tools: irm: Create IPCP upon enroll if unexisting

2 files changed, 11 insertions, 2 deletions

diff --git a/src/tools/irm/irm_ipcp_destroy.c b/src/tools/irm/irm_ipcp_destroy.c
index ebd4283d..9768b5e1 100644
--- a/src/tools/irm/irm_ipcp_destroy.c
+++ b/src/tools/irm/irm_ipcp_destroy.c
@@ -21,6 +21,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <ouroboros/irm.h>
 
@@ -66,5 +67,7 @@ int do_destroy_ipcp(int argc, char ** argv)
                 if (irm_destroy_ipcp(apis[i]))
                         return -1;
 
+        free(apis);
+
         return 0;
 }
diff --git a/src/tools/irm/irm_ipcp_enroll.c b/src/tools/irm/irm_ipcp_enroll.c
index d6b1b27e..b7a12e2c 100644
--- a/src/tools/irm/irm_ipcp_enroll.c
+++ b/src/tools/irm/irm_ipcp_enroll.c
@@ -21,6 +21,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <ouroboros/irm.h>
 
@@ -63,12 +64,17 @@ int do_enroll_ipcp(int argc, char ** argv)
         }
 
         len = irm_list_ipcps(name, &apis);
-        if (len <= 0)
-                return -1;
+        if (len <= 0) {
+                if (!irm_create_ipcp(name, IPCP_NORMAL))
+                        return -1;
+                len = irm_list_ipcps(name, &apis);
+        }
 
         for (i = 0; i < len; i++)
                 if (irm_enroll_ipcp(apis[i], dif_name))
                         return -1;
 
+        free(apis);
+
         return 0;
 }