Test fix for default passwords

pull/247/head
parent 74d0ffc91c
commit 0f0c750efd

@ -671,25 +671,29 @@ ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_
g_signal_connect(G_OBJECT(window->RootPasswordCombo),"changed",G_CALLBACK(on_password_combo_changed),window->RootPasswordButton); g_signal_connect(G_OBJECT(window->RootPasswordCombo),"changed",G_CALLBACK(on_password_combo_changed),window->RootPasswordButton);
g_signal_connect(G_OBJECT(window->DefaultPasswordCombo),"changed",G_CALLBACK(on_password_combo_changed),window->DefaultPasswordButton); g_signal_connect(G_OBJECT(window->DefaultPasswordCombo),"changed",G_CALLBACK(on_password_combo_changed),window->DefaultPasswordButton);
char *default_password = yon_config_get_by_key(DEFAULTPASSWD_parameter); if (!yon_config_check_default(DEFAULTPASSWD_parameter)){
if (!yon_char_is_empty(default_password)){ char *default_password = yon_config_get_by_key(DEFAULTPASSWD_parameter);
if (!strcmp(default_password," ")){ if (!yon_char_is_empty(default_password)){
gtk_combo_box_set_active(GTK_COMBO_BOX(window->DefaultPasswordCombo),2); if (!strcmp(default_password," ")){
} else if (!strcmp(default_password,"!*")){ gtk_combo_box_set_active(GTK_COMBO_BOX(window->DefaultPasswordCombo),2);
gtk_combo_box_set_active(GTK_COMBO_BOX(window->DefaultPasswordCombo),3); } else if (!strcmp(default_password,"!*")){
gtk_combo_box_set_active(GTK_COMBO_BOX(window->DefaultPasswordCombo),3);
} else { } else {
gtk_combo_box_set_active(GTK_COMBO_BOX(window->DefaultPasswordCombo),1); gtk_combo_box_set_active(GTK_COMBO_BOX(window->DefaultPasswordCombo),1);
gtk_entry_set_text(GTK_ENTRY(window->DefaultPasswordEntry),default_password); gtk_entry_set_text(GTK_ENTRY(window->DefaultPasswordEntry),default_password);
}
} }
} }
if (!yon_config_check_default(DEFAULTROOTPASSWD_parameter)){
char *root_password = yon_config_get_by_key(DEFAULTROOTPASSWD_parameter); char *root_password = yon_config_get_by_key(DEFAULTROOTPASSWD_parameter);
if (!yon_char_is_empty(root_password)){ if (!yon_char_is_empty(root_password)){
if (!strcmp(root_password," ")){ if (!strcmp(root_password," ")){
gtk_combo_box_set_active(GTK_COMBO_BOX(window->RootPasswordCombo),2); gtk_combo_box_set_active(GTK_COMBO_BOX(window->RootPasswordCombo),2);
} else { } else {
gtk_combo_box_set_active(GTK_COMBO_BOX(window->RootPasswordCombo),1); gtk_combo_box_set_active(GTK_COMBO_BOX(window->RootPasswordCombo),1);
gtk_entry_set_text(GTK_ENTRY(window->RootPasswordEntry),root_password); gtk_entry_set_text(GTK_ENTRY(window->RootPasswordEntry),root_password);
}
} }
} }
char *is_k_admin = yon_config_get_by_key(ADDADM_parameter); char *is_k_admin = yon_config_get_by_key(ADDADM_parameter);

Loading…
Cancel
Save