summaryrefslogtreecommitdiffstats
path: root/eurephiadm/commands/adminaccess.c
diff options
context:
space:
mode:
authorDavid Sommerseth <dazo@users.sourceforge.net>2011-01-10 01:19:22 +0100
committerDavid Sommerseth <dazo@users.sourceforge.net>2011-01-10 01:19:22 +0100
commit44bcb3e74a85b4a53a0dc626db13c3d03d925538 (patch)
tree81db9d938ad90ce932aaa6ed7180175cca836ed1 /eurephiadm/commands/adminaccess.c
parent35502a5b07eff6a0893989a1ea7edb603087a7c6 (diff)
downloadeurephia-44bcb3e74a85b4a53a0dc626db13c3d03d925538.tar.gz
eurephia-44bcb3e74a85b4a53a0dc626db13c3d03d925538.tar.xz
eurephia-44bcb3e74a85b4a53a0dc626db13c3d03d925538.zip
Fixed several memleaks in the eurephiadm related code paths
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to 'eurephiadm/commands/adminaccess.c')
-rw-r--r--eurephiadm/commands/adminaccess.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/eurephiadm/commands/adminaccess.c b/eurephiadm/commands/adminaccess.c
index 4b19c05..cb6078d 100644
--- a/eurephiadm/commands/adminaccess.c
+++ b/eurephiadm/commands/adminaccess.c
@@ -275,11 +275,13 @@ int grant_revoke(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, i
case 'i':
if( f_uid > 0 ) {
fprintf(stderr, "%s: User id can only be set once\n", MODULE);
- return 1;
+ rc = 1;
+ goto error;
}
if( atoi_nullsafe(optargs[0]) < 1 ) {
fprintf(stderr, "%s: User ID must be a positive number (>0)\n", MODULE);
- return 1;
+ rc = 1;
+ goto error;
}
f_uid++;
xmlNewChild(fmap_n, NULL, (xmlChar *) "uid", (xmlChar *) optargs[0]);
@@ -288,7 +290,8 @@ int grant_revoke(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, i
case 'a':
if( f_acl > 0 ) {
fprintf(stderr, "%s: Access level can only be set once\n", MODULE);
- return 1;
+ rc = 1;
+ goto error;
}
f_acl++;
xmlNewChild(fmap_n, NULL, (xmlChar *) "accesslevel", (xmlChar *) optargs[0]);
@@ -297,7 +300,8 @@ int grant_revoke(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, i
case 'I':
if( f_intf > 0 ) {
fprintf(stderr, "%s: Admin interface indicator can only be set once\n", MODULE);
- return 1;
+ rc = 1;
+ goto error;
}
f_intf++;
xmlNewChild(fmap_n, NULL, (xmlChar *) "interface", (xmlChar *) optargs[0]);
@@ -305,10 +309,12 @@ int grant_revoke(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, i
case 'h':
display_adminaccess_help(actmode);
- return 0;
+ rc = 0;
+ goto error;
default:
- return 1;
+ rc = 1;
+ goto error;
}
}