Author: jerry Date: 2005-10-12 16:49:10 +0000 (Wed, 12 Oct 2005) New Revision: 10926
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10926 Log: merging quota fixes from 3.0 Modified: branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt branches/tmp/SAMBA_3_0_20B/source/configure.in branches/tmp/SAMBA_3_0_20B/source/smbd/trans2.c Changeset: Modified: branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt =================================================================== --- branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt 2005-10-12 14:58:59 UTC (rev 10925) +++ branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt 2005-10-12 16:49:10 UTC (rev 10926) @@ -33,6 +33,13 @@ which cannot be read due to permissions. +o Gerald (Jerry) Carter <[EMAIL PROTECTED]> + * BUG 3070: Fix crash bug in qfsinfo when retrieving fs quota + details. + * BUG 1473, 3090: Quota detection and compilation problems on + Solaris. + + o Marc Balmer <[EMAIL PROTECTED]> * Build fixes when builddir != srcdir Modified: branches/tmp/SAMBA_3_0_20B/source/configure.in =================================================================== --- branches/tmp/SAMBA_3_0_20B/source/configure.in 2005-10-12 14:58:59 UTC (rev 10925) +++ branches/tmp/SAMBA_3_0_20B/source/configure.in 2005-10-12 16:49:10 UTC (rev 10926) @@ -3612,6 +3612,10 @@ AC_MSG_CHECKING(whether to use the lib/sysquotas_xfs.c builtin support) AC_MSG_RESULT(yes) ;; + *solaris*) + # need to set this define when using static linking (BUG 1473) + CPPFLAGS="$CPPFLAGS -DSUNOS5" + ;; *) ;; esac @@ -3791,7 +3795,7 @@ AC_CACHE_CHECK([whether the old quota support works],samba_cv_QUOTA_WORKS,[ SAVE_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS -I${srcdir-.}/ -I. -I${srcdir-.}/include -I${srcdir-.}/ubiqx -I${srcdir-.}/popt -I${srcdir-.}/nsswitch" +CPPFLAGS="$CPPFLAGS -I${srcdir-.}/ -I. -I${srcdir-.}/include -I${srcdir-.}/ubiqx -I${srcdir-.}/popt -I${srcdir-.}/nsswitch -I${srcdir-.}/smbwrapper" AC_TRY_COMPILE([ #include "confdefs.h" #define NO_PROTO_H 1 Modified: branches/tmp/SAMBA_3_0_20B/source/smbd/trans2.c =================================================================== --- branches/tmp/SAMBA_3_0_20B/source/smbd/trans2.c 2005-10-12 14:58:59 UTC (rev 10925) +++ branches/tmp/SAMBA_3_0_20B/source/smbd/trans2.c 2005-10-12 16:49:10 UTC (rev 10926) @@ -2347,7 +2347,6 @@ fsp.conn = conn; fsp.fnum = -1; - fsp.fh->fd = -1; /* access check */ if (current_user.uid != 0) {
