9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Automated merge with http://angelforce.ru:8000/

Browse source
This commit is contained in:
William Pitcock 2008-04-02 10:58:55 -05:00
commit 0f021a8c1d
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure vendored
View file

@ -14190,7 +14190,7 @@ _ACEOF
fi
ac_config_files="$ac_config_files Makefile servlink/Makefile extensions/Makefile unsupported/Makefile src/Makefile modules/Makefile tools/Makefile doc/Makefile help/Makefile"
ac_config_files="$ac_config_files Makefile ssld/Makefile extensions/Makefile unsupported/Makefile src/Makefile modules/Makefile tools/Makefile doc/Makefile help/Makefile"
cat >confcache <<\_ACEOF
@ -14748,7 +14748,7 @@ do
case $ac_config_target in
"include/setup.h") CONFIG_HEADERS="$CONFIG_HEADERS include/setup.h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"servlink/Makefile") CONFIG_FILES="$CONFIG_FILES servlink/Makefile" ;;
"ssld/Makefile") CONFIG_FILES="$CONFIG_FILES ssld/Makefile" ;;
"extensions/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Makefile" ;;
"unsupported/Makefile") CONFIG_FILES="$CONFIG_FILES unsupported/Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;

12
modules/m_resv.c
View file

@ -224,9 +224,9 @@ parse_resv(struct Client *source_p, const char *name,
aconf = make_conf();
aconf->status = CONF_RESV_CHANNEL;
aconf->port = 0;
aconf->name = rb_strdup(name);
aconf->info.name = rb_strdup(name);
aconf->passwd = rb_strdup(reason);
add_to_resv_hash(aconf->name, aconf);
add_to_resv_hash(aconf->info.name, aconf);
if(temp_time > 0)
{
@ -243,7 +243,7 @@ parse_resv(struct Client *source_p, const char *name,
temp_time / 60, name);
}
else
write_confitem(RESV_TYPE, source_p, NULL, aconf->name,
write_confitem(RESV_TYPE, source_p, NULL, aconf->info.name,
aconf->passwd, NULL, NULL, 0);
}
else if(clean_resv_nick(name))
@ -282,7 +282,7 @@ parse_resv(struct Client *source_p, const char *name,
aconf = make_conf();
aconf->status = CONF_RESV_NICK;
aconf->port = 0;
aconf->name = rb_strdup(name);
aconf->info.name = rb_strdup(name);
aconf->passwd = rb_strdup(reason);
rb_dlinkAddAlloc(aconf, &resv_conf_list);
@ -301,7 +301,7 @@ parse_resv(struct Client *source_p, const char *name,
temp_time / 60, name);
}
else
write_confitem(RESV_TYPE, source_p, NULL, aconf->name,
write_confitem(RESV_TYPE, source_p, NULL, aconf->info.name,
aconf->passwd, NULL, NULL, 0);
}
else
@ -490,7 +490,7 @@ remove_resv(struct Client *source_p, const char *name)
{
aconf = ptr->data;
if(irccmp(aconf->name, name))
if(irccmp(aconf->info.name, name))
aconf = NULL;
else
break;