Commit 9791a83b authored by claes's avatar claes

Password was changed by modify command if no password was given

parent 974f2088
...@@ -60,7 +60,7 @@ dcli_tCmdTable user_command_table[] = { ...@@ -60,7 +60,7 @@ dcli_tCmdTable user_command_table[] = {
"/operator4", "/operator5", "/operator6", "/operator4", "/operator5", "/operator6",
"/operator7", "/operator8", "/operator9", "/operator7", "/operator8", "/operator9",
/* "/oper10",*/ "/devread", "/devplc", /* "/oper10",*/ "/devread", "/devplc",
"/devconfig", "/devclass", "/devconfig", "/devclass", "/sevread", "/sevadmin",
"/nortread", "/nortwrite", "/nortevents", "/nortread", "/nortwrite", "/nortevents",
"/nosystem", "/nosystem",
"/nomaintenance", "/noprocess", "/noinstrument", "/nomaintenance", "/noprocess", "/noinstrument",
...@@ -68,7 +68,7 @@ dcli_tCmdTable user_command_table[] = { ...@@ -68,7 +68,7 @@ dcli_tCmdTable user_command_table[] = {
"/nooperator4", "/nooperator5", "/nooperator6", "/nooperator4", "/nooperator5", "/nooperator6",
"/nooperator7", "/nooperator8", "/nooperator9", "/nooperator7", "/nooperator8", "/nooperator9",
/* "/nooper10",*/ "/nodevread", "/nodevplc", /* "/nooper10",*/ "/nodevread", "/nodevplc",
"/nodevconfig", "/nodevclass", "/nodevconfig", "/nodevclass", "/nosevread", "/nosevadmin",
"/nouserinherit", "/userinherit", "/nouserinherit", "/userinherit",
""} ""}
}, },
...@@ -84,7 +84,7 @@ dcli_tCmdTable user_command_table[] = { ...@@ -84,7 +84,7 @@ dcli_tCmdTable user_command_table[] = {
"/operator4", "/operator5", "/operator6", "/operator4", "/operator5", "/operator6",
"/operator7", "/operator8", "/operator9", "/operator7", "/operator8", "/operator9",
"/oper10", "/devread", "/devplc", "/oper10", "/devread", "/devplc",
"/devconfig", "/devclass", "/devconfig", "/devclass", "/sevread", "/sevadmin",
"/nouserinherit", "/userinherit", "/nouserinherit", "/userinherit",
""} ""}
}, },
...@@ -197,7 +197,7 @@ static int user_help_func( void *client_data, ...@@ -197,7 +197,7 @@ static int user_help_func( void *client_data,
" /process /instrument /operator1 /operator2" << endl << " /process /instrument /operator1 /operator2" << endl <<
" /operator3 /operator4 /operator5 /operator6" << endl << " /operator3 /operator4 /operator5 /operator6" << endl <<
" /operator7 /operator8 /operator9 /oper10" << endl << " /operator7 /operator8 /operator9 /oper10" << endl <<
" /devread /devplc /devconfig /devclass" << endl << " /devread /devplc /devconfig /devclass /sevread /sevadmin" << endl <<
" [/privilge=] " << endl << endl; " [/privilge=] " << endl << endl;
} }
else if ( strncmp( arg1_str, "remove", strlen( arg1_str)) == 0) else if ( strncmp( arg1_str, "remove", strlen( arg1_str)) == 0)
...@@ -217,7 +217,7 @@ static int user_help_func( void *client_data, ...@@ -217,7 +217,7 @@ static int user_help_func( void *client_data,
" /process /instrument /operator1 /operator2" << endl << " /process /instrument /operator1 /operator2" << endl <<
" /operator3 /operator4 /operator5 /operator6" << endl << " /operator3 /operator4 /operator5 /operator6" << endl <<
" /operator7 /operator8 /operator9 /oper10" << endl << " /operator7 /operator8 /operator9 /oper10" << endl <<
" /devread /devplc /devconfig /devclass" << endl << " /devread /devplc /devconfig /devclass /sevread /sevadmin" << endl <<
" [/privilge=] " << endl << endl; " [/privilge=] " << endl << endl;
} }
else if ( strncmp( arg1_str, "get", strlen( arg1_str)) == 0) else if ( strncmp( arg1_str, "get", strlen( arg1_str)) == 0)
...@@ -405,6 +405,10 @@ static int user_add_func( void *client_data, ...@@ -405,6 +405,10 @@ static int user_add_func( void *client_data,
privilege |= pwr_mPrv_DevConfig; privilege |= pwr_mPrv_DevConfig;
if ( ODD( dcli_get_qualifier( "/devclass", privilege_str, sizeof(privilege_str)))) if ( ODD( dcli_get_qualifier( "/devclass", privilege_str, sizeof(privilege_str))))
privilege |= pwr_mPrv_DevClass; privilege |= pwr_mPrv_DevClass;
if ( ODD( dcli_get_qualifier( "/sevread", privilege_str, sizeof(privilege_str))))
privilege |= pwr_mPrv_SevRead;
if ( ODD( dcli_get_qualifier( "/sevadmin", privilege_str, sizeof(privilege_str))))
privilege |= pwr_mPrv_SevAdmin;
if ( privilege == 0) if ( privilege == 0)
{ {
if ( EVEN( dcli_get_qualifier( "/privilege", privilege_str, sizeof(privilege_str)))) if ( EVEN( dcli_get_qualifier( "/privilege", privilege_str, sizeof(privilege_str))))
...@@ -579,6 +583,7 @@ static int user_modify_func( void *client_data, ...@@ -579,6 +583,7 @@ static int user_modify_func( void *client_data,
if ( ODD( dcli_get_qualifier( "/password", p_str, sizeof(p_str)))) { if ( ODD( dcli_get_qualifier( "/password", p_str, sizeof(p_str)))) {
strcpy( password_str, p_str); strcpy( password_str, p_str);
cdh_ToLower( password_str, password_str); cdh_ToLower( password_str, password_str);
strcpy( password_str, UserList::pwcrypt(password_str));
} }
if ( EVEN( dcli_get_qualifier( "/description", description_str, sizeof(description_str)))) if ( EVEN( dcli_get_qualifier( "/description", description_str, sizeof(description_str))))
description_p = 0; description_p = 0;
...@@ -633,6 +638,10 @@ static int user_modify_func( void *client_data, ...@@ -633,6 +638,10 @@ static int user_modify_func( void *client_data,
privilege |= pwr_mPrv_DevConfig; privilege |= pwr_mPrv_DevConfig;
if ( ODD( dcli_get_qualifier( "/devclass", privilege_str, sizeof(privilege_str)))) if ( ODD( dcli_get_qualifier( "/devclass", privilege_str, sizeof(privilege_str))))
privilege |= pwr_mPrv_DevClass; privilege |= pwr_mPrv_DevClass;
if ( ODD( dcli_get_qualifier( "/sevread", privilege_str, sizeof(privilege_str))))
privilege |= pwr_mPrv_SevRead;
if ( ODD( dcli_get_qualifier( "/sevadmin", privilege_str, sizeof(privilege_str))))
privilege |= pwr_mPrv_SevAdmin;
if ( ODD( dcli_get_qualifier( "/nortread", privilege_str, sizeof(privilege_str)))) if ( ODD( dcli_get_qualifier( "/nortread", privilege_str, sizeof(privilege_str))))
privilege &= ~pwr_mPrv_RtRead; privilege &= ~pwr_mPrv_RtRead;
...@@ -676,6 +685,10 @@ static int user_modify_func( void *client_data, ...@@ -676,6 +685,10 @@ static int user_modify_func( void *client_data,
privilege &= ~pwr_mPrv_DevConfig; privilege &= ~pwr_mPrv_DevConfig;
if ( ODD( dcli_get_qualifier( "/nodevclass", privilege_str, sizeof(privilege_str)))) if ( ODD( dcli_get_qualifier( "/nodevclass", privilege_str, sizeof(privilege_str))))
privilege &= ~pwr_mPrv_DevClass; privilege &= ~pwr_mPrv_DevClass;
if ( ODD( dcli_get_qualifier( "/nosevread", privilege_str, sizeof(privilege_str))))
privilege &= ~pwr_mPrv_SevRead;
if ( ODD( dcli_get_qualifier( "/nosevadmin", privilege_str, sizeof(privilege_str))))
privilege &= ~pwr_mPrv_SevAdmin;
if ( privilege == 0) if ( privilege == 0)
{ {
...@@ -692,7 +705,7 @@ static int user_modify_func( void *client_data, ...@@ -692,7 +705,7 @@ static int user_modify_func( void *client_data,
} }
} }
sts = gu->modify_user( system_str, user_str, UserList::pwcrypt(password_str), privilege, fullname_p, description_p, sts = gu->modify_user( system_str, user_str, password_str, privilege, fullname_p, description_p,
email_p, phone_p, sms_p); email_p, phone_p, sms_p);
cout << gu->get_status(sts) << endl; cout << gu->get_status(sts) << endl;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment