[src/netbsd-1-6]: src/distrib/utils/sysinst pull up revs 1.69-1.70 of util.c ...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a56d1106c77b
branches:  netbsd-1-6
changeset: 528055:a56d1106c77b
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Jun 21 16:03:48 2002 +0000

description:
pull up revs 1.69-1.70 of util.c via patch (requested by itojun in ticket #141)
and associated menu & message changes:
    revision 1.70
        ``des'' isn't a valid parameter as cipher name.  Use ``old'' instead
        as per pwd_gensalt.c (or passwd.conf(5)).  Compile test only.
    revision 1.69
        have an option to leave passwd.conf unchanged, particularly for
        upgrading.  From: Tetsuya Isaki <isaki%par.odn.ne.jp@localhost>
        XXX translation needed

diffstat:

 distrib/utils/sysinst/menus.mi.en |   5 +++--
 distrib/utils/sysinst/menus.mi.pl |   5 +++--
 distrib/utils/sysinst/msg.mi.en   |   5 ++++-
 distrib/utils/sysinst/msg.mi.pl   |   5 ++++-
 distrib/utils/sysinst/util.c      |  21 ++++++++++++++++-----
 5 files changed, 30 insertions(+), 11 deletions(-)

diffs (120 lines):

diff -r 7d1bd020e23d -r a56d1106c77b distrib/utils/sysinst/menus.mi.en
--- a/distrib/utils/sysinst/menus.mi.en Fri Jun 21 15:01:24 2002 +0000
+++ b/distrib/utils/sysinst/menus.mi.en Fri Jun 21 16:03:48 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: menus.mi.en,v 1.51 2002/04/16 02:20:17 mycroft Exp $   */
+/*     $NetBSD: menus.mi.en,v 1.51.2.1 2002/06/21 16:03:48 lukem Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -325,8 +325,9 @@
        option "Abort install", exit, action { yesno = 0; };
 
 menu crypttype, title "Password cipher";
-       option "MD5", exit, action { yesno = 0; };
        option "DES", exit, action { yesno = 1; };
+       option "MD5", exit, action { yesno = 2; };
+       option "do not change", exit, action { yesno = 0; };
 
 menu cdromsource, title "Change";
        display action
diff -r 7d1bd020e23d -r a56d1106c77b distrib/utils/sysinst/menus.mi.pl
--- a/distrib/utils/sysinst/menus.mi.pl Fri Jun 21 15:01:24 2002 +0000
+++ b/distrib/utils/sysinst/menus.mi.pl Fri Jun 21 16:03:48 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: menus.mi.pl,v 1.3 2002/04/16 02:20:17 mycroft Exp $    */
+/*     $NetBSD: menus.mi.pl,v 1.3.2.1 2002/06/21 16:03:48 lukem Exp $  */
 /*     Based on english version: */
 /*     NetBSD: menus.mi.en,v 1.49 2002/04/04 14:26:44 ad Exp   */
 
@@ -327,8 +327,9 @@
        option "Przerwac instalacje", exit, action { yesno = 0; };
 
 menu crypttype, title "Kodowanie hasel";
-       option "MD5", exit, action { yesno = 0; };
        option "DES", exit, action { yesno = 1; };
+       option "MD5", exit, action { yesno = 2; };
+       option "nie zmieniaj", exit, action { yesno = 0; };
 
 menu cdromsource, title "Zmien";
        display action
diff -r 7d1bd020e23d -r a56d1106c77b distrib/utils/sysinst/msg.mi.en
--- a/distrib/utils/sysinst/msg.mi.en   Fri Jun 21 15:01:24 2002 +0000
+++ b/distrib/utils/sysinst/msg.mi.en   Fri Jun 21 16:03:48 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.mi.en,v 1.86 2002/04/04 14:26:44 ad Exp $  */
+/*     $NetBSD: msg.mi.en,v 1.86.2.1 2002/06/21 16:03:48 lukem Exp $   */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -824,6 +824,9 @@
 
 If you have a network and intend to use NIS, please bear in mind the
 capabilities of other machines on your network.
+
+If you are upgrading and would like to keep configuration unchanged,
+choose the last option "do not change".
 }
 
 message swapactive
diff -r 7d1bd020e23d -r a56d1106c77b distrib/utils/sysinst/msg.mi.pl
--- a/distrib/utils/sysinst/msg.mi.pl   Fri Jun 21 15:01:24 2002 +0000
+++ b/distrib/utils/sysinst/msg.mi.pl   Fri Jun 21 16:03:48 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.mi.pl,v 1.1 2002/04/09 19:47:58 hubertf Exp $      */
+/*     $NetBSD: msg.mi.pl,v 1.1.2.1 2002/06/21 16:03:48 lukem Exp $    */
 /*     Based on english version: */
 /*     NetBSD: msg.mi.en,v 1.86 2002/04/04 14:26:44 ad Exp     */
 
@@ -824,6 +824,9 @@
 
 Jesli posiadasz siec oraz zamierasz korzystac z NIS, pamietaj o mozliwosciach
 innych maszyn w twojej sieci.
+
+Jezeli uaktualniasz swoj system i nie chcesz, aby zostaly dokonane zmiany w
+konfiguracji, wybierz ostatnia opcje "nie zmieniaj".
 }
 
 message swapactive
diff -r 7d1bd020e23d -r a56d1106c77b distrib/utils/sysinst/util.c
--- a/distrib/utils/sysinst/util.c      Fri Jun 21 15:01:24 2002 +0000
+++ b/distrib/utils/sysinst/util.c      Fri Jun 21 16:03:48 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.c,v 1.67.2.1 2002/06/06 09:58:45 lukem Exp $      */
+/*     $NetBSD: util.c,v 1.67.2.2 2002/06/21 16:03:49 lukem Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1060,17 +1060,28 @@
        msg_display(MSG_choose_crypt);
        process_menu(MENU_crypttype);
        fn = strdup(target_expand("/etc/passwd.conf"));
-       rename(fn, target_expand("/etc/passwd.conf.pre-sysinst"));
 
-       if (!yesno) {
+       switch (yesno) {
+       case 0:
+               break;
+       case 1: /* DES */
+               rename(fn, target_expand("/etc/passwd.conf.pre-sysinst"));
                pwc = fopen(fn, "w");
-
+               fprintf(pwc,
+                   "default:\n"
+                   "  localcipher = old\n"
+                   "  ypcipher = old\n");
+               fclose(pwc);
+               break;
+       case 2: /* MD5 */
+               rename(fn, target_expand("/etc/passwd.conf.pre-sysinst"));
+               pwc = fopen(fn, "w");
                fprintf(pwc,
                    "default:\n"
                    "  localcipher = md5\n"
                    "  ypcipher = md5\n");
-
                fclose(pwc);
+               break;
        }
 
        free(fn);