Updated rpc.rquotad doc. (Jan Kara)

Disabled setquota by default in config and daemon. (Jan Kara)

5 files changed, 55 insertions, 8 deletions

diff --git a/Changelog b/Changelog
index 57f423c..fd9a690 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,7 @@
 Changes in quota-tools from 3.06 to 3.07
+* updated manpage of rpc.rquotad (Jan Kara)
+* setquota is disabled by default in rpc.rquotad (Jan Kara)
+* setquota using RPC is disabled by default in configure (Jan Kara)
 * rised maximal number of mountpoint to 256 (Jan Kara)
 * small fix in configure (Nathan Scott)
 
diff --git a/configure.in b/configure.in
index eb6d566..621608f 100644
--- a/configure.in
+++ b/configure.in
@@ -90,9 +90,9 @@ AC_ARG_ENABLE(rpc,
 	,
 	enable_rpc="yes")
 AC_ARG_ENABLE(rpcsetquota,
-	[  --enable-rpcsetquota=[yes/no]   Use RPC for setting quotas [default=yes].],
+	[  --enable-rpcsetquota=[yes/no]   Use RPC for setting quotas [default=no].],
 	,
-	enable_rpcsetquota="yes")
+	enable_rpcsetquota="no")
 AC_ARG_ENABLE(bsd_behaviour,
 	[  --enable-bsd_behaviour=[yes/no]   Mimic BSD behaviour [default=yes].],
 	,
diff --git a/rquota_client.c b/rquota_client.c
index 4b5a582..e415bd8 100644
--- a/rquota_client.c
+++ b/rquota_client.c
@@ -9,7 +9,7 @@
  *
  *          This part does the rpc-communication with the rquotad.
  *
- * Version: $Id: rquota_client.c,v 1.5 2001/08/22 21:17:56 jkar8572 Exp $
+ * Version: $Id: rquota_client.c,v 1.6 2002/06/27 08:14:09 jkar8572 Exp $
  *
  * Author:  Marco van Wieringen <mvw@planets.elm.net>
  *
@@ -342,5 +342,6 @@ int rpc_rquota_set(int qcmd, struct dquot *dquot)
 	free(fsname_tmp);
 	return rquota_err(result?result->status:-1);
 #endif
+	return -1;
 }
 #endif
diff --git a/rquota_svc.c b/rquota_svc.c
index c78dc05..fbece01 100644
--- a/rquota_svc.c
+++ b/rquota_svc.c
@@ -12,7 +12,7 @@
  *          changes for new utilities by Jan Kara <jack@suse.cz>
  *          patches by Jani Jaakkola <jjaakkol@cs.helsinki.fi>
  *
- * Version: $Id: rquota_svc.c,v 1.10 2002/03/27 16:21:26 jkar8572 Exp $
+ * Version: $Id: rquota_svc.c,v 1.11 2002/06/27 08:14:09 jkar8572 Exp $
  *
  *          This program is free software; you can redistribute it and/or
  *          modify it under the terms of the GNU General Public License as
@@ -52,24 +52,35 @@ char *progname;
  */
 struct authunix_parms *unix_cred;
 
-int disable_setquota=0;            /* Disables setquota rpc */
+int disable_setquota=1;            /* Disables setquota rpc */
 int disable_daemon=0;              /* Disable daemon() call */
 
 static struct option options[]= {
 	{ "version", 0, NULL, 'V' },
 	{ "help", 0, NULL, 'h' },
 	{ "foreground", 0 , NULL, 'F' },
+#ifdef RPC_SETQUOTA
 	{ "no-setquota", 0 , NULL, 's' },
+	{ "setquota", 0, NULL, 'S' },
+#endif
 	{ NULL, 0, NULL , 0 }
 };
 
 static void show_help(void)
 {
+#ifdef RPC_SETQUOTA
 	errstr(_("Usage: %s [options]\nOptions are:\n\
  -h --help         shows this text\n\
  -V --version      shows version information\n\
  -F --foreground   starts the quota service in foreground\n\
- -s --no-setquota  disables remote calls to setquota\n"), progname);
+ -s --no-setquota  disables remote calls to setquota (default)\n\
+ -S --setquota     enables remote calls to setquota\n"), progname);
+#else
+	errstr(_("Usage: %s [options]\nOptions are:\n\
+ -h --help         shows this text\n\
+ -V --version      shows version information\n\
+ -F --foreground   starts the quota service in foreground\n"), progname);
+#endif
 }
 
 static void parse_options(int argc, char **argv)
@@ -87,7 +98,10 @@ static void parse_options(int argc, char **argv)
 			case 'V': version(); exit(0);
 			case 'h': show_help(); exit(0);
 			case 'F': disable_daemon = 1; break;
+#ifdef RPC_SETQUOTA
 			case 's': disable_setquota = 1; break;
+			case 'S': disable_setquota = 0; break;
+#endif
 			default:
 				errstr(_("Unknown option '%c'.\n"), opt);
 				show_help();
diff --git a/rquotad.8 b/rquotad.8
index 8952f06..a1b87b8 100644
--- a/rquotad.8
+++ b/rquotad.8
@@ -3,6 +3,9 @@
 rquotad, rpc.rquotad \- remote quota server
 .SH SYNOPSIS
 .B rpc.rquotad
+[
+.B \-sSF
+]
 .SH DESCRIPTION
 .LP
 .IX  "rquotad daemon"  ""  "\fLrquotad\fP \(em remote quota server"
@@ -20,15 +23,41 @@ which is mounted by a remote machine over the
 .SM NFS\s0.
 It also allows setting of quotas on
 .SM NFS
-mounted filesystem. The results are used by
+mounted filesystem (if configured during compilation and allowed by a command line option
+.BR \-S ).
+The results are used by
 .BR quota (1)
 to display user quotas for remote filesystems and by
 .BR edquota (8)
 to set quotas on remote filesystems.
-The
+.B rquotad
+daemon uses tcp-wrappers library which allows you to specify hosts allowed/disallowed to use
+the daemon (see
+.BR hosts.allow (5)
+manpage for more information). The
 .B rquotad
 daemon is normally started at boot time from the
 system startup scripts.
+.SH OPTIONS
+.TP
+.B \-V, \-\-version
+Shows version of quota tools.
+.TP
+.B \-s, \-\-no-sequota
+Don't allow setting of quotas (default). This option is available only
+if utilities were compiled with the
+.I rpcsetquota
+option.
+.TP
+.B \-S, \-\-setquota
+Allow setting of quotas. This option is available only
+if utilities were compiled with the
+.I rpcsetquota
+option.
+.TP
+.B \-F, \-\-foreground
+Run daemon in foreground (may be useful for debugging purposes).
+
 .SH FILES
 .PD 0
 .TP 20