ipsec-interfaces: Apply static routes (again) after creating IPsec interfaces

[ipfire-2.x.git] / src / setup / misc.c

diff --git a/src/setup/misc.c b/src/setup/misc.c
index 2a9f1312f160bdac6e9e530391d8b66d691d62a8..f9ba39b8c731dcd5cf6c4a98b921106977994bcc 100644 (file)
--- a/src/setup/misc.c
+++ b/src/setup/misc.c
@@ -19,31 +19,13 @@ extern char *mylog;
 
 extern int automode;
 
-/* This will rewrite /etc/hosts, /etc/hosts.*, and the apache ServerName file. */
 int writehostsfiles(void)
 {      
-       char address[STRING_SIZE] = "";
-       char netaddress[STRING_SIZE] = "";
-       char netmask[STRING_SIZE] = "";
        char message[1000];
-       FILE *file, *hosts;
        struct keyvalue *kv;
        char hostname[STRING_SIZE];
        char domainname[STRING_SIZE] = "localdomain";
        char commandstring[STRING_SIZE];
-       char buffer[STRING_SIZE];
-       
-       kv = initkeyvalues();
-       if (!(readkeyvalues(kv, CONFIG_ROOT "/ethernet/settings")))
-       {
-               freekeyvalues(kv);
-               errorbox(_("Unable to open settings file"));
-               return 0;
-       }
-       findkey(kv, "GREEN_ADDRESS", address);
-       findkey(kv, "GREEN_NETADDRESS", netaddress);
-       findkey(kv, "GREEN_NETMASK", netmask);  
-       freekeyvalues(kv);
        
        kv = initkeyvalues();
        if (!(readkeyvalues(kv, CONFIG_ROOT "/main/settings")))
@@ -57,81 +39,8 @@ int writehostsfiles(void)
        findkey(kv, "DOMAINNAME", domainname);
        freekeyvalues(kv);
                
-       if (!(file = fopen(CONFIG_ROOT "/main/hostname.conf", "w")))
-       {
-               sprintf (message, _("Unable to write %s/main/hostname.conf"), CONFIG_ROOT);
-               errorbox(message);
-               return 0;
-       }
-       fprintf(file, "ServerName %s.%s\n", hostname,domainname);
-       fclose(file);
-       
-       if (!(file = fopen(CONFIG_ROOT "/main/hosts", "r")))
-       {
-               errorbox(_("Unable to open main hosts file."));
-               return 0;
-       }
-       if (!(hosts = fopen("/etc/hosts", "w")))
-       {
-               errorbox(_("Unable to write /etc/hosts."));
-               return 0;
-       }
-       fprintf(hosts, "127.0.0.1\tlocalhost\n");
-       if (strlen(domainname))
-               fprintf(hosts, "%s\t%s.%s\t%s\n",address,hostname,domainname,hostname);
-       else
-               fprintf(hosts, "%s\t%s\n",address,hostname);
-       while (fgets(buffer, STRING_SIZE, file))
-       {
-               char *token, *ip, *host, *domain;
-
-               buffer[strlen(buffer) - 1] = 0;
-
-               token = strtok(buffer, ",");
-
-               ip = strtok(NULL, ",");
-               host = strtok(NULL, ",");
-               domain = strtok(NULL, ",");
-
-               if (!(ip && host))
-                       break;
-
-               if (strlen(ip) < 7 || strlen(ip) > 15
-                || strspn(ip, "0123456789.") != strlen(ip))
-                       break;
-
-               if (strspn(host, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-") != strlen(host))
-                       break;
-
-               if (domain)
-                       fprintf(hosts, "%s\t%s.%s\t%s\n",ip,host,domain,host);
-               else
-                       fprintf(hosts, "%s\t%s\n",ip,host);
-       }
-       fclose(file);
-       fclose(hosts);
-       
-       /* TCP wrappers stuff. */
-       if (!(file = fopen("/etc/hosts.deny", "w")))
-       {
-               errorbox(_("Unable to write /etc/hosts.deny."));
-               return 0;
-       }
-       fprintf(file, "ALL : ALL\n");
-       fclose(file);
-       
-       if (!(file = fopen("/etc/hosts.allow", "w")))
-       {
-               errorbox(_("Unable to write /etc/hosts.allow."));
-               return 0;
-       }
-       fprintf(file, "sshd : ALL\n");
-       fprintf(file, "ALL  : localhost\n");
-       fprintf(file, "ALL  : %s/%s\n", netaddress, netmask);
-       fclose(file);
-       
        sprintf(commandstring, "/bin/hostname %s.%s", hostname, domainname);
-       if (mysystem(commandstring))
+       if (mysystem(NULL, commandstring))
        {
                errorbox(_("Unable to set hostname."));
                return 0;
@@ -139,13 +48,3 @@ int writehostsfiles(void)
        
        return 1;
 }      
-
-int handleisdn(void)
-{
-       char command[STRING_SIZE];
-       sprintf(command, "/etc/rc.d/init.d/mISDN config");
-       if (runcommandwithstatus(command, _("ISDN"), _("Scanning and configuring ISDN devices.")))
-               errorbox(_("Unable to scan for ISDN devices."));
-       // Need to write some lines that count the cards and say the names...
-       return 1;
-}