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

[durner]

Author: durner
Date: 2005-06-24 13:59:31 -0700 (Fri, 24 Jun 2005)
New Revision: 991

Modified:
   GNUnet/src/conf/wizard_callbacks.c
   GNUnet/src/conf/wizard_util.c
Log:
error handling

Modified: GNUnet/src/conf/wizard_callbacks.c
===================================================================
--- GNUnet/src/conf/wizard_callbacks.c  2005-06-24 20:42:33 UTC (rev 990)
+++ GNUnet/src/conf/wizard_callbacks.c  2005-06-24 20:59:31 UTC (rev 991)
@@ -240,7 +240,7 @@
 
        if (!wiz_autostart(doAutoStart, user_name, group_name)) {
 #ifndef MINGW
-               showErr(_("Unable to make GNUnet start automatically:"), 
STRERROR(errno));
+               showErr(_("Unable to change startup process:"), 
STRERROR(errno));
 #endif
                return;
        }       

Modified: GNUnet/src/conf/wizard_util.c
===================================================================
--- GNUnet/src/conf/wizard_util.c       2005-06-24 20:42:33 UTC (rev 990)
+++ GNUnet/src/conf/wizard_util.c       2005-06-24 20:59:31 UTC (rev 991)
@@ -328,12 +328,18 @@
                                return 0;
                }
                else {
-                       if (UNLINK("/etc/init.d/gnunetd") != -1) {
+                       if (UNLINK("/etc/init.d/gnunetd") != -1 || errno == 
ENOENT) {
                                if (ACCESS("/usr/sbin/update-rc.d", X_OK) == 0) 
{
                                        errno = system("/usr/sbin/update-rc.d 
gnunetd remove");
-                                       if (errno != 0)
+                                       if (errno != 0) {
+                                               errno = EPERM;
                                                return 0;
+                                       }
                                }
+                               else {
+                                       errno = EPERM;
+                                       return 0;
+                               }
                        }
                        else
                                return 0;