[2018] in Moira Commits
/svn/moira r4159 - in trunk/moira/clients: addusr blanche mitch stanley stella
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Tue Apr 15 13:55:29 2014
Date: Tue, 15 Apr 2014 13:55:21 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201404151755.s3FHtLBl021496@drugstore.mit.edu>
To: moira-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2014-04-15 13:55:21 -0400 (Tue, 15 Apr 2014)
New Revision: 4159
Modified:
trunk/moira/clients/addusr/addusr.c
trunk/moira/clients/blanche/blanche.c
trunk/moira/clients/mitch/mitch.c
trunk/moira/clients/stanley/stanley.c
trunk/moira/clients/stella/stella.c
Log:
Don't silently ignore it if parse_member returns NULL.
Modified: trunk/moira/clients/addusr/addusr.c
===================================================================
--- trunk/moira/clients/addusr/addusr.c 2014-04-15 15:04:14 UTC (rev 4158)
+++ trunk/moira/clients/addusr/addusr.c 2014-04-15 17:55:21 UTC (rev 4159)
@@ -142,6 +142,11 @@
{
++arg;
sponsor = parse_member(*arg);
+ if (!sponsor)
+ {
+ com_err(whoami, 0, "Invalid sponsor format. Must be one of USER, LIST, KERBEROS, or NONE.");
+ exit(1);
+ }
}
else
usage(argv);
Modified: trunk/moira/clients/blanche/blanche.c
===================================================================
--- trunk/moira/clients/blanche/blanche.c 2014-04-15 15:04:14 UTC (rev 4158)
+++ trunk/moira/clients/blanche/blanche.c 2014-04-15 17:55:21 UTC (rev 4159)
@@ -135,8 +135,11 @@
if (arg - argv < argc - 1)
{
++arg;
- if ((memberstruct = parse_member(*arg)))
+ memberstruct = parse_member(*arg);
+ if (memberstruct)
sq_save_data(addlist, memberstruct);
+ else
+ com_err(whoami, 0, "Unable to add list member: invalid format.");
}
else
usage(argv);
@@ -146,9 +149,14 @@
if (arg - argv < argc - 2)
{
++arg;
- if ((memberstruct = parse_member(*arg)))
- sq_save_data(addlist, memberstruct);
- memberstruct->tag = *++arg;
+ memberstruct = parse_member(*arg);
+ if (memberstruct)
+ {
+ sq_save_data(addlist, memberstruct);
+ memberstruct->tag = *++arg;
+ }
+ else
+ com_err(whoami, 0, "Unable to add list member: invalid format.");
}
else
usage(argv);
@@ -168,8 +176,11 @@
if (arg - argv < argc - 1)
{
++arg;
- if ((memberstruct = parse_member(*arg)))
+ memberstruct = parse_member(*arg);
+ if (memberstruct)
sq_save_data(dellist, memberstruct);
+ else
+ com_err(whoami, 0, "Unable to delete list member: invalid format.");
}
else
usage(argv);
@@ -200,9 +211,14 @@
if (arg - argv < argc - 2)
{
++arg;
- if ((memberstruct = parse_member(*arg)))
- sq_save_data(taglist, memberstruct);
- memberstruct->tag = *++arg;
+ memberstruct = parse_member(*arg);
+ if (memberstruct)
+ {
+ sq_save_data(taglist, memberstruct);
+ memberstruct->tag = *++arg;
+ }
+ else
+ com_err(whoami, 0, "Unable to modify list member: invalid format.");
}
else
usage(argv);
@@ -308,6 +324,11 @@
setinfo++;
++arg;
owner = parse_member(*arg);
+ if (!owner)
+ {
+ com_err(whoami, 0, "Invalid owner format. Must be one of USER, LIST, KERBEROS, or NONE.");
+ exit(1);
+ }
}
else
usage(argv);
@@ -319,6 +340,11 @@
setinfo++;
++arg;
memacl = parse_member(*arg);
+ if (!memacl)
+ {
+ com_err(whoami, 0, "Invalid memacl format. Must be one of USER, LIST, KERBEROS, or NONE.");
+ exit(1);
+ }
}
else
usage(argv);
@@ -1344,8 +1370,11 @@
while (fgets(buf, BUFSIZ, in))
{
- if ((memberstruct = parse_member(buf)))
+ memberstruct = parse_member(buf);
+ if (memberstruct)
sq_save_data(queue, memberstruct);
+ else
+ com_err(whoami, 0, "Unable to parse member: invalid format.");
}
if (!feof(in))
{
Modified: trunk/moira/clients/mitch/mitch.c
===================================================================
--- trunk/moira/clients/mitch/mitch.c 2014-04-15 15:04:14 UTC (rev 4158)
+++ trunk/moira/clients/mitch/mitch.c 2014-04-15 17:55:21 UTC (rev 4159)
@@ -154,6 +154,11 @@
arg++;
update_flag++;
owner = parse_member(*arg);
+ if (!owner)
+ {
+ com_err(whoami, 0, "Invalid owner format. Must be one of USER, LIST, KERBEROS, or NONE.");
+ exit(1);
+ }
} else
usage(argv);
}
@@ -162,6 +167,11 @@
arg++;
update_flag++;
memacl = parse_member(*arg);
+ if (!memacl)
+ {
+ com_err(whoami, 0, "Invalid memacl format. Must be one of USER, LIST, KERBEROS, or NONE.");
+ exit(1);
+ }
} else
usage(argv);
}
Modified: trunk/moira/clients/stanley/stanley.c
===================================================================
--- trunk/moira/clients/stanley/stanley.c 2014-04-15 15:04:14 UTC (rev 4158)
+++ trunk/moira/clients/stanley/stanley.c 2014-04-15 17:55:21 UTC (rev 4159)
@@ -254,6 +254,11 @@
arg++;
update_flag++;
sponsor = parse_member(*arg);
+ if (!sponsor)
+ {
+ com_err(whoami, 0, "Invalid sponsor format. Must be one of USER, LIST, KERBEROS, or NONE.");
+ exit(1);
+ }
} else
usage(argv);
}
Modified: trunk/moira/clients/stella/stella.c
===================================================================
--- trunk/moira/clients/stella/stella.c 2014-04-15 15:04:14 UTC (rev 4158)
+++ trunk/moira/clients/stella/stella.c 2014-04-15 17:55:21 UTC (rev 4159)
@@ -152,6 +152,11 @@
arg++;
update_flag++;
owner = parse_member(*arg);
+ if (!owner)
+ {
+ com_err(whoami, 0, "Invalid owner format. Must be one of USER, LIST, KERBEROS, or NONE.");
+ exit(1);
+ }
} else
usage(argv);
}
@@ -357,6 +362,11 @@
if (arg - argv < argc - 1) {
arg++;
owner = parse_member(*arg);
+ if (!owner)
+ {
+ com_err(whoami, 0, "Invalid owner format. Must be one of USER, LIST, KERBEROS, or NONE.");
+ exit(1);
+ }
} else {
owner = parse_member(get_username());
}
