Merge branch 'master' of https://git.aixiao.me/aixiao/denyhosts
This commit is contained in:
commit
764491d70a
10
conf.c
10
conf.c
@ -212,6 +212,7 @@ void read_conf(char *filename, conf * configure)
|
||||
|
||||
void free_conf(conf * conf)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
if (conf->DAEMON)
|
||||
free(conf->DAEMON);
|
||||
if (conf->PHONE)
|
||||
@ -227,6 +228,15 @@ void free_conf(conf * conf)
|
||||
if (conf->PUBLIC_IP)
|
||||
free(conf->PUBLIC_IP);
|
||||
|
||||
=======
|
||||
free(conf->DAEMON);
|
||||
free(conf->PHONE);
|
||||
free(conf->DING_WEBHOOK);
|
||||
free(conf->SEND_QQ);
|
||||
free(conf->QQMAIL_KEY);
|
||||
free(conf->RECV_MAIL);
|
||||
|
||||
>>>>>>> 969927106ef9eb03564fd5e1501260cc1b957d4a
|
||||
return;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user