-fix typos

4 files changed, 17 insertions, 9 deletions

diff --git a/src/identity/gnunet-service-identity.c b/src/identity/gnunet-service-identity.c
index 84da12c2a..ec874fa6f 100644
--- a/src/identity/gnunet-service-identity.c
+++ b/src/identity/gnunet-service-identity.c
@@ -916,6 +916,13 @@ run (void *cls,
   stats = GNUNET_STATISTICS_create ("identity", cfg);
   GNUNET_SERVER_add_handlers (server, handlers);
   nc = GNUNET_SERVER_notification_context_create (server, 1);
+  if (GNUNET_OK !=
+      GNUNET_DISK_directory_create (ego_directory))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Failed to create directory `%s' for storing egos\n"),
+                ego_directory);
+  }
   GNUNET_DISK_directory_scan (ego_directory,
                               &process_ego_file,
                               NULL);
diff --git a/src/identity/identity.conf.in b/src/identity/identity.conf.in
index 737614119..671e5f2f1 100644
--- a/src/identity/identity.conf.in
+++ b/src/identity/identity.conf.in
@@ -13,3 +13,5 @@ UNIX_MATCH_GID = YES
 # Directory where we store information about our egos
 EGODIR = $SERVICEHOME/egos/
 
+# File where we store default identities for subsystems
+SUBSYSTEM_CFG = $SERVICEHOME/subsystem_defaults.conf
diff --git a/src/identity/identity_api.c b/src/identity/identity_api.c
index 441b63bf0..15a454e60 100644
--- a/src/identity/identity_api.c
+++ b/src/identity/identity_api.c
@@ -910,6 +910,7 @@ void
 GNUNET_IDENTITY_disconnect (struct GNUNET_IDENTITY_Handle *h)
 {
   GNUNET_assert (NULL != h);
+  GNUNET_assert (h->op_head == h->op_tail);
   if (h->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
   {
     GNUNET_SCHEDULER_cancel (h->reconnect_task);
diff --git a/src/identity/test_identity.c b/src/identity/test_identity.c
index 4677949f9..02bf341e8 100644
--- a/src/identity/test_identity.c
+++ b/src/identity/test_identity.c
@@ -60,16 +60,16 @@ static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
 static void
 cleanup ()
 {
-  if (NULL != h)
-  {
-    GNUNET_IDENTITY_disconnect (h);
-    h = NULL;
-  }
   if (NULL != op)
   {
     GNUNET_IDENTITY_cancel (op);
     op = NULL;
   }
+  if (NULL != h)
+  {
+    GNUNET_IDENTITY_disconnect (h);
+    h = NULL;
+  }
   GNUNET_SCHEDULER_shutdown ();
 }
 
@@ -113,7 +113,7 @@ end ()
     GNUNET_SCHEDULER_cancel (endbadly_task);
     endbadly_task = GNUNET_SCHEDULER_NO_TASK;
   }
-  GNUNET_SCHEDULER_add_now (&end, NULL);
+  GNUNET_SCHEDULER_add_now (&end_normally, NULL);
 }
 
 
@@ -155,11 +155,11 @@ create_cb (void *cls,
            const char *identifier)
 {
   op = NULL;
+  fprintf (stderr, "HERE!\n");
   end (); /* yepee */
 }
 
 
-
 /**
  * Main function of the test, run from scheduler.
  *
@@ -184,8 +184,6 @@ run (void *cls,
 }
 
 
-
-
 int
 main (int argc, char *argv[])
 {