summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-07-03 18:26:48 +0300
committerAndrei Karas <akaras@inbox.ru>2016-07-03 18:26:48 +0300
commit33e4f2773b43a04b388a5769d65d9173acdc992d (patch)
tree079605f8be0d501022846a371a503f7e6300a519 /src/map
parentdf05163715bd33dfe7a50d1f68f0ed997b281923 (diff)
downloadhercules-33e4f2773b43a04b388a5769d65d9173acdc992d.tar.gz
hercules-33e4f2773b43a04b388a5769d65d9173acdc992d.tar.bz2
hercules-33e4f2773b43a04b388a5769d65d9173acdc992d.tar.xz
hercules-33e4f2773b43a04b388a5769d65d9173acdc992d.zip
Add into travis configure option --enable-buildbot.
Also disable all known default warnings if build bot option enabled.
Diffstat (limited to 'src/map')
-rw-r--r--src/map/chrif.c2
-rw-r--r--src/map/map.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 52af1137e..51e8e5143 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -236,11 +236,13 @@ void chrif_setpasswd(char *pwd) {
// security check, prints warning if using default password
void chrif_checkdefaultlogin(void) {
+#ifndef BUILDBOT
if (strcmp(chrif->userid, "s1")==0 && strcmp(chrif->passwd, "p1")==0) {
ShowWarning("Using the default user/password s1/p1 is NOT RECOMMENDED.\n");
ShowNotice("Please edit your 'login' table to create a proper inter-server user/password (gender 'S')\n");
ShowNotice("and then edit your user/password in conf/map-server.conf (or conf/import/map_conf.txt)\n");
}
+#endif
}
// sets char-server's ip address
diff --git a/src/map/map.c b/src/map/map.c
index 779f8d601..30c849ed1 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -6062,7 +6062,9 @@ int do_init(int argc, char *argv[])
char ip_str[16];
sockt->ip2str(sockt->addr_[0], ip_str);
+#ifndef BUILDBOT
ShowWarning("Not all IP addresses in /conf/map-server.conf configured, auto-detecting...\n");
+#endif
if (sockt->naddr_ == 0)
ShowError("Unable to determine your IP address...\n");