user sync and temporary deactivation checks loads properly

pull/173/head
parent 270e0e0fd0
commit 6b41cd9bbd

@ -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(){
@ -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));
@ -2608,7 +2609,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){

@ -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"

Loading…
Cancel
Save