pull/59/head
parent f9b7cc372d
commit bd2999b01a

@ -6,7 +6,6 @@ config main_config;
int yon_load_proceed(YON_CONFIG_TYPE type){ int yon_load_proceed(YON_CONFIG_TYPE type){
yon_config_load_register(YON_CONFIG_DEFAULT,"users","DEFAULTPASSWD DEFAULTROOTPASSWD USERGROUPS",NULL); yon_config_load_register(YON_CONFIG_DEFAULT,"users","DEFAULTPASSWD DEFAULTROOTPASSWD USERGROUPS",NULL);
printf("%s\n",yon_config_get_by_key("USERGROUPS"));
if (yon_config_load_register_no_cleaning(type,"users","DEFAULTPASSWD DEFAULTROOTPASSWD DEFAULTUSER HASHPASSWD USERGROUPS ADDADM USERADD[*] USERSHADOW[*] GROUPADD[*]",NULL)){ if (yon_config_load_register_no_cleaning(type,"users","DEFAULTPASSWD DEFAULTROOTPASSWD DEFAULTUSER HASHPASSWD USERGROUPS ADDADM USERADD[*] USERSHADOW[*] GROUPADD[*]",NULL)){
return 1; return 1;
} }
@ -595,6 +594,7 @@ void on_standard_groups_open(GtkWidget *self, main_window *widgets){
g_signal_connect(G_OBJECT(window->GroupsOkButton),"clicked",G_CALLBACK(on_standard_groups_accept),window); g_signal_connect(G_OBJECT(window->GroupsOkButton),"clicked",G_CALLBACK(on_standard_groups_accept),window);
gtk_window_set_transient_for(GTK_WINDOW(window->GroupsWindow),GTK_WINDOW(widgets->Window)); gtk_window_set_transient_for(GTK_WINDOW(window->GroupsWindow),GTK_WINDOW(widgets->Window));
char *groups = yon_config_get_by_key("USERGROUPS"); char *groups = yon_config_get_by_key("USERGROUPS");
printf("%s\n",groups);
if (!yon_char_is_empty(groups)){ if (!yon_char_is_empty(groups)){
GtkTreeIter iter; GtkTreeIter iter;
int size; int size;
@ -603,8 +603,10 @@ void on_standard_groups_open(GtkWidget *self, main_window *widgets){
for (;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(window->list),&iter)){ for (;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(window->list),&iter)){
char *cur_name; char *cur_name;
gtk_tree_model_get(GTK_TREE_MODEL(window->list),&iter,1,&cur_name,-1); gtk_tree_model_get(GTK_TREE_MODEL(window->list),&iter,1,&cur_name,-1);
printf("%s..\n",cur_name);
for (int i=0;i<size;i++){ for (int i=0;i<size;i++){
if (!strcmp(standard_groups[i],cur_name)){ if (!strcmp(standard_groups[i],cur_name)){
printf("%s\n",standard_groups[i]);
gtk_list_store_set(window->list,&iter,0,1,-1); gtk_list_store_set(window->list,&iter,0,1,-1);
} }
} }

Loading…
Cancel
Save