diff --git a/source/libublsettings.c b/source/libublsettings.c index b881423..b366a37 100644 --- a/source/libublsettings.c +++ b/source/libublsettings.c @@ -864,7 +864,7 @@ yon_config_parameter *yon_config_parameter_new_with_data(char *key, void *data){ param->data=data; param->data_type=DICTIONARY_CHAR_TYPE; param->first=param; - param->flag1=0; + param->flag1=1; param->key=yon_char_new(key); param->next=NULL; param->prev=NULL; @@ -914,7 +914,7 @@ int yon_config_remove_ignore(char *key){ int yon_config_get_status(char *key){ dictionary *dict; - if (yon_dictionary_get((dictionary**)&__yon__config__strings,key)){ + if ((dict=yon_dictionary_get((dictionary**)&__yon__config__strings,key))){ return ((yon_config_parameter*)dict)->flag1; } else return 0; diff --git a/source/libublsettings.h b/source/libublsettings.h index dd50505..e3df16f 100644 --- a/source/libublsettings.h +++ b/source/libublsettings.h @@ -16,6 +16,17 @@ #define DesktopPath "/usr/share/applications/" +// #define config_parameters { {"config","VERSION","CMDLNE","SERVICESSTART","SERVICENOSTART","SERVICEMASK","HOSTNAME","MACHINEID",\ +// "APPARMOR","PARTITIONSNOMOUNT","PARTITIONSAUTOMOUNT","AUTOMOUNT_SHARE","PUBLICDIR","AUTOMOUNTSERVER",\ +// "PARTITIONSHARE","PRINTERADD","RUNLDCONFIG","DEPMOD","UPDATEHOME","TMPFS","VARTMPFS","PULSEAUDIO",\ +// "ALSACARD","ALSADEVICE","UBLINUXUPDATE","MKSQFS_OPTS","MKSQFS_FASTALG"},\ +// {"users","DEFAULTPASSWD","DEFAULTROOTPASSWD","HASHPASSWD","USERADD","GROUPADD","USERGROPS","ADDADM","USERSHADOW","DEFAULTUSER","HOSTNAME","MACHINEID"},\ +// {"system","ENVIRONMENT","AUTHPAM"},\ +// {"logging","AUDITD","JOURNALD","LOGROTATE"},\ +// {"boot"}\ +// } + + /**for_dictionaries(element, stack) * [EN] * @@ -591,8 +602,8 @@ config_str yon_dir_get_contents(char *dir_path, int *size); //config functions -#define ubconfig_save_command "ubconfig" -#define ubconfig_load_command "ubconfig --source" +#define ubconfig_save_command "ubconfig --quiet" +#define ubconfig_load_command "ubconfig --quiet --source" /** * Типы конфигураций ubconfig-а