Merge branch 'ipsec' into next

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

diff --git a/src/setup/main.c b/src/setup/main.c
index 33f4d214201b5798e17034883f88122b4ed8742c..adb98a2317e8617d2ec4459404daaab6acbfa8d1 100644 (file)
--- a/src/setup/main.c
+++ b/src/setup/main.c
@@ -25,7 +25,7 @@ struct knic knics[20] = { { "" , "" , "" , "" } };
 int main(int argc, char *argv[])
 {
        int choice;
-       char *sections[11]; /* need to fill this out AFTER knowning lang */
+       char *sections[8]; /* need to fill this out AFTER knowning lang */
        int rc;
        struct keyvalue *kv;
        char lang[STRING_SIZE] = "en_US.utf8";
@@ -69,10 +69,9 @@ int main(int argc, char *argv[])
        sections[2] = _("Hostname");
        sections[3] = _("Domain name");
        sections[4] = _("Networking");
-       sections[5] = _("ISDN");
-       sections[6] = _("'root' password");
-       sections[7] = _("'admin' password");
-       sections[8] = NULL;
+       sections[5] = _("'root' password");
+       sections[6] = _("'admin' password");
+       sections[7] = NULL;
 
        newtInit();
        newtCls();
@@ -124,14 +123,10 @@ int main(int argc, char *argv[])
                                        break;
                                
                                case 5:
-                                       handleisdn();
-                                       break;
-
-                               case 6:
                                        handlerootpassword();
                                        break;
                                        
-                               case 7:
+                               case 6:
                                        handleadminpassword();
                                        break;
                
@@ -154,8 +149,6 @@ int main(int argc, char *argv[])
                        goto EXIT;
                if (!(handleadminpassword()))
                        goto EXIT;
-               if (!(handleisdn()))
-                       goto EXIT;
                if (!(handlenetworking()))
                        goto EXIT;
                if (!(handledhcp()))