#
# By default (no explicit -setuplog and no buildtime configure flag
# --with-logfile) afpd logs to syslog with a default
-# logging setup equivalent to "-setuplog default log_note".
+# logging setup equivalent to "-setuplog default log_info".
#
# If build with --with-logfile[=somefile] (default logfile
# /var/log/netatalk.log) afpd defaults to a setup that is equivalent
-# to "-setuplog default log_note [netatalk.log|somefile]"
+# to "-setuplog default log_info [netatalk.log|somefile]"
#
# logtypes: Default, AFPDaemon, Logger, UAMSDaemon
# loglevels: LOG_SEVERE, LOG_ERROR, LOG_WARN, LOG_NOTE, LOG_INFO, LOG_DEBUG,
/*
- * $Id: desktop.c,v 1.48 2010-01-05 12:06:33 franklahm Exp $
+ * $Id: desktop.c,v 1.49 2010-01-21 14:14:49 didg Exp $
*
* See COPYRIGHT.
*
return AFP_OK;
geticon_exit:
- LOG(log_info, logtype_afpd, "afp_geticon(%s): %s", icon_dtfile(vol, fcreator), strerror(errno));
+ LOG(log_error, logtype_afpd, "afp_geticon(%s): %s", icon_dtfile(vol, fcreator), strerror(errno));
dsi_readdone(dsi);
obj->exit(EXITERR_SYS);
return AFP_OK;
/*
- * $Id: filedir.c,v 1.68 2010-01-19 14:51:18 franklahm Exp $
+ * $Id: filedir.c,v 1.69 2010-01-21 14:14:49 didg Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
return AFPERR_PARAM;
if (!vol->vfs->vfs_validupath(vol, name)) {
- LOG(log_info, logtype_afpd, "check_name: illegal name: '%s'", name);
+ LOG(log_error, logtype_afpd, "check_name: illegal name: '%s'", name);
return AFPERR_EXIST;
}
for(i=0, j=0; veto_str[i] != '\0'; i++) {
if (veto_str[i] == '/') {
if ((j>0) && (path[j] == '\0')) {
- LOG(log_info, logtype_afpd, "vetoed file:'%s'", path);
+ LOG(log_debug, logtype_afpd, "vetoed file:'%s'", path);
return 1;
}
j = 0;
/*
- * $Id: quota.c,v 1.32 2009-10-14 02:24:05 didg Exp $
+ * $Id: quota.c,v 1.33 2010-01-21 14:14:49 didg Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
#endif
#ifdef DEBUG_QUOTA
- LOG(log_info, logtype_afpd, "after calling getquota in uquota_getvolspace!" );
- LOG(log_info, logtype_afpd, "dqb_ihardlimit: %u", dqblk.dqb_ihardlimit );
- LOG(log_info, logtype_afpd, "dqb_isoftlimit: %u", dqblk.dqb_isoftlimit );
- LOG(log_info, logtype_afpd, "dqb_curinodes : %u", dqblk.dqb_curinodes );
- LOG(log_info, logtype_afpd, "dqb_bhardlimit: %u", dqblk.dqb_bhardlimit );
- LOG(log_info, logtype_afpd, "dqb_bsoftlimit: %u", dqblk.dqb_bsoftlimit );
- LOG(log_info, logtype_afpd, "dqb_curblocks : %u", dqblk.dqb_curblocks );
- LOG(log_info, logtype_afpd, "dqb_btime : %u", dqblk.dqb_btime );
- LOG(log_info, logtype_afpd, "dqb_itime : %u", dqblk.dqb_itime );
- LOG(log_info, logtype_afpd, "bsize/this_bsize : %u/%u", bsize, this_bsize );
- LOG(log_info, logtype_afpd, "dqblk.dqb_bhardlimit size: %u", tobytes( dqblk.dqb_bhardlimit, this_bsize ));
- LOG(log_info, logtype_afpd, "dqblk.dqb_bsoftlimit size: %u", tobytes( dqblk.dqb_bsoftlimit, this_bsize ));
- LOG(log_info, logtype_afpd, "dqblk.dqb_curblocks size: %u", tobytes( dqblk.dqb_curblocks, this_bsize ));
+ LOG(log_debug, logtype_afpd, "after calling getquota in uquota_getvolspace!" );
+ LOG(log_debug, logtype_afpd, "dqb_ihardlimit: %u", dqblk.dqb_ihardlimit );
+ LOG(log_debug, logtype_afpd, "dqb_isoftlimit: %u", dqblk.dqb_isoftlimit );
+ LOG(log_debug, logtype_afpd, "dqb_curinodes : %u", dqblk.dqb_curinodes );
+ LOG(log_debug, logtype_afpd, "dqb_bhardlimit: %u", dqblk.dqb_bhardlimit );
+ LOG(log_debug, logtype_afpd, "dqb_bsoftlimit: %u", dqblk.dqb_bsoftlimit );
+ LOG(log_debug, logtype_afpd, "dqb_curblocks : %u", dqblk.dqb_curblocks );
+ LOG(log_debug, logtype_afpd, "dqb_btime : %u", dqblk.dqb_btime );
+ LOG(log_debug, logtype_afpd, "dqb_itime : %u", dqblk.dqb_itime );
+ LOG(log_debug, logtype_afpd, "bsize/this_bsize : %u/%u", bsize, this_bsize );
+ LOG(log_debug, logtype_afpd, "dqblk.dqb_bhardlimit size: %u", tobytes( dqblk.dqb_bhardlimit, this_bsize ));
+ LOG(log_debug, logtype_afpd, "dqblk.dqb_bsoftlimit size: %u", tobytes( dqblk.dqb_bsoftlimit, this_bsize ));
+ LOG(log_debug, logtype_afpd, "dqblk.dqb_curblocks size: %u", tobytes( dqblk.dqb_curblocks, this_bsize ));
#endif /* DEBUG_QUOTA */
/* no limit set for this user. it might be set in the future. */
}
#ifdef DEBUG_QUOTA
- LOG(log_info, logtype_afpd, "bfree : %u", *bfree );
- LOG(log_info, logtype_afpd, "btotal : %u", *btotal );
- LOG(log_info, logtype_afpd, "bfree : %uKB", *bfree/1024 );
- LOG(log_info, logtype_afpd, "btotal : %uKB", *btotal/1024 );
+ LOG(log_debug, logtype_afpd, "bfree : %u", *bfree );
+ LOG(log_debug, logtype_afpd, "btotal : %u", *btotal );
+ LOG(log_debug, logtype_afpd, "bfree : %uKB", *bfree/1024 );
+ LOG(log_debug, logtype_afpd, "btotal : %uKB", *btotal/1024 );
#endif
return( AFP_OK );
/*
- * $Id: ad_sendfile.c,v 1.10 2009-10-25 09:47:04 didg Exp $
+ * $Id: ad_sendfile.c,v 1.11 2010-01-21 14:14:49 didg Exp $
*
* Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
* All rights reserved. See COPYRIGHT.
return sendfile(tofd, fromfd, offset, count);
}
-
#elif defined(SENDFILE_FLAVOR_BSD )
/* FIXME untested */
#error sendfile semantic broken
/*
- * $Id: cnid_dbd.c,v 1.15 2009-11-30 15:27:48 didg Exp $
+ * $Id: cnid_dbd.c,v 1.16 2010-01-21 14:14:49 didg Exp $
*
* Copyright (C) Joerg Lenneis 2003
* All Rights Reserved. See COPYING.
}
if ((db = cdb->_private) != NULL) {
- LOG(log_info, logtype_cnid, "closing database connection for volume '%s'", db->db_dir);
+ LOG(log_debug, logtype_cnid, "closing database connection for volume '%s'", db->db_dir);
if (db->fd >= 0)
close(db->fd);
void log_init(void)
{
- syslog_setup(log_note, 0,
+ syslog_setup(log_info, 0,
log_config.syslog_display_options,
log_config.facility);
}
/*
- * $Id: server_child.c,v 1.11 2009-10-14 02:24:05 didg Exp $
+ * $Id: server_child.c,v 1.12 2010-01-21 14:14:49 didg Exp $
*
* Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
* All rights reserved. See COPYRIGHT.
child->valid = 1;
child->idlen = idlen;
child->clientid = id;
- LOG(log_info, logtype_default, "Setting clientid (len %d) for %d, boottime %X", idlen, child->pid, boottime);
+ LOG(log_debug, logtype_default, "Setting clientid (len %d) for %d, boottime %X", idlen, child->pid, boottime);
}
child = tmp;
}
/*
- * $Id: server_ipc.c,v 1.3 2009-10-14 01:38:29 didg Exp $
+ * $Id: server_ipc.c,v 1.4 2010-01-21 14:14:49 didg Exp $
*
* All rights reserved. See COPYRIGHT.
*
server_child_kill_one_by_id (children, CHILD_DSIFORK, ipc->child_pid, ipc->uid, idlen, clientid, boottime);
/* FIXME byte to ascii if we want to log clientid */
- LOG (log_info, logtype_afpd, "ipc_get_session: len: %u, idlen %d, time %x", ipc->len, idlen, boottime);
+ LOG (log_debug, logtype_afpd, "ipc_get_session: len: %u, idlen %d, time %x", ipc->len, idlen, boottime);
return 0;
}
}
ipc.msg = buf;
- LOG (log_info, logtype_afpd, "ipc_read: command: %u, pid: %u, len: %u", ipc.command, ipc.child_pid, ipc.len);
+ LOG (log_debug, logtype_afpd, "ipc_read: command: %u, pid: %u, len: %u", ipc.command, ipc.child_pid, ipc.len);
switch (ipc.command)
{
memcpy(p, msg, len);
- LOG (log_info, logtype_afpd, "ipc_write: command: %u, pid: %u, msglen: %u", command, pid, len);
+ LOG (log_debug, logtype_afpd, "ipc_write: command: %u, pid: %u, msglen: %u", command, pid, len);
return write(pipe_fd[1], block, len+IPC_HEADERLEN );
}