Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Remove quotactl(8). Successor for backup purposes is quotare...
details: https://anonhg.NetBSD.org/src/rev/41fe634f328b
branches: trunk
changeset: 773681:41fe634f328b
user: dholland <dholland%NetBSD.org@localhost>
date: Mon Feb 13 01:43:22 2012 +0000
description:
Remove quotactl(8). Successor for backup purposes is quotarestore(8).
Note that as of this writing the tool continues to work with the old
proplib-xml packet interface against the new libquota(3), so anyone
who has a use for it can bring it back from the Attic and/or create a
pkgsrc package.
Approved by releng for the freeze, and specifically okayed by core a
couple months ago.
diffstat:
distrib/sets/lists/base/mi | 4 +-
distrib/sets/lists/comp/mi | 4 +-
distrib/sets/lists/man/mi | 8 +-
usr.sbin/Makefile | 4 +-
usr.sbin/quotactl/Makefile | 12 -
usr.sbin/quotactl/proplib-interpreter.c | 881 --------------------------------
usr.sbin/quotactl/proplib-interpreter.h | 2 -
usr.sbin/quotactl/quotactl.8 | 137 ----
usr.sbin/quotactl/quotactl.c | 196 -------
usr.sbin/quotactl/quotaprop.c | 214 -------
usr.sbin/quotactl/quotaprop.h | 87 ---
11 files changed, 10 insertions(+), 1539 deletions(-)
diffs (truncated from 1647 to 300 lines):
diff -r 06ed75412314 -r 41fe634f328b distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi Mon Feb 13 01:35:06 2012 +0000
+++ b/distrib/sets/lists/base/mi Mon Feb 13 01:43:22 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.982 2012/02/13 01:35:06 dholland Exp $
+# $NetBSD: mi,v 1.983 2012/02/13 01:43:22 dholland Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1389,7 +1389,7 @@
./usr/sbin/pwd_mkdb base-sysutil-bin
./usr/sbin/quot base-sysutil-bin
./usr/sbin/quotacheck base-sysutil-bin
-./usr/sbin/quotactl base-sysutil-bin
+./usr/sbin/quotactl base-obsolete obsolete
./usr/sbin/quotadump base-sysutil-bin
./usr/sbin/quotaoff base-sysutil-bin
./usr/sbin/quotaon base-sysutil-bin
diff -r 06ed75412314 -r 41fe634f328b distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi Mon Feb 13 01:35:06 2012 +0000
+++ b/distrib/sets/lists/comp/mi Mon Feb 13 01:43:22 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1735 2012/02/13 01:35:06 dholland Exp $
+# $NetBSD: mi,v 1.1736 2012/02/13 01:43:23 dholland Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -4229,7 +4229,7 @@
./usr/libdata/debug/usr/sbin/pwd_mkdb.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/quot.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/quotacheck.debug comp-sysutil-debug debug
-./usr/libdata/debug/usr/sbin/quotactl.debug comp-sysutil-debug debug
+./usr/libdata/debug/usr/sbin/quotactl.debug comp-obsolete obsolete
./usr/libdata/debug/usr/sbin/quotadump.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/quotaon.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/quotarestore.debug comp-sysutil-debug debug
diff -r 06ed75412314 -r 41fe634f328b distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Mon Feb 13 01:35:06 2012 +0000
+++ b/distrib/sets/lists/man/mi Mon Feb 13 01:43:22 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1377 2012/02/13 01:35:08 dholland Exp $
+# $NetBSD: mi,v 1.1378 2012/02/13 01:43:24 dholland Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2698,7 +2698,7 @@
./usr/share/man/cat8/qmqpd.0 man-obsolete obsolete
./usr/share/man/cat8/quot.0 man-sysutil-catman .cat
./usr/share/man/cat8/quotacheck.0 man-sysutil-catman .cat
-./usr/share/man/cat8/quotactl.0 man-sysutil-catman .cat
+./usr/share/man/cat8/quotactl.0 man-obsolete obsolete
./usr/share/man/cat8/quotadump.0 man-sysutil-catman .cat
./usr/share/man/cat8/quotaoff.0 man-sysutil-catman .cat
./usr/share/man/cat8/quotaon.0 man-sysutil-catman .cat
@@ -5312,7 +5312,7 @@
./usr/share/man/html8/qmgr.html man-postfix-htmlman postfix,html
./usr/share/man/html8/quot.html man-sysutil-htmlman html
./usr/share/man/html8/quotacheck.html man-sysutil-htmlman html
-./usr/share/man/html8/quotactl.html man-sysutil-htmlman html
+./usr/share/man/html8/quotactl.html man-obsolete obsolete
./usr/share/man/html8/quotadump.html man-sysutil-htmlman html
./usr/share/man/html8/quotaoff.html man-sysutil-htmlman html
./usr/share/man/html8/quotaon.html man-sysutil-htmlman html
@@ -8203,7 +8203,7 @@
./usr/share/man/man8/qmqpd.8 man-obsolete obsolete
./usr/share/man/man8/quot.8 man-sysutil-man .man
./usr/share/man/man8/quotacheck.8 man-sysutil-man .man
-./usr/share/man/man8/quotactl.8 man-sysutil-man .man
+./usr/share/man/man8/quotactl.8 man-obsolete obsolete
./usr/share/man/man8/quotadump.8 man-sysutil-man .man
./usr/share/man/man8/quotaoff.8 man-sysutil-man .man
./usr/share/man/man8/quotaon.8 man-sysutil-man .man
diff -r 06ed75412314 -r 41fe634f328b usr.sbin/Makefile
--- a/usr.sbin/Makefile Mon Feb 13 01:35:06 2012 +0000
+++ b/usr.sbin/Makefile Mon Feb 13 01:43:22 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.262 2012/02/13 01:35:08 dholland Exp $
+# $NetBSD: Makefile,v 1.263 2012/02/13 01:43:22 dholland Exp $
# from: @(#)Makefile 5.20 (Berkeley) 6/12/93
.include <bsd.own.mk>
@@ -21,7 +21,7 @@
ofctl \
paxctl pcictl perfused pppd psrset pstat pwd_mkdb postinstall \
powerd puffs \
- quot quotacheck quotactl quotaon quotarestore \
+ quot quotacheck quotaon quotarestore \
rarpd rbootd rdate repquota rmt rpc.bootparamd rpc.lockd \
rpc.pcnfsd rpc.statd rpcbind rwhod \
sa screenblank sdpd services_mkdb sesd schedctl sliplogin spray \
diff -r 06ed75412314 -r 41fe634f328b usr.sbin/quotactl/Makefile
--- a/usr.sbin/quotactl/Makefile Mon Feb 13 01:35:06 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $NetBSD: Makefile,v 1.6 2012/02/01 17:53:01 dholland Exp $
-
-.include <bsd.own.mk>
-PROG= quotactl
-SRCS= quotactl.c proplib-interpreter.c quotaprop.c
-MAN= quotactl.8
-
-DPADD= ${LIBPROP} ${LIBQUOTA} ${LIBRPCSVC}
-LDADD= -lprop -lquota -lrpcsvc
-
-.include <bsd.prog.mk>
diff -r 06ed75412314 -r 41fe634f328b usr.sbin/quotactl/proplib-interpreter.c
--- a/usr.sbin/quotactl/proplib-interpreter.c Mon Feb 13 01:35:06 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,881 +0,0 @@
-/* $NetBSD: proplib-interpreter.c,v 1.4 2012/02/02 03:01:42 matt Exp $ */
-
-/*
- * Copyright (c) 1991, 1993, 1994
- * The Regents of the University of California. All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)ufs_vfsops.c 8.8 (Berkeley) 5/20/95
- * From NetBSD: ufs_vfsops.c,v 1.42 2011/03/24 17:05:46 bouyer Exp
- */
-
-/*
- * Copyright (c) 1982, 1986, 1990, 1993, 1995
- * The Regents of the University of California. All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Robert Elz at The University of Melbourne.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)ufs_quota.c 8.5 (Berkeley) 5/20/95
- * From NetBSD: ufs_quota.c,v 1.70 2011/03/24 17:05:46 bouyer Exp
- */
-
-/*
- * From NetBSD: vfs_quotactl.c,v 1.36 2012/01/29 07:21:59 dholland Exp
- */
-
-/*
- * Note that both of the copyrights above are moderately spurious;
- * this code should almost certainly have the Copyright 2010 Manuel
- * Bouyer notice and license found in e.g. sys/ufs/ufs/quota2_subr.c.
- * However, they're what was on the files this code was sliced out of.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: proplib-interpreter.c,v 1.4 2012/02/02 03:01:42 matt Exp $");
-
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <err.h>
-#include <assert.h>
-
-#include <quota.h>
-
-#include "quotaprop.h"
-#include "proplib-interpreter.h"
-
-static int
-vfs_quotactl_getversion(struct quotahandle *qh,
- prop_dictionary_t cmddict, int q2type,
- prop_array_t datas)
-{
- prop_array_t replies;
- prop_dictionary_t data;
- unsigned restrictions;
- int q2version;
-
- assert(prop_object_type(cmddict) == PROP_TYPE_DICTIONARY);
- assert(prop_object_type(datas) == PROP_TYPE_ARRAY);
-
- restrictions = quota_getrestrictions(qh);
-
- /*
- * Set q2version based on the stat results. Currently there
- * are two valid values for q2version, 1 and 2, which we pick
- * based on whether quotacheck is required.
- */
- if (restrictions & QUOTA_RESTRICT_NEEDSQUOTACHECK) {
- q2version = 1;
- } else {
- q2version = 2;
- }
-
- data = prop_dictionary_create();
- if (data == NULL) {
- return ENOMEM;
- }
-
- if (!prop_dictionary_set_int8(data, "version", q2version)) {
- prop_object_release(data);
- return ENOMEM;
- }
-
- replies = prop_array_create();
- if (replies == NULL) {
- prop_object_release(data);
- return ENOMEM;
- }
-
- if (!prop_array_add_and_rel(replies, data)) {
- prop_object_release(data);
- prop_object_release(replies);
- return ENOMEM;
- }
-
- if (!prop_dictionary_set_and_rel(cmddict, "data", replies)) {
- prop_object_release(replies);
- return ENOMEM;
- }
-
- return 0;
-}
-
-static int
-vfs_quotactl_quotaon(struct quotahandle *qh,
- prop_dictionary_t cmddict, int q2type,
- prop_array_t datas)
-{
- prop_dictionary_t data;
- const char *qfile;
-
- assert(prop_object_type(cmddict) == PROP_TYPE_DICTIONARY);
- assert(prop_object_type(datas) == PROP_TYPE_ARRAY);
-
- if (prop_array_count(datas) != 1)
- return EINVAL;
-
- data = prop_array_get(datas, 0);
- if (data == NULL)
- return ENOMEM;
- if (!prop_dictionary_get_cstring_nocopy(data, "quotafile",
- &qfile))
- return EINVAL;
-
- /* libquota knows the filename; cannot set it from here */
- (void)qfile;
-
- if (quota_quotaon(qh, q2type)) {
- return errno;
- }
- return 0;
-}
-
-static int
-vfs_quotactl_quotaoff(struct quotahandle *qh,
- prop_dictionary_t cmddict, int q2type,
- prop_array_t datas)
-{
Home |
Main Index |
Thread Index |
Old Index