Mege maste

diff --cc etc/afpd/afp_dsi.c
Simple merge

diff --cc etc/afpd/auth.c
Simple merge

diff --cc include/atalk/dsi.h
Simple merge

diff --cc libatalk/util/server_ipc.c
Simple merge