new quota routines

diff --git a/clients/moira/f_defs.h b/clients/moira/f_defs.h
index 3f7b695da7c591c01577b50d946cf42226ef8d2a..5af9bcfbcf0361ebc0ef24415c0c6da17adc52f1 100644 (file)
--- a/clients/moira/f_defs.h
+++ b/clients/moira/f_defs.h
@@ -112,10 +112,11 @@ int RemoveUserPOBox();
 int ShowDefaultQuota();                /* show or change system default quota. */
 int ChangeDefaultQuota();
 
-int ShowUserQuota();           /* modify a user's quota. */
-int ChangeUserQuota();
-int AddUserQuota();
-int RemoveUserQuota();
+int GetQuota();                        /* modify a user's quota. */
+int GetQuotaByFilesys();
+int AddQuota();
+int UpdateQuota();
+int DeleteQuota();
 
 /* user.c */
 

diff --git a/clients/moira/menus.c b/clients/moira/menus.c
index 13d88b90835ae6aa64b77a6c29f583ec1a40a40b..2ffa05a26d17c659c966112e2f6567f90b48aebe 100644 (file)
--- a/clients/moira/menus.c
+++ b/clients/moira/menus.c
@@ -169,21 +169,23 @@ Menu quota_menu = {
   NULLFUNC,
   NULLFUNC,
   "Quota Menu",
-  7,
+  8,
   {
     SIMPLEFUNC("shdef", "Show default user quota (in KB)", ShowDefaultQuota),
     {ChangeDefaultQuota, NULLMENU, 2, {
       {"chdef", "Change default user quota"},
       {"quota", "New quota (in KB): "}
     } },
-    SIMPLEFUNC("shquota", "Show a user's disk quota on a filesytem",
-              ShowUserQuota),
-    SIMPLEFUNC("addquota", "Add a new disk quota for user on a filesytem",
-              AddUserQuota),
-    SIMPLEFUNC("chquota", "Change a user's disk quota on a filesytem",
-              ChangeUserQuota),
-    SIMPLEFUNC("rmquota", "Remove a user's disk quota on a filesytem",
-              RemoveUserQuota),
+    SIMPLEFUNC("getquota", "Show a quota on a filesystem",
+              GetQuota),
+    SIMPLEFUNC("getfsquotas", "Show all quotas on a filesystem",
+              GetQuotaByFilesys),
+    SIMPLEFUNC("addquota", "Add a new disk quota on a filesystem",
+              AddQuota),
+    SIMPLEFUNC("upquota", "Change a quota on a filesystem",
+              UpdateQuota),
+    SIMPLEFUNC("delquota", "Delete a quota on a filesystem",
+              DeleteQuota),
     SIMPLEFUNC("verbose", "Toggle Verbosity of Delete", ToggleVerboseMode)
   } 
 };