From dd690a26c49e87af68702cdabdbe2c00b98f2e0c Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Fri, 28 Jun 2013 13:07:13 +0200 Subject: Removed some stray left-over variables no longer in use These variables where used before the XML based response in the admin API was implemented. Signed-off-by: David Sommerseth (cherry picked from commit 8eb493cb8fac488cbafe8af06f6f062fc659f4a3) --- eurephiadm/commands/adminaccess.c | 4 +--- eurephiadm/commands/usercerts.c | 4 +--- eurephiadm/commands/users.c | 6 +----- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/eurephiadm/commands/adminaccess.c b/eurephiadm/commands/adminaccess.c index d90edd7..2a22acc 100644 --- a/eurephiadm/commands/adminaccess.c +++ b/eurephiadm/commands/adminaccess.c @@ -244,7 +244,7 @@ int grant_revoke(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, i xmlDoc *upd_xml = NULL, *res_xml = NULL; xmlNode *root_n = NULL, *fmap_n = NULL; xmlAttr *mode_a = NULL; - char actmode = '-', *actmode_str = NULL; + char actmode = '-'; int i = 0, rc = 0; int f_uid = 0, f_acl = 0, f_intf = 0; @@ -264,10 +264,8 @@ int grant_revoke(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, i if( (strcmp(argv[0], "--grant") == 0) || (strcmp(argv[0], "-G") == 0) ) { actmode = 'G'; - actmode_str = "granted"; } else if( (strcmp(argv[0], "--revoke") == 0) || (strcmp(argv[0], "-R") == 0) ) { actmode = 'R'; - actmode_str = "revoked"; } for( i = 1; i < argc; i++ ) { diff --git a/eurephiadm/commands/usercerts.c b/eurephiadm/commands/usercerts.c index b0bbf34..57d0e9e 100644 --- a/eurephiadm/commands/usercerts.c +++ b/eurephiadm/commands/usercerts.c @@ -238,7 +238,7 @@ int add_del_usercert(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cf xmlNode *usercert_n = NULL; eurephiaRESULT *res = NULL; int i = 0, rc = 0, actmode = 0; - char *certid = NULL, *uid = NULL, *uicid = NULL, *actmode_str = NULL, *accessprofile = NULL; + char *certid = NULL, *uid = NULL, *uicid = NULL, *accessprofile = NULL; e_options addargs[] = { {"--uid", "-i", 1}, @@ -255,10 +255,8 @@ int add_del_usercert(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cf if( (strcmp(argv[0], "--add") == 0) || (strcmp(argv[0], "-A") == 0) ) { actmode = 'A'; - actmode_str = "registered"; } else if( (strcmp(argv[0], "--delete") == 0) || (strcmp(argv[0], "-D") == 0) ) { actmode = 'D'; - actmode_str = "deleted"; } eurephiaXML_CreateDoc(ctx, 1, "usercerts", &usercert_xml, &usercert_n); diff --git a/eurephiadm/commands/users.c b/eurephiadm/commands/users.c index 52cf253..ff30ee5 100644 --- a/eurephiadm/commands/users.c +++ b/eurephiadm/commands/users.c @@ -453,7 +453,7 @@ int account_activation(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES * xmlDoc *user_xml = NULL, *update_xml = NULL, *srch_xml = NULL, *tmp_xml = NULL, *res_xml = NULL; xmlNode *user_n = NULL, *update_n = NULL, *srch_root = NULL, *tmp_n = NULL, *fmap_n = NULL; eurephiaRESULT *res = NULL; - char *uid_str = NULL, *activated = NULL, *deactivated = NULL, *actmode_str = NULL, *newpwd = NULL; + char *uid_str = NULL, *activated = NULL, *deactivated = NULL, *newpwd = NULL; int i, actmode = 0, rc = 0, crit_set = 0; xmlChar flags[34]; @@ -469,16 +469,12 @@ int account_activation(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES * if( (strcmp(argv[0], "--activate") == 0) || (strcmp(argv[0], "-a") == 0) ) { actmode = 'a'; - actmode_str = "activated"; } else if( (strcmp(argv[0], "--deactivate") == 0) || (strcmp(argv[0], "-d") == 0) ) { actmode = 'd'; - actmode_str = "deactivated"; } else if( (strcmp(argv[0], "--delete") == 0) || (strcmp(argv[0], "-D") == 0) ) { actmode = 'D'; - actmode_str = "deleted"; } else if( (strcmp(argv[0], "--password") == 0) || (strcmp(argv[0], "-p") == 0) ) { actmode = 'p'; - actmode_str = "updated with new password"; } else { fprintf(stderr, "%s: System error - illegal users mode'%s'\n", MODULE, argv[0]); return 1; -- cgit