[GNUnet-SVN] r1678 - in GNUnet/src: conf util

[grothoff]

Author: grothoff
Date: 2005-08-14 21:05:40 -0700 (Sun, 14 Aug 2005)
New Revision: 1678

Modified:
   GNUnet/src/conf/wizard.c
   GNUnet/src/util/osconfig.c
Log:
fixes

Modified: GNUnet/src/conf/wizard.c
===================================================================
--- GNUnet/src/conf/wizard.c    2005-08-15 03:58:54 UTC (rev 1677)
+++ GNUnet/src/conf/wizard.c    2005-08-15 04:05:40 UTC (rev 1678)
@@ -26,6 +26,11 @@
 
 #include "gnunet_util.h"
 
+#ifndef MINGW
+#include <grp.h>
+#endif
+
+
 #define LKC_DIRECT_LINK
 #include "lkc.h"
 
@@ -202,7 +207,6 @@
 void load_step4()
 {
                GtkWidget *vbox18, *frame8, *vbox19, *table3, *entUser, 
*entGroup;
-               int group;
                
                vbox18 = lookup_widget(curwnd, "vbox18");
                frame8 = lookup_widget(vbox18, "frame8");
@@ -211,14 +215,38 @@
                entUser = lookup_widget(table3, "entUser");
                entGroup = lookup_widget(table3, "entGroup");
                
+               
+#ifndef MINGW
+               if (NULL == user_name) {
+                 if ( (geteuid() == 0) || 
+                      (NULL != getpwnam("gnunet")) )
+                   user_name = STRDUP("gnunet");
+                 else 
+                   user_name = STRDUP(getenv("USER"));           
+               }
+               if (NULL == group_name) {
+                 if ( (geteuid() == 0) ||
+                      (NULL != getgrnam("gnunet")) )
+                   group_name = STRDUP("gnunet");
+                 else
+                   group_name = STRDUP(getgrgid(getegid())->gr_name);
+               }
+#else
+#print PORT-ME
+#endif
+
                if (user_name)
-                       gtk_entry_set_text(GTK_ENTRY(entUser), user_name);
-               
+                 gtk_entry_set_text(GTK_ENTRY(entUser), user_name);
                if (group_name)
-                       gtk_entry_set_text(GTK_ENTRY(entGroup), group_name);
-       
-               gtk_widget_set_sensitive(entUser, isOSUserAddCapable());
-               gtk_widget_set_sensitive(entGroup, group = 
isOSGroupAddCapable());
+                 gtk_entry_set_text(GTK_ENTRY(entGroup), group_name);
+               if (isOSUserAddCapable())
+                 gtk_widget_set_sensitive(entUser, TRUE);
+               else
+                 gtk_widget_set_sensitive(entUser, FALSE);
+               if (isOSGroupAddCapable())
+                 gtk_widget_set_sensitive(entGroup, TRUE);
+               else
+                 gtk_widget_set_sensitive(entGroup, FALSE);
 }
 
 void load_step5()

Modified: GNUnet/src/util/osconfig.c
===================================================================
--- GNUnet/src/util/osconfig.c  2005-08-15 03:58:54 UTC (rev 1677)
+++ GNUnet/src/util/osconfig.c  2005-08-15 04:05:40 UTC (rev 1678)
@@ -253,7 +253,8 @@
        return 1;
     }
     else {
-      if (UNLINK("/etc/init.d/gnunetd") != -1 || errno == ENOENT) {
+      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) {