From 6b41cd9bbd05f0d7f5adb5d936f0788eabe19b1d Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 9 Aug 2024 09:56:18 +0600 Subject: [PATCH 1/5] user sync and temporary deactivation checks loads properly --- source/ubl-settings-usergroups.c | 54 ++++++++++++++++---------------- source/ubl-settings-usergroups.h | 2 +- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index 8ccb44f..d037cd3 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -694,7 +694,8 @@ int yon_check_password_blocked(char *password){ free(yon_char_divide(password,0)); return 1; } - } else return 0; + } + return 0; } yon_confirmation_window *yon_delete_confirmation_new(){ @@ -1076,31 +1077,31 @@ void on_expiration_clicked(GtkWidget *self, ubl_settings_usergroups_user_window yon_char_parsed_free(hash_algos,hash_size); } - void on_users_boot_toggled(GtkToggleButton *self){ - if (gtk_toggle_button_get_active(self)){ - char *parameter = yon_config_get_by_key(USERADD_SYNC_parameter); - if (!parameter){ - yon_config_register(USERADD_SYNC_parameter,USERADD_SYNC_parameter_command,"boot"); - } else { - yon_config_append(USERADD_SYNC_parameter,"boot",","); - } - } else { - yon_config_remove_element(USERADD_SYNC_parameter,"boot",","); - } - } - - void on_users_shutdown_toggled(GtkToggleButton *self){ - if (gtk_toggle_button_get_active(self)){ - char *parameter = yon_config_get_by_key(USERADD_SYNC_parameter); - if (!parameter){ - yon_config_register(USERADD_SYNC_parameter,USERADD_SYNC_parameter_command,"shutdown"); - } else { - yon_config_append(USERADD_SYNC_parameter,"shutdown",","); - } - } else { - yon_config_remove_element(USERADD_SYNC_parameter,"shutdown",","); - } - } +// void on_users_boot_toggled(GtkToggleButton *self){ +// if (gtk_toggle_button_get_active(self)){ +// char *parameter = yon_config_get_by_key(USERADD_SYNC_parameter); +// if (!parameter){ +// yon_config_register(USERADD_SYNC_parameter,USERADD_SYNC_parameter_command,"boot"); +// } else { +// yon_config_append(USERADD_SYNC_parameter,"boot",","); +// } +// } else { +// yon_config_remove_element(USERADD_SYNC_parameter,"boot",","); +// } +// } + +// void on_users_shutdown_toggled(GtkToggleButton *self){ +// if (gtk_toggle_button_get_active(self)){ +// char *parameter = yon_config_get_by_key(USERADD_SYNC_parameter); +// if (!parameter){ +// yon_config_register(USERADD_SYNC_parameter,USERADD_SYNC_parameter_command,"shutdown"); +// } else { +// yon_config_append(USERADD_SYNC_parameter,"shutdown",","); +// } +// } else { +// 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 *window = malloc(sizeof(ubl_settings_usergroups_additional_settings_window)); @@ -2608,7 +2609,6 @@ void on_main_edit(GtkWidget *self, main_window *widgets){ if (strstr(useradd_sync,"shutdown")){ 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)); if (usershadow_sync){ diff --git a/source/ubl-settings-usergroups.h b/source/ubl-settings-usergroups.h index 9074c22..bc99321 100644 --- a/source/ubl-settings-usergroups.h +++ b/source/ubl-settings-usergroups.h @@ -72,7 +72,7 @@ #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_global_only_parameters "ubconfig --source global get users DEFAULTPASSWD DEFAULTROOTPASSWD" From fcdeedad20f3fbe42b9b9c17b3b1bad32b89f47a Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 9 Aug 2024 10:24:42 +0600 Subject: [PATCH 2/5] Fixed USERADD_SYNC='boot,shutdownboot' registration --- source/ubl-settings-usergroups.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index d037cd3..abe7a71 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -1057,7 +1057,7 @@ void on_expiration_clicked(GtkWidget *self, ubl_settings_usergroups_user_window sync = "boot"; } 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); } From 2563d5dde99073b4454bd7e790f44f45346359f0 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 9 Aug 2024 11:27:39 +0600 Subject: [PATCH 3/5] Fixed user sync removing --- source/ubl-settings-usergroups.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index abe7a71..6c09e3c 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -2138,6 +2138,8 @@ void on_user_save(GtkWidget *self, dictionary *dict){ if (!yon_char_is_empty(window->old_username)&&strcmp(window->old_username,login)){ 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)){ @@ -2146,7 +2148,9 @@ void on_user_save(GtkWidget *self, dictionary *dict){ if (!yon_char_is_empty(window->old_username)&&strcmp(window->old_username,login)){ yon_config_remove_by_key(USERSHADOW_SYNC(window->old_username)); } - } + } else { + yon_config_remove_by_key(USERSHADOW_SYNC(window->old_username)); + } GtkTreeIter iter; GtkTreeModel *model = GTK_TREE_MODEL(widgets->UsersList); char *password_status=NULL; From 901e97679722ce52e11e3f94c315abc48c1e4556 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 9 Aug 2024 11:55:59 +0600 Subject: [PATCH 4/5] Fixed get command --- source/ubl-settings-usergroups.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubl-settings-usergroups.h b/source/ubl-settings-usergroups.h index bc99321..41f0773 100644 --- a/source/ubl-settings-usergroups.h +++ b/source/ubl-settings-usergroups.h @@ -72,7 +72,7 @@ #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 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_global_only_parameters "ubconfig --source global get users DEFAULTPASSWD DEFAULTROOTPASSWD" From 99c1d51b31150016e0ac09415b12d79296b61e99 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 9 Aug 2024 12:03:42 +0600 Subject: [PATCH 5/5] return of command --- source/ubl-settings-usergroups.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/ubl-settings-usergroups.h b/source/ubl-settings-usergroups.h index 41f0773..4b9ea8a 100644 --- a/source/ubl-settings-usergroups.h +++ b/source/ubl-settings-usergroups.h @@ -72,7 +72,7 @@ #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 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_global_only_parameters "ubconfig --source global get users DEFAULTPASSWD DEFAULTROOTPASSWD" @@ -131,7 +131,7 @@ #define GROUPADD_parameter_command yon_char_unite("GROUPADD[",target,"]",NULL) typedef char* string; -string version_application; +string version_application = "2.2"; char *local;