summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2002-06-17 18:01:07 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2002-06-17 18:01:07 +0000
commit7606c8e20b4ed26553b68c1768c6ddf809060c42 (patch)
tree6acde1b50844355e5f82fa2ebeb8ba03f83b4643
parentd6d06a1e4203636543d2078b47d6af7cc2fb563c (diff)
only make -g available to root, by disabling setgid kmem; bunch of people ok
-rw-r--r--sbin/ccdconfig/Makefile7
-rw-r--r--sbin/ccdconfig/ccdconfig.85
2 files changed, 8 insertions, 4 deletions
diff --git a/sbin/ccdconfig/Makefile b/sbin/ccdconfig/Makefile
index 583d89e6079..d9845fec111 100644
--- a/sbin/ccdconfig/Makefile
+++ b/sbin/ccdconfig/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 1997/09/21 11:36:07 deraadt Exp $
+# $OpenBSD: Makefile,v 1.5 2002/06/17 18:01:06 deraadt Exp $
PROG= ccdconfig
MAN= ccdconfig.8
-BINGRP= kmem
-BINMODE=2555
+# Only permit root to use -g
+#BINGRP= kmem
+#BINMODE=2555
DPADD= ${LIBKVM} ${LIBUTIL}
LDADD= -lkvm -lutil
diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8
index 34845423b83..d4f39b494f2 100644
--- a/sbin/ccdconfig/ccdconfig.8
+++ b/sbin/ccdconfig/ccdconfig.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ccdconfig.8,v 1.15 2001/11/09 00:56:24 miod Exp $
+.\" $OpenBSD: ccdconfig.8,v 1.16 2002/06/17 18:01:06 deraadt Exp $
.\" $NetBSD: ccdconfig.8,v 1.4 1996/02/28 01:01:17 thorpej Exp $
.\"
.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -96,6 +96,9 @@ ccd configuration file.
If no arguments are specified, every configured
ccd is dumped.
Otherwise, the configuration of each listed ccd is dumped.
+Only root can dump the configuration (unless
+.Nm
+is made setgid kmem).
.It Fl M Ar core
Extract values associated with the name list from
.Ar core