eurephiadm - renamed useraccess command to adminaccess

3 files changed, 17 insertions, 17 deletions

diff --git a/eurephiadm/CMakeLists.txt b/eurephiadm/CMakeLists.txt
index ffaa7ad..8b525cb 100644
--- a/eurephiadm/CMakeLists.txt
+++ b/eurephiadm/CMakeLists.txt
@@ -14,7 +14,7 @@ SET(efw_ipt_SRC
         commands/lastlog.c
         commands/certificates.c
         commands/usercerts.c
-        commands/useraccess.c
+        commands/adminaccess.c
         commands/edit_config.c
         ../common/eurephia_log.c
         ../common/eurephia_getsym.c
diff --git a/eurephiadm/commands.h b/eurephiadm/commands.h
index 6b716f1..a96d93b 100644
--- a/eurephiadm/commands.h
+++ b/eurephiadm/commands.h
@@ -54,8 +54,8 @@ int cmd_Certificates(eurephiaCTX *, eurephiaSESSION *, eurephiaVALUES *cfg, int
 void help_UserCerts();
 int cmd_UserCerts(eurephiaCTX *, eurephiaSESSION *, eurephiaVALUES *cfg, int argc, char **argv);
 
-void help_UserAccess();
-int cmd_UserAccess(eurephiaCTX *, eurephiaSESSION *, eurephiaVALUES *cfg, int argc, char **argv);
+void help_AdminAccess();
+int cmd_AdminAccess(eurephiaCTX *, eurephiaSESSION *, eurephiaVALUES *cfg, int argc, char **argv);
 
 void help_EditConfig();
 int cmd_EditConfig(eurephiaCTX *, eurephiaSESSION *, eurephiaVALUES *cfg, int argc, char **argv);
@@ -83,8 +83,8 @@ static const eurephiadm_functions cmdline_functions[] = {
         {"usercerts",   1, "useradmin", NULL,
          "User account/Certificate link management", help_UserCerts, cmd_UserCerts},
 
-        {"useraccess",  1, "useradmin", NULL,
-         "User account access levels (admin)",      help_UserAccess, cmd_UserAccess},
+        {"adminaccess",  1, "useradmin", NULL,
+         "User account access levels (admin)",      help_AdminAccess, cmd_AdminAccess},
 
         {"show-config",     1, "config",    NULL,
          "List all config settings",               NULL, cmd_ShowCfg},
diff --git a/eurephiadm/commands/useraccess.c b/eurephiadm/commands/adminaccess.c
index d4529d6..d710d50 100644
--- a/eurephiadm/commands/useraccess.c
+++ b/eurephiadm/commands/adminaccess.c
@@ -46,7 +46,7 @@
 #include "../field_print.h"
 
 
-void display_useraccess_help(int page) {
+void display_adminaccess_help(int page) {
         switch( page ) {
         case 'G':
                 printf("The grant mode will grant a user access to a specified access level.\n"
@@ -78,7 +78,7 @@ void display_useraccess_help(int page) {
                        );
                 break;
         default:
-                printf("Available modes for the usercerts command are:\n\n"
+                printf("Available modes for the adminaccess command are:\n\n"
                        "     -G | --grant       Grant a specific access level to a user\n"
                        "     -R | --revoke      Revoke access levels\n"
                        "     -l | --list        List all granted access levels\n"
@@ -87,11 +87,11 @@ void display_useraccess_help(int page) {
         }
 }
 
-void help_UserAccess() {
-        display_useraccess_help(0);
+void help_AdminAccess() {
+        display_adminaccess_help(0);
 }
 
-int help_UserAccess2(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, int argc, char **argv) {
+int help_AdminAccess2(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, int argc, char **argv) {
         e_options helpargs[] = {
                 {"--list", "-l", 0},
                 {"--grant", "-G", 0},
@@ -100,11 +100,11 @@ int help_UserAccess2(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cf
         };
 
         int i = 1;
-        display_useraccess_help(eurephia_getopt(&i, argc, argv, helpargs));
+        display_adminaccess_help(eurephia_getopt(&i, argc, argv, helpargs));
         return 0;
 }
 
-int list_useraccess(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, int argc, char **argv) {
+int list_adminaccess(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, int argc, char **argv) {
         xmlDoc *list_xml = NULL, *srch_xml = NULL;
         xmlNode *list_n = NULL, *srch_n = NULL, *tmp_n = NULL, *acl_n = NULL;
         int i = 0;
@@ -138,7 +138,7 @@ int list_useraccess(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg
                         break;
 
                 case 'h':
-                        display_useraccess_help('l');
+                        display_adminaccess_help('l');
                         return 0;
 
                 default:
@@ -275,7 +275,7 @@ int grant_revoke(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, i
                         break;
 
                 case 'h':
-                        display_useraccess_help(actmode);
+                        display_adminaccess_help(actmode);
                         return 0;
 
                 default:
@@ -306,7 +306,7 @@ int grant_revoke(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, i
         return rc;
 }
 
-int cmd_UserAccess(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, int argc, char **argv) {
+int cmd_AdminAccess(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, int argc, char **argv) {
         char **mode_argv;
         int i, mode_argc = 0, rc = 0;
         int (*mode_fnc) (eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, int argc, char **argv);
@@ -324,11 +324,11 @@ int cmd_UserAccess(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg,
         for( i = 1; i < argc; i++ ) {
                 switch( eurephia_getopt(&i, argc, argv, modeargs) ) {
                 case 'l':
-                        mode_fnc = list_useraccess;
+                        mode_fnc = list_adminaccess;
                         break;
 
                 case 'h':
-                        mode_fnc = help_UserAccess2;
+                        mode_fnc = help_AdminAccess2;
                         break;
 
                 case 'G':