[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r986 - GNUnet/src/conf
From: |
durner |
Subject: |
[GNUnet-SVN] r986 - GNUnet/src/conf |
Date: |
Fri, 24 Jun 2005 13:07:52 -0700 (PDT) |
Author: durner
Date: 2005-06-24 13:07:49 -0700 (Fri, 24 Jun 2005)
New Revision: 986
Modified:
GNUnet/src/conf/wizard.c
GNUnet/src/conf/wizard_util.c
Log:
fixes
Modified: GNUnet/src/conf/wizard.c
===================================================================
--- GNUnet/src/conf/wizard.c 2005-06-24 19:40:44 UTC (rev 985)
+++ GNUnet/src/conf/wizard.c 2005-06-24 20:07:49 UTC (rev 986)
@@ -106,7 +106,7 @@
sym_calc_value_ext(sym, 1);
nic = sym_get_string_value(sym);
- if (!nic)
+ if (!nic || strlen(nic) == 0)
nic = "eth0";
gtk_combo_box_append_text(cmbNIC, nic);
Modified: GNUnet/src/conf/wizard_util.c
===================================================================
--- GNUnet/src/conf/wizard_util.c 2005-06-24 19:40:44 UTC (rev 985)
+++ GNUnet/src/conf/wizard_util.c 2005-06-24 20:07:49 UTC (rev 986)
@@ -314,11 +314,19 @@
CHMOD("/etc/init.d/gnunetd", S_IRWXU |
S_IRGRP | S_IXGRP |
S_IROTH | S_IXOTH);
}
- system("/usr/sbin/update-rc.d gnunetd defaults");
+ errno = system("/usr/sbin/update-rc.d gnunetd
defaults");
+ if (errno != 0)
+ return 0;
}
else {
- if (ACCESS("/usr/sbin/update-rc.d", X_OK) == 0)
- system("/usr/sbin/update-rc.d gnunetd remove");
+ if (UNLINK("/etc/init.d/gnunetd") != -1)
+ if (ACCESS("/usr/sbin/update-rc.d", X_OK) == 0)
{
+ errno = system("/usr/sbin/update-rc.d
gnunetd remove");
+ if (errno != 0)
+ return 0;
+ }
+ else
+ return 0;
}
}
else
@@ -417,9 +425,10 @@
/* Debian */
/* TODO: FreeBSD?
http://www.freebsd.org/cgi/man.cgi?query=adduser&sektion=8 */
char *cmd;
- cmd = MALLOC(strlen(group_name) + strlen(user_name) + 64);
+
+ haveGroup = group_name && strlen(group_name) > 0;
+ cmd = MALLOC(haveGroup ? strlen(group_name) : 0 +
strlen(user_name) + 64);
- haveGroup = group_name && strlen(group_name) > 0;
if (haveGroup) {
sprintf(cmd, "/usr/sbin/addgroup --quiet --system %s",
group_name);
system(cmd);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r986 - GNUnet/src/conf,
durner <=