Fixes for password statuses

pull/83/head
parent 2e87e3e6dc
commit 625e6563a0

@ -1381,6 +1381,11 @@ void on_user_save(GtkWidget *self, dictionary *dict){
yon_config_register(USERSHADOW_SYNC(login),"users",usershadow_sync_string); yon_config_register(USERSHADOW_SYNC(login),"users",usershadow_sync_string);
GtkTreeIter iter; GtkTreeIter iter;
GtkTreeModel *model = GTK_TREE_MODEL(widgets->UsersList); GtkTreeModel *model = GTK_TREE_MODEL(widgets->UsersList);
char *password_status=NULL;
if (password_active==0) password_status = DEFAULT_USER_LABEL;
else if (password_active==1) password_status = NO_PASSWORD_LABEL;
else if (password[0]=='%'&&password[1]=='%') password_status = UNENCRYPTED_LABEL;
else password_status = ENCRYPTED_LABEL;
if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->UsersTree)),&model,&iter)) if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->UsersTree)),&model,&iter))
gtk_list_store_append(widgets->UsersList,&iter); gtk_list_store_append(widgets->UsersList,&iter);
gtk_list_store_set(widgets->UsersList,&iter, gtk_list_store_set(widgets->UsersList,&iter,
@ -1390,7 +1395,7 @@ void on_user_save(GtkWidget *self, dictionary *dict){
4,yon_char_return_if_exist(main_group,login), 4,yon_char_return_if_exist(main_group,login),
5,yon_char_return_if_exist(additional_groups,""), 5,yon_char_return_if_exist(additional_groups,""),
6,yon_char_unite(yon_char_return_if_exist(user_home,""),yon_char_return_if_exist(user_shell,""),yon_char_return_if_exist(create_system_user,""),yon_char_return_if_exist(create_ununique,""),yon_char_return_if_exist(do_not_check,""),NULL), 6,yon_char_unite(yon_char_return_if_exist(user_home,""),yon_char_return_if_exist(user_shell,""),yon_char_return_if_exist(create_system_user,""),yon_char_return_if_exist(create_ununique,""),yon_char_return_if_exist(do_not_check,""),NULL),
7,yon_char_return_if_exist(gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(window->userPasswordCombo)),""), 7,password_status,
-1); -1);
on_subwindow_close(self); on_subwindow_close(self);
} }

Loading…
Cancel
Save