diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index 077294c..157c54a 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -18,6 +18,7 @@ void yon_interface_update(main_window *widgets){ gtk_list_store_clear(widgets->GroupsList); int size; GtkTreeIter iter; + char *def_groups = yon_config_get_by_key("USERGROUPS"); config_str users = yon_config_get_all_by_key("USERADD",&size); if (users){ for (int i=0;i0?parameters[0]:"", 1,parameters_size>1?parameters[1]:"", 4,parameters_size>2?parameters[2]:"", - 5,parameters_size>3?parameters[3]:"", + 5,parameters_size>3?!strcmp(parameters[3],"x")||!strcmp(parameters[3],"")?def_groups:parameters[3]:def_groups, 6,parameters_size>4?parameters[4]:"", 7,parameters_size>5?strcmp(parameters[5],"x")&&strcmp(parameters[5],"")? parameters[5][0]=='%'&¶meters[5][1]=='%'? UNENCRYPTED_LABEL: ENCRYPTED_LABEL : DEFAULT_USER_LABEL : DEFAULT_USER_LABEL, -1); @@ -1452,7 +1453,7 @@ void on_user_save(GtkWidget *self, dictionary *dict){ 2,yon_char_return_if_exist(login,""), 3,yon_char_return_if_exist(username,""), 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,yon_config_get_by_key("USERGROUPS")), 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,password_status, -1);