[GNUnet-SVN] r8468 - GNUnet/src/applications/topology_default

[gnunet]

Author: durner
Date: 2009-05-24 16:06:22 -0600 (Sun, 24 May 2009)
New Revision: 8468

Modified:
   GNUnet/src/applications/topology_default/topology.c
Log:
fix the fix

Modified: GNUnet/src/applications/topology_default/topology.c
===================================================================
--- GNUnet/src/applications/topology_default/topology.c 2009-05-22 23:14:21 UTC 
(rev 8467)
+++ GNUnet/src/applications/topology_default/topology.c 2009-05-24 22:06:22 UTC 
(rev 8468)
@@ -445,9 +445,7 @@
                                                                 "F2F",
                                                                 "FRIENDS-ONLY",
                                                                 GNUNET_NO);
-  if (fInfo.friends_only == GNUNET_NO)
-    return 0;
-  else if (fInfo.friends_only == GNUNET_SYSERR)
+  if (fInfo.friends_only == GNUNET_SYSERR)
     return GNUNET_SYSERR;       /* invalid */
   opt = 0;
   GNUNET_GC_get_configuration_value_number (cfg,
@@ -456,6 +454,9 @@
                                             0, 1024 * 1024, 0, &opt);
   fInfo.minimum_friend_count = (unsigned int) opt;
 
+  if (fInfo.friends_only == GNUNET_NO && fInfo.minimum_friend_count == 0)
+    return 0;
+
   fn = NULL;
   GNUNET_GC_get_configuration_value_filename (cfg,
                                               "F2F",