From 63b5983b9ea282c68370d7ad556110662ed9687b Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Mon, 28 Jun 1999 03:15:02 +0000
Subject: [PATCH] Syntax for user/group is changed from "user.group" to
"user:group" to be consistant with chown(8).
---
etc/newsyslog.conf | 4 ++--
usr.sbin/newsyslog/newsyslog.8 | 14 +++++++++++---
usr.sbin/newsyslog/newsyslog.c | 4 ++--
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/etc/newsyslog.conf b/etc/newsyslog.conf
index 82cd3a610193..9714ce94ccf3 100644
--- a/etc/newsyslog.conf
+++ b/etc/newsyslog.conf
@@ -1,7 +1,7 @@
# configuration file for newsyslog
-# $Id: newsyslog.conf,v 1.19 1999/06/01 11:20:15 ru Exp $
+# $Id: newsyslog.conf,v 1.20 1999/06/28 03:03:17 obrien Exp $
#
-# logfilename [owner.group] mode count size when [ZB] [/pid_file] [sig_num]
+# logfilename [owner:group] mode count size when [ZB] [/pid_file] [sig_num]
/var/cron/log 600 3 100 * Z
/var/log/amd.log 664 7 100 * Z
/var/log/kerberos.log 664 7 100 * Z
diff --git a/usr.sbin/newsyslog/newsyslog.8 b/usr.sbin/newsyslog/newsyslog.8
index 154d1670d50e..8313c4736f9c 100644
--- a/usr.sbin/newsyslog/newsyslog.8
+++ b/usr.sbin/newsyslog/newsyslog.8
@@ -1,7 +1,7 @@
.\" This file contains changes from the Open Software Foundation.
.\"
.\" from: @(#)newsyslog.8
-.\" $Id: newsyslog.8,v 1.17 1999/01/28 19:56:05 wollman Exp $
+.\" $Id: newsyslog.8,v 1.18 1999/04/10 15:09:07 chuckr Exp $
.\"
.\" Copyright 1988, 1989 by the Massachusetts Institute of Technology
.\"
@@ -81,9 +81,9 @@ follows:
.Bl -tag -width indent
.It Ar logfile_name
Name of the system log file to be archived.
-.It Ar owner.group
+.It Ar owner:group
This optional field specifies the owner and group for the archive file.
-The "." is essential, even if the
+The ":" is essential, even if the
.Ar owner
or
.Ar group
@@ -274,7 +274,15 @@ Doesn't yet automatically read the logs to find security breaches.
MIT Project Athena
.Pp
Copyright 1987, Massachusetts Institute of Technology
+.Sh COMPATIBILITY
+Previous versions of the chown utility used the dot (``.'') character to
+distinguish the group name.
+Begining with
+.Fx 4.0 ,
+this has been changed to be a colon (``:'') character so that user and group
+names may contain the dot character.
.Sh "SEE ALSO"
.Xr gzip 1 ,
.Xr syslog 3 ,
+.Xr chown 8 ,
.Xr syslogd 8
diff --git a/usr.sbin/newsyslog/newsyslog.c b/usr.sbin/newsyslog/newsyslog.c
index 832a8c32a1b7..40dfdd98e219 100644
--- a/usr.sbin/newsyslog/newsyslog.c
+++ b/usr.sbin/newsyslog/newsyslog.c
@@ -27,7 +27,7 @@ provided "as is" without express or implied warranty.
#ifndef lint
static const char rcsid[] =
- "$Id: newsyslog.c,v 1.21 1998/12/23 12:03:33 peter Exp $";
+ "$Id: newsyslog.c,v 1.22 1999/01/22 19:38:39 wollman Exp $";
#endif /* not lint */
#define OSF
@@ -286,7 +286,7 @@ static struct conf_entry *parse_file()
if (!*parse)
errx(1, "malformed line (missing fields):\n%s", errline);
*parse = '\0';
- if ((group = strchr(q, '.')) != NULL) {
+ if ((group = strchr(q, ':')) != NULL) {
*group++ = '\0';
if (*q) {
if (!(isnumber(*q))) {