Remove AppleTalk logger types and add FCE type

diff --git a/include/atalk/logger.h b/include/atalk/logger.h
index cf67bcad6f5260d8b1e0d42b3812e77a9b492521..330eb7b613489ab6d79741effcc6edd0f536d75b 100644 (file)
--- a/include/atalk/logger.h
+++ b/include/atalk/logger.h
@@ -90,9 +90,8 @@ enum logtypes {
   logtype_cnid,
   logtype_afpd,
   logtype_dsi,
-  logtype_atalkd,
-  logtype_papd,
   logtype_uams,
+  logtype_fce,
   logtype_end_of_list_marker  /* don't put any logtypes after this */
 };
 

diff --git a/libatalk/util/logger.c b/libatalk/util/logger.c
index c8a2a0a8acd2845c43bfbd088e81b7a496855a1b..7bec1b8bb3308adec9ddaba80707013b228ef8d6 100644 (file)
--- a/libatalk/util/logger.c
+++ b/libatalk/util/logger.c
@@ -59,10 +59,9 @@ Netatalk 2001 (c)
   "CNID",                            \
   "AFPDaemon",                       \
   "DSI",                             \
-  "ATalkDaemon",                     \
-  "PAPDaemon",                       \
   "UAMS",                            \
-  "end_of_list_marker"}              \
+  "FCE",                             \
+  "end_of_list_marker"}
 
 /* =========================================================================
    Config
@@ -85,9 +84,8 @@ UAM_MODULE_EXPORT logtype_conf_t type_configs[logtype_end_of_list_marker] = {
     DEFAULT_LOG_CONFIG, /* logtype_cnid */
     DEFAULT_LOG_CONFIG, /* logtype_afpd */
     DEFAULT_LOG_CONFIG, /* logtype_dsi */
-    DEFAULT_LOG_CONFIG, /* logtype_atalkd */
-    DEFAULT_LOG_CONFIG, /* logtype_papd */
-    DEFAULT_LOG_CONFIG /* logtype_uams */
+    DEFAULT_LOG_CONFIG, /* logtype_uams */
+    DEFAULT_LOG_CONFIG  /* logtype_fce */
 };
 
 static void syslog_setup(int loglevel, enum logtypes logtype, int display_options, int facility);