X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fquota.c;h=e40de5fab87fb5f16cc1d6a3d02cafa8a7d1774e;hb=7b12c56c26d0ce7ef5834c71d3c8bcc90fef2532;hp=b5d52375c5c2f1e936c0f648185094cb05402d1e;hpb=815d557e167e76015934397dffbfa869180dcdbc;p=netatalk.git diff --git a/etc/afpd/quota.c b/etc/afpd/quota.c index b5d52375..e40de5fa 100644 --- a/etc/afpd/quota.c +++ b/etc/afpd/quota.c @@ -1,5 +1,5 @@ /* - * $Id: quota.c,v 1.31 2009-10-13 22:55:37 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. @@ -642,7 +642,7 @@ static int overquota( struct dqblk *dqblk) return( 0 ); } #else /* ultrix */ - if ( gettimeofday( &tv, 0 ) < 0 ) { + if ( gettimeofday( &tv, NULL ) < 0 ) { LOG(log_error, logtype_afpd, "overquota: gettimeofday: %s", strerror(errno) ); return( AFPERR_PARAM ); } @@ -695,19 +695,19 @@ int uquota_getvolspace( struct vol *vol, VolSpace *bfree, VolSpace *btotal, cons #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. */ @@ -730,10 +730,10 @@ int uquota_getvolspace( struct vol *vol, VolSpace *bfree, VolSpace *btotal, cons } #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 );