From e8d9232fa8731f063cacbf0eb283fee4db80fb4a Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Wed, 2 Apr 2008 10:26:46 -0500 Subject: [PATCH 1/3] Missed a spot. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6d9b2ef57..4adfe73de 100644 --- a/configure.ac +++ b/configure.ac @@ -1237,7 +1237,7 @@ fi AC_CONFIG_FILES( \ Makefile \ - servlink/Makefile \ + ssld/Makefile \ extensions/Makefile \ unsupported/Makefile \ src/Makefile \ From 78d19d631090f7f8a2fdbcbc9aebfde0eb00ba3e Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Wed, 2 Apr 2008 10:27:02 -0500 Subject: [PATCH 2/3] Run autoreconf. --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 0f118e589..7efa5f7a2 100755 --- a/configure +++ b/configure @@ -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" ;; From 3633815dd3ebb15e4229e5b56bd76a52061ef4a2 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Wed, 2 Apr 2008 10:30:44 -0500 Subject: [PATCH 3/3] Make m_resv.so build again. --- modules/m_resv.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/m_resv.c b/modules/m_resv.c index 084f3f8ef..7ad97e691 100644 --- a/modules/m_resv.c +++ b/modules/m_resv.c @@ -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;