$OpenBSD: patch-INSTALL,v 1.8 2004/06/14 05:06:20 sturm Exp $

--- INSTALL.orig	2004-06-02 12:07:40.000000000 +0200
+++ INSTALL	2004-06-13 18:40:54.000000000 +0200
@@ -80,7 +80,7 @@ as sudo.
  ## user is in.)
 
     NOTE: DO MAKE SURE that the lock file is in a directory that is writable by
-    the user "news". Leafnode will have dropped root privileges when it tries
+    the user "_news". Leafnode will have dropped root privileges when it tries
     to obtain the lock file, and it needs write access. The new default (as of
     1.9.37) should be fine in most cases.
 
@@ -101,16 +101,16 @@ as sudo.
 
     All tests must pass, otherwise, ask on the leafnode mailing list for help.
 
-3a. (as root) Create a "news" user if you don't have one.
+3a. (as root) Create a "_news" user if you don't have one.
 
 3b. (as root) Create an alias in your mail system to forward mail addressed to
-    "news" to the real user who looks after leafnode.
+    "_news" to the real user who looks after leafnode.
 
     If you run qmail: get and install the fastforward package. It is available
     from qmail distribution sites.
 
     Find your aliases file (/etc/aliases or /etc/mail/aliases), add a line
-    "news: joe" (assuming joe looks after your leafnode) and then type
+    "_news: joe" (assuming joe looks after your leafnode) and then type
 
 	newaliases.
 
@@ -162,12 +162,12 @@ as sudo.
     discarded at the upstream server, posts being discarded when Message-IDs of
     different postings clash and other troubles.
 
-8.  (as news) Set up a cron job to run texpire every night or maybe every week.
+8.  (as _news) Set up a cron job to run texpire every night or maybe every week.
     Here is my crontab line, which runs nightly:
 
     0 4 * * * /usr/local/sbin/texpire
 
-    I did "crontab -u news -e" as root to edit the crontab file, and added this
+    I did "crontab -u _news -e" as root to edit the crontab file, and added this
     line.  Substituting "1" for the third "*", thus:
 
     0 4 * * 1 /usr/local/sbin/texpire
@@ -176,9 +176,9 @@ as sudo.
     details.
 
 9.  Make sure fetchnews is run at the appropriate time.  If you have a
-    full-time link, run it from cron (as "news" again), if not, run it when
+    full-time link, run it from cron (as "_news" again), if not, run it when
     your connection to the net is established.  If it is run as root, it will
-    change its user ID to "news" automatically. If you use PPP, you can
+    change its user ID to "_news" automatically. If you use PPP, you can
     probably run fetchnews from /etc/ppp/ip-up.local or /etc/ppp/ip-up.
 
 10. (as root) Edit /etc/hosts.deny to add a line:
@@ -226,11 +226,10 @@ as sudo.
     incoming NNTP connections.  Here is my inetd.conf line (insert it at the
     leftmost column, without leading spaces!):
 
-    nntp stream tcp nowait news /usr/sbin/tcpd /usr/local/sbin/leafnode
+    nntp stream tcp nowait _news /usr/libexec/tcpd /usr/local/sbin/leafnode
 
     This starts leafnode for all connections on the nntp port, subject to
-    /etc/hosts.allow and /etc/hosts.deny screening.  If you don't have
-    /usr/sbin/tcpd, fetch the tcp_wrappers package and install it.
+    /etc/hosts.allow and /etc/hosts.deny screening.
 
     Using leafnode without tcpd is not supported and opens your computer to
     abuse (even happens on modem lines that are only connected during the
@@ -268,7 +267,7 @@ as sudo.
 	    socket_type     = stream
 	    protocol        = tcp
 	    wait            = no
-	    user            = news
+	    user            = _news
 	    server          = /usr/sbin/tcpd
 	    server_args     = /usr/local/sbin/leafnode
 	    instances       = 7
@@ -334,7 +333,7 @@ as sudo.
        #! /bin/sh
        exec 2>&1
        exec /usr/local/bin/tcpserver -c10 -l0 -H -v 127.0.0.1 119 \
-       /usr/local/bin/setuidgid news /usr/local/bin/argv0 /usr/sbin/tcpd \
+       /usr/local/bin/setuidgid _news /usr/local/bin/argv0 /usr/sbin/tcpd \
        /usr/local/sbin/leafnode
 
        You may need to adjust the paths if your software is in a non-standard
@@ -350,7 +349,7 @@ as sudo.
        exec 2>&1
        exec /usr/local/bin/tcpserver -c10 -l0 -H -v -x nntp.cdb \
        127.0.0.1 119 \
-       /usr/local/bin/setuidgid news /usr/local/sbin/leafnode
+       /usr/local/bin/setuidgid _news /usr/local/sbin/leafnode
 
        As above, adjust the paths and the IP.
 
@@ -385,7 +384,7 @@ as sudo.
     svscan should notice the new leafnode service within 5 seconds and
     start it.
 
-12. (as root or news) Run fetchnews.  The first run will take some time since
+12. (as root or _news) Run fetchnews.  The first run will take some time since
     fetchnews reads a list of all newsgroups from your upstream server.  With
     an 28.8 modem, it can take as long as 60 minutes (depending on how many
     newsgroups your provider offers). To see fetchnews working, run it with
@@ -412,7 +411,7 @@ as sudo.
     After this, you should have empty files in
     /var/spool/news/interesting.groups/ for every group you want to read.
 
-14. (as root or news) Run fetchnews again. This run should pick up all the
+14. (as root or _news) Run fetchnews again. This run should pick up all the
     groups you want to read.
 
 15. Note: for access from remote sites, outside of your LAN, additional
