summaryrefslogtreecommitdiff
path: root/src/map/chrif.c
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-11-06 21:23:31 -0200
committershennetsind <ind@henn.et>2013-11-06 21:23:31 -0200
commitd56017e3d1bf783cfdc67a702d2b70a0a27c8863 (patch)
treea47bd0ef6340ce1d011d198f430c7d96d620afe0 /src/map/chrif.c
parent5c94e76753c0cdb4ffb7dabbd6e135f1f7d42ef2 (diff)
parent3a3d2297068809d25ca43e19fd2977f97b2728f5 (diff)
downloadhercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.gz
hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.bz2
hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.xz
hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.zip
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et> Conflicts: src/map/pc.c
Diffstat (limited to 'src/map/chrif.c')
-rw-r--r--src/map/chrif.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/chrif.c b/src/map/chrif.c
index a13217060..87ec71ec5 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -1611,8 +1611,10 @@ int do_final_chrif(void) {
/*==========================================
*
*------------------------------------------*/
-int do_init_chrif(void) {
-
+int do_init_chrif(bool minimal) {
+ if (minimal)
+ return 0;
+
chrif->auth_db = idb_alloc(DB_OPT_BASE);
chrif->auth_db_ers = ers_new(sizeof(struct auth_node),"chrif.c::auth_db_ers",ERS_OPT_NONE);