[GNUnet-SVN] r1717 - GNUnet/src/conf

[durner]

Author: durner
Date: 2005-08-17 13:38:00 -0700 (Wed, 17 Aug 2005)
New Revision: 1717

Modified:
   GNUnet/src/conf/gnunet-setup.c
Log:
fix check for writable /etc/gnunetd.conf

Modified: GNUnet/src/conf/gnunet-setup.c
===================================================================
--- GNUnet/src/conf/gnunet-setup.c      2005-08-17 19:06:46 UTC (rev 1716)
+++ GNUnet/src/conf/gnunet-setup.c      2005-08-17 20:38:00 UTC (rev 1717)
@@ -125,12 +125,14 @@
   if(daemon) {
     FREENONNULL(setConfigurationString("GNUNETD", "_MAGIC_", "YES"));
     if(filename == NULL) {
-      if(0 == ACCESS("/etc/gnunetd.conf", W_OK))
+      if(0 == ACCESS("/etc/gnunetd.conf", W_OK) ||
+          (errno == ENOENT && 0 == ACCESS("/etc", W_OK)))
         filename = STRDUP("/etc/gnunetd.conf");
       else {
         if(0 == ACCESS("/var/lib", W_OK))
           mkdirp("/var/lib/GNUnet");
-        if(0 == ACCESS("/var/lib/GNUnet/gnunetd.conf", W_OK))
+        if(0 == ACCESS("/var/lib/GNUnet/gnunetd.conf", W_OK) ||
+            (errno == ENOENT && 0 == ACCESS("/var/lib/GNUnet", W_OK)))
           filename = STRDUP("/var/lib/GNUnet/gnunetd.conf");
         else {
           dirname = expandFileName("~/.gnunet/");