diff options
| author | Haru <haru@dotalux.com> | 2016-07-03 19:47:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-03 19:47:38 +0200 |
| commit | d2f666fc10eac20f70729176c088b2c81d233531 (patch) | |
| tree | 55902d4e252f365f511137d4022670ccfad59a62 /src/map | |
| parent | 6fbc00f9454d33caf79f89708cab9e46ec996eeb (diff) | |
| parent | 7b350fbf497d737c12cc03ddd888bb6a0ee486e4 (diff) | |
| download | hercules-d2f666fc10eac20f70729176c088b2c81d233531.tar.gz hercules-d2f666fc10eac20f70729176c088b2c81d233531.tar.bz2 hercules-d2f666fc10eac20f70729176c088b2c81d233531.tar.xz hercules-d2f666fc10eac20f70729176c088b2c81d233531.zip | |
Merge pull request #1336 from 4144/travisext
Different travis extensions
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/chrif.c | 2 | ||||
| -rw-r--r-- | src/map/map.c | 2 |
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"); |