From 8208cf8bbc5fe3b91f68b67e1a052f82a1d9a89c Mon Sep 17 00:00:00 2001 From: Frank Lahm Date: Wed, 30 Mar 2011 13:29:20 +0200 Subject: [PATCH] Fix logtypes --- etc/afpd/catsearch.c | 2 +- etc/afpd/dircache.c | 4 ++-- etc/afpd/volume.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/etc/afpd/catsearch.c b/etc/afpd/catsearch.c index 80e807ca..5404118c 100644 --- a/etc/afpd/catsearch.c +++ b/etc/afpd/catsearch.c @@ -728,7 +728,7 @@ static int catsearch_db(struct vol *vol, buffer, MAXPATHLEN, &flags) == (size_t)-1) { - LOG(log_error, logtype_cnid, "catsearch_db: conversion error"); + LOG(log_error, logtype_afpd, "catsearch_db: conversion error"); result = AFPERR_MISC; goto catsearch_end; } diff --git a/etc/afpd/dircache.c b/etc/afpd/dircache.c index 53359ed4..8a03de7e 100644 --- a/etc/afpd/dircache.c +++ b/etc/afpd/dircache.c @@ -518,7 +518,7 @@ void dircache_remove(const struct vol *vol _U_, struct dir *dir, int flags) if (flags & DIDNAME_INDEX) { if ((hn = hash_lookup(index_didname, dir)) == NULL) { - LOG(log_error, logtype_default, "dircache_remove(%u,\"%s\"): not in didname index", + LOG(log_error, logtype_afpd, "dircache_remove(%u,\"%s\"): not in didname index", ntohl(dir->d_did), cfrombstr(dir->d_u_name)); dircache_dump(); AFP_PANIC("dircache_remove"); @@ -528,7 +528,7 @@ void dircache_remove(const struct vol *vol _U_, struct dir *dir, int flags) if (flags & DIRCACHE) { if ((hn = hash_lookup(dircache, dir)) == NULL) { - LOG(log_error, logtype_default, "dircache_remove(%u,\"%s\"): not in dircache", + LOG(log_error, logtype_afpd, "dircache_remove(%u,\"%s\"): not in dircache", ntohl(dir->d_did), cfrombstr(dir->d_u_name)); dircache_dump(); AFP_PANIC("dircache_remove"); diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c index a7a62e85..aa15875a 100644 --- a/etc/afpd/volume.c +++ b/etc/afpd/volume.c @@ -2032,7 +2032,7 @@ static void check_ea_sys_support(struct vol *vol) if (vol->v_vfs_ea == AFPVOL_EA_AUTO) { if ((vol->v_flags & AFPVOL_RO) == AFPVOL_RO) { - LOG(log_info, logtype_logger, "read-only volume '%s', can't test for EA support, disabling EAs", vol->v_localname); + LOG(log_info, logtype_afpd, "read-only volume '%s', can't test for EA support, disabling EAs", vol->v_localname); vol->v_vfs_ea = AFPVOL_EA_NONE; return; } @@ -2042,7 +2042,7 @@ static void check_ea_sys_support(struct vol *vol) process_uid = geteuid(); if (process_uid) if (seteuid(0) == -1) { - LOG(log_error, logtype_logger, "check_ea_sys_support: can't seteuid(0): %s", strerror(errno)); + LOG(log_error, logtype_afpd, "check_ea_sys_support: can't seteuid(0): %s", strerror(errno)); exit(EXITERR_SYS); } @@ -2057,7 +2057,7 @@ static void check_ea_sys_support(struct vol *vol) if (process_uid) { if (seteuid(process_uid) == -1) { - LOG(log_error, logtype_logger, "can't seteuid back %s", strerror(errno)); + LOG(log_error, logtype_afpd, "can't seteuid back %s", strerror(errno)); exit(EXITERR_SYS); } } -- 2.39.2