Fixed password %% showing

source/ubl-settings-usergroups.c

@@ -2650,10 +2650,12 @@ void on_main_edit(GtkWidget *, main_window *widgets){
 				}
 				if (parsed_size>5){
 					if (check_is_password_hash(parameters[5])){
+						if (strcmp(parameters[5],"!*")&&!yon_char_check_begins_with(parameters[5],"%%")){
 							char *temp = yon_char_append("%%",parameters[5]);
 							free(parameters[5]);
 							parameters[5]=temp;
 						}
+					}
 					window->old_password=yon_char_new(parameters[5]);
 					if (strcmp(parameters[5],"x")&&strcmp(parameters[5],"")){
 						if (yon_check_password_blocked(parameters[5])){
@@ -2844,8 +2846,18 @@ void on_user_sync_with_config(GtkWidget *,main_window *widgets){
 				config_str parsed_shadow = yon_char_parse(shadow,&shadow_size,":");
 
 				char *optionals = yon_char_unite(user_size>5? parsed[5]:"",user_size>5?" ":"",user_size>6?parsed[6]:"",NULL);
-				char *config_user = yon_char_unite(parsed[0],":",parsed[4],":",parsed[2],":",parsed[3],":",optionals,":",strcmp(parsed[1],"x")?parsed[1]:parsed_shadow[1],NULL);
-				char *config_shadow = yon_char_unite(parsed[2],":",parsed[3],":",parsed[4],":",parsed[5],":",parsed[6],":",parsed[7],":",NULL);
+				char *config_user = yon_char_unite(parsed[0],":",
+				user_size>4?parsed[4]:"",":",
+				user_size>2?parsed[2]:"",":",
+				user_size>3?parsed[3]:"",":",
+				!yon_char_is_empty(optionals)?optionals:"",":",
+				user_size>1&&strcmp(parsed[1],"x")?yon_char_return_if_exist(parsed[1],""):yon_char_return_if_exist(parsed_shadow[1],""),NULL);
+				char *config_shadow = yon_char_unite(yon_char_return_if_exist(parsed[2],""),":",
+				user_size>3?parsed[3]:"",":",
+				user_size>4?parsed[4]:"",":",
+				user_size>5?parsed[5]:"",":",
+				user_size>6?parsed[6]:"",":",
+				user_size>7?parsed[7]:"",":",NULL);
 
 				if (!yon_char_is_empty(config_user)){
 					char *user_command = yon_config_parameter_prepare_command(dull_parameter_get_command,NULL,"users",USERADD(target));