From owner-freebsd-current Fri May 31 21: 8:16 2002 Delivered-To: freebsd-current@freebsd.org Received: from castle.jp.FreeBSD.org (castle.jp.FreeBSD.org [210.226.20.15]) by hub.freebsd.org (Postfix) with ESMTP id C839237B40B for ; Fri, 31 May 2002 21:08:01 -0700 (PDT) Received: from localhost (localhost [::1]) by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) with ESMTP/inet6 id g51480v57546 for ; Sat, 1 Jun 2002 13:08:00 +0900 (JST) (envelope-from matusita@jp.FreeBSD.org) X-User-Agent: Mew/1.94.2 XEmacs/21.5 (bamboo) X-FaceAnim: (-O_O-)(O_O- )(_O- )(O- )(- -)( -O)( -O_)( -O_O)(-O_O-) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Dispatcher: imput version 20000228(IM140) Lines: 70 From: Makoto Matsushita To: current@FreeBSD.org Subject: Call for Review: allow sysinstall to tweak tri-value sendmail_enable Date: Sat, 01 Jun 2002 13:07:58 +0900 Message-Id: <20020601130758S.matusita@jp.FreeBSD.org> Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Here is a patch to enable sysinstall to set 'sendmail_enable' value to 'YES', 'NO', and 'NONE'. Current sysinstall can't set this value to 'NONE'; users who do *not* want to use sendmail can't stop sendmail via sysinstall. Following patch creates submenu to change the sendmail_enable value. However, I don't know who want to set this variable to 'NO'. If selecting 'YES' and 'NONE' is enough, I'll try to make another patch. Any comments? I want to push this feature to 4.6-RELEASE... -- - Makoto `MAR' Matsushita Index: menus.c =================================================================== RCS file: /home/ncvs/src/usr.sbin/sysinstall/menus.c,v retrieving revision 1.343 diff -u -r1.343 menus.c --- menus.c 20 May 2002 17:08:00 -0000 1.343 +++ menus.c 31 May 2002 17:49:18 -0000 @@ -1372,11 +1372,31 @@ { " Rwhod", "This machine wants to run the rwho daemon", dmenuVarCheck, dmenuToggleVariable, NULL, "rwhod_enable=YES" }, { " Sendmail", "This machine wants to run the sendmail daemon", - dmenuVarCheck, dmenuToggleVariable, NULL, "sendmail_enable=YES" }, + NULL, dmenuSubmenu, NULL, &MenuSendmail }, { " Sshd", "This machine wants to run the ssh daemon", dmenuVarCheck, dmenuToggleVariable, NULL, "sshd_enable=YES" }, { " TCP Extensions", "Allow RFC1323 and RFC1644 TCP extensions?", dmenuVarCheck, dmenuToggleVariable, NULL, "tcp_extensions=YES" }, + { NULL } }, +}; + +DMenu MenuSendmail = { + DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS, + "Sendmail Invocation Selection", + "There are three options for invocating sendmail at startup.\n" + "Please select Yes if you want to use sendmail as your mail transfer\n" + "agent. Selecting No disables sendmail to open network socket for\n" + "incoming email, but still runs at startup. None disables sendmail\n" + "completely at startup.", + NULL, + NULL, + { + { " Yes", "Start sendmail", + dmenuVarCheck, dmenuSetVariable, NULL, "sendmail_enable=YES" }, + { " No", "Start sendmail, but don't listen from network", + dmenuVarCheck, dmenuSetVariable, NULL, "sendmail_enable=NO" }, + { " None", "Don't start any sendmail processes", + dmenuVarCheck, dmenuSetVariable, NULL, "sendmail_enable=NONE" }, { NULL } }, }; Index: sysinstall.h =================================================================== RCS file: /home/ncvs/src/usr.sbin/sysinstall/sysinstall.h,v retrieving revision 1.227 diff -u -r1.227 sysinstall.h --- sysinstall.h 31 May 2002 13:38:17 -0000 1.227 +++ sysinstall.h 31 May 2002 17:49:19 -0000 @@ -407,6 +407,7 @@ extern DMenu MenuSysconsScrnmap; /* System console screenmap configuration menu */ extern DMenu MenuSysconsTtys; /* System console terminal type menu */ extern DMenu MenuNetworking; /* Network configuration menu */ +extern DMenu MenuSendmail; /* Sendmail configuration menu */ extern DMenu MenuInstallCustom; /* Custom Installation menu */ extern DMenu MenuDistributions; /* Distribution menu */ extern DMenu MenuDiskDevices; /* Disk type devices */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message