- leafnode has its username hardcoded, change this to '_news'

- bump PKGNAME

reported and tested by Marco S Hyman,  maintainer timeout
This commit is contained in:
sturm 2003-07-26 13:24:08 +00:00
parent 045acb86d7
commit 14ac0f680e
4 changed files with 97 additions and 2 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.28 2003/06/23 19:11:10 sturm Exp $
# $OpenBSD: Makefile,v 1.29 2003/07/26 13:24:08 sturm Exp $
COMMENT= "USENET software package designed for small sites"
VERSION= 1.9.40
DISTNAME= leafnode-${VERSION}.rel
PKGNAME= leafnode-${VERSION}p0
PKGNAME= leafnode-${VERSION}p1
CATEGORIES= news
HOMEPAGE= http://www.leafnode.org/

View File

@ -0,0 +1,35 @@
$OpenBSD: patch-miscutil_c,v 1.1 2003/07/26 13:24:08 sturm Exp $
--- miscutil.c.orig Wed Jul 23 09:05:30 2003
+++ miscutil.c Wed Jul 23 09:06:01 2003
@@ -106,9 +106,9 @@ initvars(char *progname)
}
#ifndef TESTMODE
- pw = getpwnam("news");
+ pw = getpwnam("_news");
if (!pw) {
- fprintf(stderr, "no such user: news\n");
+ fprintf(stderr, "no such user: _news\n");
return FALSE;
}
#endif
@@ -129,7 +129,7 @@ initvars(char *progname)
|| st.st_uid != pw->pw_uid
#endif
) {
- fprintf(stderr, "Warning: cannot create %s with proper ownership: %s\nMake sure you run this program as user root or news.\n", s, strerror(e));
+ fprintf(stderr, "Warning: cannot create %s with proper ownership: %s\nMake sure you run this program as user root or _news.\n", s, strerror(e));
syslog(LOG_WARNING, "Warning: cannot create %s with proper ownership: %s", s, strerror(e));
suicide();
}
@@ -152,8 +152,8 @@ initvars(char *progname)
setreuid(pw->pw_uid, pw->pw_uid);
#endif
if (getuid() != pw->pw_uid || getgid() != pw->pw_gid) {
- syslog(LOG_ERR, "%s: must be run as news or root\n", progname);
- fprintf(stderr, "%s: must be run as news or root\n", progname);
+ syslog(LOG_ERR, "%s: must be run as _news or root\n", progname);
+ fprintf(stderr, "%s: must be run as _news or root\n", progname);
endpwent();
return FALSE;
}

View File

@ -0,0 +1,46 @@
$OpenBSD: patch-nntpd_c,v 1.3 2003/07/26 13:24:08 sturm Exp $
--- nntpd.c.orig Wed Jul 23 09:08:24 2003
+++ nntpd.c Wed Jul 23 09:09:54 2003
@@ -294,7 +294,7 @@ buildpseudoart(const char *grp)
fprintf(f, "Path: %s\n", fqdn);
fprintf(f, "Newsgroups: %s\n", grp);
- fprintf(f, "From: Leafnode <news@%s>\n", fqdn);
+ fprintf(f, "From: Leafnode <_news@%s>\n", fqdn);
fprintf(f, "Subject: Leafnode placeholder for group %s\n", grp);
fprintf(f, "Date: %s\n", rfctime());
fprintf(f, "Message-ID: <leafnode:placeholder:%s@%s>\n", grp, fqdn);
@@ -838,7 +838,7 @@ list(struct newsgroup *g, int what, cons
printf("%s\t%s\r\n", g->name, g->desc ? g->desc : "-x-");
break;
case 2:
- printf("%s %lu news@%s\r\n", g->name, (unsigned long)g->age, fqdn);
+ printf("%s %lu _news@%s\r\n", g->name, (unsigned long)g->age, fqdn);
break;
default:
break;
@@ -1469,7 +1469,7 @@ doxhdr(char *arg)
if (n == 0) /* Subject: */
printf("Leafnode placeholder for group %s\r\n", group->name);
else if (n == 1) /* From: */
- printf("Leafnode <news@%s>\r\n", fqdn);
+ printf("Leafnode <_news@%s>\r\n", fqdn);
else if (n == 2) /* Date: */
printf("%s\r\n", rfctime());
else if (n == 3) /* Message-ID: */
@@ -1657,13 +1657,13 @@ doxover(char *arg)
"postings %lu-%lu:", group->first, group->first);
printf("%lu\t"
"Leafnode placeholder for group %s\t"
- "news@%s (Leafnode)\t%s\t"
+ "_news@%s (Leafnode)\t%s\t"
"<leafnode:placeholder:%s@%s>\t\t1000\t40\r\n", group->first,
group->name, fqdn, rfctime(), group->name, fqdn);
printf(".\r\n");
if (debugmode)
syslog(LOG_DEBUG, ">%lu\tLeafnode placeholder for group %s\t"
- "news@%s (Leafnode)\t%s\t<leafnode:placeholder:%s@%s>\t\t1000\t40",
+ "_news@%s (Leafnode)\t%s\t<leafnode:placeholder:%s@%s>\t\t1000\t40",
group->first, group->name, fqdn, rfctime(), group->name, fqdn);
}
}

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-quickmkdir_c,v 1.1 2003/07/26 13:24:08 sturm Exp $
--- quickmkdir.c.orig Wed Jul 23 09:09:59 2003
+++ quickmkdir.c Wed Jul 23 09:11:44 2003
@@ -51,8 +51,8 @@ main(int argc, char **argv)
const char *prepend;
int i, maxlen;
- if (!(pw = getpwnam("news")))
- die("getpwnam(\"news\")");
+ if (!(pw = getpwnam("_news")))
+ die("getpwnam(\"_news\")");
user = pw->pw_uid;
if (!(gr = getgrnam("news")))
die("getgrnam(\"news\")");