Applications
/
ubl-settings-usergroups
10
0
Fork 1
Code Issues 7 Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request 'user sync and temporary deactivation checks loads properly' (#173) from YanTheKaller/ubl-settings-usergroups:master into master

Browse Source 
Reviewed-on: #173
pull/235/head v2.15
Dmitry Razumov 1 year ago
parent 8027958105 99c1d51b31
commit 3e2db8b349
2 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File

60
source/ubl-settings-usergroups.c
Unescape View File

@ -694,7 +694,8 @@ int yon_check_password_blocked(char *password){
free(yon_char_divide(password,0)); free(yon_char_divide(password,0));
return 1; return 1;
} }
} else return 0; }
return 0;
} }
yon_confirmation_window *yon_delete_confirmation_new(){ yon_confirmation_window *yon_delete_confirmation_new(){
@ -1056,7 +1057,7 @@ void on_expiration_clicked(GtkWidget *self, ubl_settings_usergroups_user_window
sync = "boot"; sync = "boot";
} }
if (shutdown_active){ if (shutdown_active){
sync = yon_char_unite(sync,yon_char_is_empty(sync)?"":",","shutdown"); sync = yon_char_unite(sync,yon_char_is_empty(sync)?"":",","shutdown",NULL);
} }
yon_config_register(USERADD_SYNC_parameter,USERADD_SYNC_parameter_command,sync); yon_config_register(USERADD_SYNC_parameter,USERADD_SYNC_parameter_command,sync);
} }
@ -1076,31 +1077,31 @@ void on_expiration_clicked(GtkWidget *self, ubl_settings_usergroups_user_window
yon_char_parsed_free(hash_algos,hash_size); yon_char_parsed_free(hash_algos,hash_size);
} }
void on_users_boot_toggled(GtkToggleButton *self){ // void on_users_boot_toggled(GtkToggleButton *self){
if (gtk_toggle_button_get_active(self)){ // if (gtk_toggle_button_get_active(self)){
char *parameter = yon_config_get_by_key(USERADD_SYNC_parameter); // char *parameter = yon_config_get_by_key(USERADD_SYNC_parameter);
if (!parameter){ // if (!parameter){
yon_config_register(USERADD_SYNC_parameter,USERADD_SYNC_parameter_command,"boot"); // yon_config_register(USERADD_SYNC_parameter,USERADD_SYNC_parameter_command,"boot");
} else { // } else {
yon_config_append(USERADD_SYNC_parameter,"boot",","); // yon_config_append(USERADD_SYNC_parameter,"boot",",");
} // }
} else { // } else {
yon_config_remove_element(USERADD_SYNC_parameter,"boot",","); // yon_config_remove_element(USERADD_SYNC_parameter,"boot",",");
} // }
} // }
void on_users_shutdown_toggled(GtkToggleButton *self){ // void on_users_shutdown_toggled(GtkToggleButton *self){
if (gtk_toggle_button_get_active(self)){ // if (gtk_toggle_button_get_active(self)){
char *parameter = yon_config_get_by_key(USERADD_SYNC_parameter); // char *parameter = yon_config_get_by_key(USERADD_SYNC_parameter);
if (!parameter){ // if (!parameter){
yon_config_register(USERADD_SYNC_parameter,USERADD_SYNC_parameter_command,"shutdown"); // yon_config_register(USERADD_SYNC_parameter,USERADD_SYNC_parameter_command,"shutdown");
} else { // } else {
yon_config_append(USERADD_SYNC_parameter,"shutdown",","); // yon_config_append(USERADD_SYNC_parameter,"shutdown",",");
} // }
} else { // } else {
yon_config_remove_element(USERADD_SYNC_parameter,"shutdown",","); // yon_config_remove_element(USERADD_SYNC_parameter,"shutdown",",");
} // }
} // }
ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_additional_settings_new(){ ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_additional_settings_new(){
ubl_settings_usergroups_additional_settings_window *window = malloc(sizeof(ubl_settings_usergroups_additional_settings_window)); ubl_settings_usergroups_additional_settings_window *window = malloc(sizeof(ubl_settings_usergroups_additional_settings_window));
@ -2137,6 +2138,8 @@ void on_user_save(GtkWidget *self, dictionary *dict){
if (!yon_char_is_empty(window->old_username)&&strcmp(window->old_username,login)){ if (!yon_char_is_empty(window->old_username)&&strcmp(window->old_username,login)){
yon_config_remove_by_key(USERADD_SYNC(window->old_username)); yon_config_remove_by_key(USERADD_SYNC(window->old_username));
} }
} else {
yon_config_remove_by_key(USERADD_SYNC(window->old_username));
} }
if (!yon_char_is_empty(usershadow_sync_string)){ if (!yon_char_is_empty(usershadow_sync_string)){
@ -2145,6 +2148,8 @@ void on_user_save(GtkWidget *self, dictionary *dict){
if (!yon_char_is_empty(window->old_username)&&strcmp(window->old_username,login)){ if (!yon_char_is_empty(window->old_username)&&strcmp(window->old_username,login)){
yon_config_remove_by_key(USERSHADOW_SYNC(window->old_username)); yon_config_remove_by_key(USERSHADOW_SYNC(window->old_username));
} }
} else {
yon_config_remove_by_key(USERSHADOW_SYNC(window->old_username));
} }
GtkTreeIter iter; GtkTreeIter iter;
GtkTreeModel *model = GTK_TREE_MODEL(widgets->UsersList); GtkTreeModel *model = GTK_TREE_MODEL(widgets->UsersList);
@ -2608,7 +2613,6 @@ void on_main_edit(GtkWidget *self, main_window *widgets){
if (strstr(useradd_sync,"shutdown")){ if (strstr(useradd_sync,"shutdown")){
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->UseraddShutdownCheck),1); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->UseraddShutdownCheck),1);
} }
free(useradd_sync);
} }
char *usershadow_sync =yon_config_get_by_key(USERSHADOW_SYNC(name)); char *usershadow_sync =yon_config_get_by_key(USERSHADOW_SYNC(name));
if (usershadow_sync){ if (usershadow_sync){

4
source/ubl-settings-usergroups.h
Unescape View File

@ -72,7 +72,7 @@
#define password_hash_get_command(passwd) yon_char_append("mkpasswd2 ",passwd) #define password_hash_get_command(passwd) yon_char_append("mkpasswd2 ",passwd)
#define config_get_command(source) yon_char_unite("ubconfig --source ",source," get users DEFAULTPASSWD DEFAULTROOTPASSWD DEFAULTUSER HASHPASSWD USERGROUPS ADDADM USERADD[*] USERADD_SYNC USERSHADOW[*] GROUPADD[*]",NULL),yon_char_unite("ubconfig --source ",source," get [system] SYSTEMBOOT_STATEMODE",NULL),yon_char_unite("ubconfig --source ",source," get [save] SAVE_ROOTCOPY_CHANGES",NULL) #define config_get_command(source) yon_char_unite("ubconfig --source ",source," get users DEFAULTPASSWD DEFAULTROOTPASSWD DEFAULTUSER HASHPASSWD USERGROUPS ADDADM USERADD[*] USERADD_SYNC USERADD_SYNC[*] USERSHADOW[*] GROUPADD[*]",NULL),yon_char_unite("ubconfig --source ",source," get [system] SYSTEMBOOT_STATEMODE",NULL),yon_char_unite("ubconfig --source ",source," get [save] SAVE_ROOTCOPY_CHANGES",NULL)
#define config_get_default_command "ubconfig --source default get users DEFAULTPASSWD DEFAULTROOTPASSWD USERGROUPS DEFAULTUSER HASHPASSWD ADDADM" #define config_get_default_command "ubconfig --source default get users DEFAULTPASSWD DEFAULTROOTPASSWD USERGROUPS DEFAULTUSER HASHPASSWD ADDADM"
#define config_get_global_only_parameters "ubconfig --source global get users DEFAULTPASSWD DEFAULTROOTPASSWD" #define config_get_global_only_parameters "ubconfig --source global get users DEFAULTPASSWD DEFAULTROOTPASSWD"
@ -131,7 +131,7 @@
#define GROUPADD_parameter_command yon_char_unite("GROUPADD[",target,"]",NULL) #define GROUPADD_parameter_command yon_char_unite("GROUPADD[",target,"]",NULL)
typedef char* string; typedef char* string;
string version_application; string version_application = "2.2";
char *local; char *local;

Write Preview
Loading…
Cancel
Save