svn commit: samba r18604 - in branches/SAMBA_4_0/source/lib/tdb: .
Author: tridge Date: 2006-09-18 04:19:13 + (Mon, 18 Sep 2006) New Revision: 18604 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18604 Log: fixed shell syntax Modified: branches/SAMBA_4_0/source/lib/tdb/libtdb.m4 Changeset: Modified: branches/SAMBA_4_0/source/lib/tdb/libtdb.m4 === --- branches/SAMBA_4_0/source/lib/tdb/libtdb.m4 2006-09-18 02:27:48 UTC (rev 18603) +++ branches/SAMBA_4_0/source/lib/tdb/libtdb.m4 2006-09-18 04:19:13 UTC (rev 18604) @@ -9,7 +9,7 @@ break; fi done -if x"$tdbdir" = "x"; then +if test x"$tdbdir" = "x"; then AC_MSG_ERROR([cannot find tdb source in $tdbpaths]) fi TDBOBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o"
svn commit: samba r18603 - in branches/SAMBA_3_0/source: . modules smbd
Author: jra Date: 2006-09-18 02:27:48 + (Mon, 18 Sep 2006) New Revision: 18603 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18603 Log: Add in the NFSv4 ACL mapping code from IBM. Sorry for the delay :-). Jeremy. Added: branches/SAMBA_3_0/source/modules/README.nfs4acls.txt branches/SAMBA_3_0/source/modules/nfs4_acls.c branches/SAMBA_3_0/source/modules/nfs4_acls.h branches/SAMBA_3_0/source/modules/vfs_aixacl2.c Removed: branches/SAMBA_3_0/source/modules/vfs_gpfsacl.c Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/configure.in branches/SAMBA_3_0/source/smbd/posix_acls.c Changeset: Sorry, the patch is too large (1529 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18603
svn commit: samba r18602 - in branches/SAMBA_4_0/source/lib/ldb/web: .
Author: tridge Date: 2006-09-18 01:54:12 + (Mon, 18 Sep 2006) New Revision: 18602 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18602 Log: updated web page for new ldb build method Modified: branches/SAMBA_4_0/source/lib/ldb/web/index.html Changeset: Modified: branches/SAMBA_4_0/source/lib/ldb/web/index.html === --- branches/SAMBA_4_0/source/lib/ldb/web/index.html2006-09-18 01:51:57 UTC (rev 18601) +++ branches/SAMBA_4_0/source/lib/ldb/web/index.html2006-09-18 01:54:12 UTC (rev 18602) @@ -64,16 +64,21 @@ svn co svn://svnanon.samba.org/samba/branches/SAMBA_4_0/source/lib/ldb ldb svn co svn://svnanon.samba.org/samba/branches/SAMBA_4_0/source/lib/tdb tdb svn co svn://svnanon.samba.org/samba/branches/SAMBA_4_0/source/lib/talloc talloc + svn co svn://svnanon.samba.org/samba/branches/SAMBA_4_0/source/lib/replace libreplace To fetch via rsync use these commands: - rsync -Pavz samba.org::ftp/unpacked/samba4/source/lib/ldb . - rsync -Pavz samba.org::ftp/unpacked/samba4/source/lib/tdb . - rsync -Pavz samba.org::ftp/unpacked/samba4/source/lib/talloc . + rsync -Pavz samba.org::ftp/unpacked/ldb . + rsync -Pavz samba.org::ftp/unpacked/tdb . + rsync -Pavz samba.org::ftp/unpacked/talloc . + rsync -Pavz samba.org::ftp/unpacked/libreplace . +and build in ldb. It will find the other libraries in the directory +above automatically. + http://samba.org/~tridge/";>Andrew Tridgell
svn commit: samba r18601 - in branches/SAMBA_4_0/source/lib/talloc/web: .
Author: tridge Date: 2006-09-18 01:51:57 + (Mon, 18 Sep 2006) New Revision: 18601 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18601 Log: updated web page for new talloc build method Modified: branches/SAMBA_4_0/source/lib/talloc/web/index.html Changeset: Modified: branches/SAMBA_4_0/source/lib/talloc/web/index.html === --- branches/SAMBA_4_0/source/lib/talloc/web/index.html 2006-09-18 01:31:57 UTC (rev 18600) +++ branches/SAMBA_4_0/source/lib/talloc/web/index.html 2006-09-18 01:51:57 UTC (rev 18601) @@ -29,12 +29,14 @@ svn co svn://svnanon.samba.org/samba/branches/SAMBA_4_0/source/lib/talloc talloc + svn co svn://svnanon.samba.org/samba/branches/SAMBA_4_0/source/lib/replace libreplace To fetch via rsync use this command: rsync -Pavz samba.org::ftp/unpacked/samba4/source/lib/talloc . + rsync -Pavz samba.org::ftp/unpacked/samba4/source/lib/libreplace .
svn commit: samba r18600 - in branches/SAMBA_4_0/source/lib: popt replace talloc tdb
Author: tridge Date: 2006-09-18 01:31:57 + (Mon, 18 Sep 2006) New Revision: 18600 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18600 Log: - fix shell syntax in tests for libraries - add library test for libpopt Modified: branches/SAMBA_4_0/source/lib/popt/libpopt.m4 branches/SAMBA_4_0/source/lib/replace/libreplace.m4 branches/SAMBA_4_0/source/lib/talloc/libtalloc.m4 branches/SAMBA_4_0/source/lib/tdb/libtdb.m4 Changeset: Modified: branches/SAMBA_4_0/source/lib/popt/libpopt.m4 === --- branches/SAMBA_4_0/source/lib/popt/libpopt.m4 2006-09-18 01:08:19 UTC (rev 18599) +++ branches/SAMBA_4_0/source/lib/popt/libpopt.m4 2006-09-18 01:31:57 UTC (rev 18600) @@ -25,7 +25,8 @@ dnl find the popt sources. This is meant to work both for dnl popt standalone builds, and builds of packages using popt poptdir="" - for d in "$srcdir" "$srcdir/lib/popt" "$srcdir/popt" "$srcdir/../popt"; do + poptpaths="$srcdir $srcdir/lib/popt $srcdir/popt $srcdir/../popt" + for d in $poptpaths; do if test -f "$d/popt.c"; then poptdir="$d" POPT_CFLAGS="-I$d" @@ -33,6 +34,9 @@ break fi done +if test x"$poptdir" = "x"; then + AC_MSG_ERROR([cannot find popt source in $poptpaths]) + fi POPTOBJ="popt.o findme.o poptconfig.o popthelp.o poptparse.o" AC_SUBST(POPTOBJ) AC_CHECK_HEADERS([float.h alloca.h]) Modified: branches/SAMBA_4_0/source/lib/replace/libreplace.m4 === --- branches/SAMBA_4_0/source/lib/replace/libreplace.m4 2006-09-18 01:08:19 UTC (rev 18599) +++ branches/SAMBA_4_0/source/lib/replace/libreplace.m4 2006-09-18 01:31:57 UTC (rev 18600) @@ -13,7 +13,7 @@ break; fi done -if [ x"$libreplacedir" = "x" ]; then +if test x"$libreplacedir" = "x"; then AC_MSG_ERROR([cannot find libreplace in $libreplacepaths]) fi LIBREPLACEOBJ="replace.o" Modified: branches/SAMBA_4_0/source/lib/talloc/libtalloc.m4 === --- branches/SAMBA_4_0/source/lib/talloc/libtalloc.m4 2006-09-18 01:08:19 UTC (rev 18599) +++ branches/SAMBA_4_0/source/lib/talloc/libtalloc.m4 2006-09-18 01:31:57 UTC (rev 18600) @@ -9,7 +9,7 @@ break; fi done -if [ x"$tallocdir" = "x" ]; then +if test x"$tallocdir" = "x"; then AC_MSG_ERROR([cannot find talloc source in $tallocpaths]) fi TALLOCOBJ="talloc.o" Modified: branches/SAMBA_4_0/source/lib/tdb/libtdb.m4 === --- branches/SAMBA_4_0/source/lib/tdb/libtdb.m4 2006-09-18 01:08:19 UTC (rev 18599) +++ branches/SAMBA_4_0/source/lib/tdb/libtdb.m4 2006-09-18 01:31:57 UTC (rev 18600) @@ -9,7 +9,7 @@ break; fi done -if [ x"$tdbdir" = "x" ]; then +if x"$tdbdir" = "x"; then AC_MSG_ERROR([cannot find tdb source in $tdbpaths]) fi TDBOBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o"
svn commit: samba r18599 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: tridge
Date: 2006-09-18 01:08:19 + (Mon, 18 Sep 2006)
New Revision: 18599
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18599
Log:
the netr_CryptPassword structure needs to use a uint8, as the data is
passed to acrfour, and that assumes a byte buffer. This caused us to
fail big endian boxes (or more specifically, to be incompatible with
little endian boxes)
Modified:
branches/SAMBA_4_0/source/librpc/idl/netlogon.idl
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/netlogon.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/netlogon.idl 2006-09-17 20:28:46 UTC
(rev 18598)
+++ branches/SAMBA_4_0/source/librpc/idl/netlogon.idl 2006-09-18 01:08:19 UTC
(rev 18599)
@@ -1046,7 +1046,7 @@
);
typedef [flag(NDR_PAHEX)] struct {
- uint16 data[256];
+ uint8 data[512];
uint32 length;
} netr_CryptPassword;
Build status as of Mon Sep 18 00:00:02 2006
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2006-09-17 00:00:30.0 + +++ /home/build/master/cache/broken_results.txt 2006-09-18 00:00:50.0 + @@ -1,4 +1,4 @@ -Build status as of Sun Sep 17 00:00:02 2006 +Build status as of Mon Sep 18 00:00:02 2006 Build counts: Tree Total Broken Panic @@ -6,16 +6,16 @@ build_farm 0 0 0 ccache 43 7 0 distcc 43 7 0 -ldb 41 8 0 -libreplace 40 3 0 -lorikeet-heimdal 2 0 0 +ldb 41 6 0 +libreplace 40 2 0 +lorikeet-heimdal 1 0 0 ppp 17 0 0 rsync41 4 0 samba1 0 0 samba-docs 0 0 0 samba4 42 12 1 samba_3_041 40 0 -smb-build29 4 0 +smb-build30 4 0 talloc 44 3 0 tdb 42 5 0
svn commit: linux-cifs-client r82 - in branches/linux-converged-for-old-kernels/fs/cifs: .
Author: sfrench
Date: 2006-09-17 23:45:49 + (Sun, 17 Sep 2006)
New Revision: 82
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=linux-cifs-client&rev=82
Log:
More 2.4 build fixes from Yehuda
Modified:
branches/linux-converged-for-old-kernels/fs/cifs/cifsfs24.c
branches/linux-converged-for-old-kernels/fs/cifs/transport.c
Changeset:
Modified: branches/linux-converged-for-old-kernels/fs/cifs/cifsfs24.c
===
--- branches/linux-converged-for-old-kernels/fs/cifs/cifsfs24.c 2006-09-14
21:20:14 UTC (rev 81)
+++ branches/linux-converged-for-old-kernels/fs/cifs/cifsfs24.c 2006-09-17
23:45:49 UTC (rev 82)
@@ -40,7 +40,9 @@
#include "cifs_debug.h"
#include "cifs_fs_sb.h"
#include
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 25))
#include
+#endif
#define CIFS_MAGIC_NUMBER 0xFF534D42 /* the first four bytes of SMB PDUs */
#ifdef CONFIG_CIFS_QUOTA
@@ -63,16 +65,16 @@
extern struct task_struct * dnotifyThread; /* remove sparse warning */
struct task_struct * dnotifyThread = NULL;
unsigned int CIFSMaxBufSize = CIFS_MAX_MSGSIZE;
-module_param(CIFSMaxBufSize, int, 0);
+MODULE_PARM(CIFSMaxBufSize, "i");
MODULE_PARM_DESC(CIFSMaxBufSize,"Network buffer size (not including header).
Default: 16384 Range: 8192 to 130048");
unsigned int cifs_min_rcv = CIFS_MIN_RCV_POOL;
-module_param(cifs_min_rcv, int, 0);
+MODULE_PARM(cifs_min_rcv, "i");
MODULE_PARM_DESC(cifs_min_rcv,"Network buffers in pool. Default: 4 Range: 1 to
64");
unsigned int cifs_min_small = 30;
-module_param(cifs_min_small, int, 0);
+MODULE_PARM(cifs_min_small, "i");
MODULE_PARM_DESC(cifs_min_small,"Small network buffers in pool. Default: 30
Range: 2 to 256");
unsigned int cifs_max_pending = CIFS_MAX_REQ;
-module_param(cifs_max_pending, int, 0);
+MODULE_PARM(cifs_max_pending, "i");
MODULE_PARM_DESC(cifs_max_pending,"Simultaneous requests to server. Default:
50 Range: 2 to 256");
static DECLARE_COMPLETION(cifs_oplock_exited);
Modified: branches/linux-converged-for-old-kernels/fs/cifs/transport.c
===
--- branches/linux-converged-for-old-kernels/fs/cifs/transport.c
2006-09-14 21:20:14 UTC (rev 81)
+++ branches/linux-converged-for-old-kernels/fs/cifs/transport.c
2006-09-17 23:45:49 UTC (rev 82)
@@ -314,7 +314,10 @@
break;
if (rc >= total_len) {
- WARN_ON(rc > total_len);
+ if(rc > total_len) {
+ cERROR(1,("unexpected length received"));
+ dump_stack();
+ }
break;
}
if(rc == 0) {
svn commit: samba r18598 - in branches/SAMBA_3_0/source/rpc_parse: .
Author: vlendec
Date: 2006-09-17 20:28:46 + (Sun, 17 Sep 2006)
New Revision: 18598
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18598
Log:
Add marshalling support to smb_io_time.
Volker
Modified:
branches/SAMBA_3_0/source/rpc_parse/parse_misc.c
Changeset:
Modified: branches/SAMBA_3_0/source/rpc_parse/parse_misc.c
===
--- branches/SAMBA_3_0/source/rpc_parse/parse_misc.c2006-09-17 20:05:09 UTC
(rev 18597)
+++ branches/SAMBA_3_0/source/rpc_parse/parse_misc.c2006-09-17 20:28:46 UTC
(rev 18598)
@@ -124,13 +124,20 @@
if(!prs_align(ps))
return False;
+
+ if (MARSHALLING(ps)) {
+ low = *nttime & 0x;
+ high = *nttime >> 32;
+ }
if(!prs_uint32("low ", ps, depth, &low)) /* low part */
return False;
if(!prs_uint32("high", ps, depth, &high)) /* high part */
return False;
- *nttime = (((uint64_t)high << 32) + low);
+ if (UNMARSHALLING(ps)) {
+ *nttime = (((uint64_t)high << 32) + low);
+ }
return True;
}
svn commit: samba r18597 - in branches/SAMBA_3_0/source/lib: .
Author: vlendec Date: 2006-09-17 20:05:09 + (Sun, 17 Sep 2006) New Revision: 18597 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18597 Log: A C++ warning Modified: branches/SAMBA_3_0/source/lib/time.c Changeset: Modified: branches/SAMBA_3_0/source/lib/time.c === --- branches/SAMBA_3_0/source/lib/time.c2006-09-17 20:01:56 UTC (rev 18596) +++ branches/SAMBA_3_0/source/lib/time.c2006-09-17 20:05:09 UTC (rev 18597) @@ -270,7 +270,7 @@ x2 = ((x&0x)<<16) | ((x&0x)>>16); SIVAL(&x,0,x2); - return pull_dos_date((void *)&x, zone_offset); + return pull_dos_date((const uint8_t *)&x, zone_offset); } /**
svn commit: samba r18596 - in branches/SAMBA_4_0/source/lib/ldb/tools: .
Author: tridge
Date: 2006-09-17 20:01:56 + (Sun, 17 Sep 2006)
New Revision: 18596
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18596
Log:
removed superfluous semicolon
Modified:
branches/SAMBA_4_0/source/lib/ldb/tools/ad2oLschema.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/tools/ad2oLschema.c
===
--- branches/SAMBA_4_0/source/lib/ldb/tools/ad2oLschema.c 2006-09-17
20:01:15 UTC (rev 18595)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/ad2oLschema.c 2006-09-17
20:01:56 UTC (rev 18596)
@@ -63,7 +63,7 @@
printf("\n");
printf("Converts records from an AD-like LDIF schema into an openLdap
formatted schema\n\n");
exit(1);
-};
+}
static int fetch_attrs_schema(struct ldb_context *ldb, struct ldb_dn *schemadn,
TALLOC_CTX *mem_ctx,
svn commit: samba r18595 - in branches/SAMBA_4_0/source/script/tests: .
Author: tridge
Date: 2006-09-17 20:01:15 + (Sun, 17 Sep 2006)
New Revision: 18595
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18595
Log:
try an experiment of adding a RPC test into the windows testing
framework
Brad, I know this is a bit hackish. We really need a "testit" like
function like in test_functions.sh
Modified:
branches/SAMBA_4_0/source/script/tests/test_win.sh
Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/test_win.sh
===
--- branches/SAMBA_4_0/source/script/tests/test_win.sh 2006-09-17 19:17:41 UTC
(rev 18594)
+++ branches/SAMBA_4_0/source/script/tests/test_win.sh 2006-09-17 20:01:15 UTC
(rev 18595)
@@ -30,13 +30,22 @@
# Run the smbtorture test.
run_win_server_test()
{
- echo -e "\nRunning smbtorture RAW-QFILEINFO test."
+winfailed=0
+ echo -e "\nRunning smbtorture tests."
+ echo -e "\nRunning RAW-QFILEINFO"
$SMBTORTURE_BIN_PATH \
-U $SMBTORTURE_USERNAME%$SMBTORTURE_PASSWORD \
-d 10 -W $SMBTORTURE_WORKGROUP \
//$SMBTORTURE_REMOTE_HOST/$SMBTORTURE_REMOTE_SHARE_NAME \
- RAW-QFILEINFO
- err_rtn=$?
+ RAW-QFILEINFO || winfailed=`expr $winfailed + 1`
+
+ echo -e "\nRunning RPC-WINREG"
+ $SMBTORTURE_BIN_PATH \
+ -U $SMBTORTURE_USERNAME%$SMBTORTURE_PASSWORD \
+ -W $SMBTORTURE_WORKGROUP \
+ ncacn_np:$SMBTORTURE_REMOTE_HOST \
+ RPC-WINREG || winfailed=`expr $winfailed + 1`
+ err_rtn=$winfailed
}
# Clean up the windows environment after the test has run or failed.
svn commit: samba r18594 - in branches/SAMBA_4_0/source/lib: replace talloc tdb
Author: tridge Date: 2006-09-17 19:17:41 + (Sun, 17 Sep 2006) New Revision: 18594 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18594 Log: fail the configure step if the required library is not found for tdb, talloc or libreplace Modified: branches/SAMBA_4_0/source/lib/replace/libreplace.m4 branches/SAMBA_4_0/source/lib/talloc/libtalloc.m4 branches/SAMBA_4_0/source/lib/tdb/libtdb.m4 Changeset: Modified: branches/SAMBA_4_0/source/lib/replace/libreplace.m4 === --- branches/SAMBA_4_0/source/lib/replace/libreplace.m4 2006-09-17 05:11:57 UTC (rev 18593) +++ branches/SAMBA_4_0/source/lib/replace/libreplace.m4 2006-09-17 19:17:41 UTC (rev 18594) @@ -5,13 +5,17 @@ dnl find the libreplace sources. This is meant to work both for dnl libreplace standalone builds, and builds of packages using libreplace libreplacedir="" -for d in "$srcdir" "$srcdir/lib/replace" "$srcdir/libreplace" "$srcdir/../libreplace" "$srcdir/../replace"; do +libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace" +for d in $libreplacepaths; do if test -f "$d/replace.c"; then libreplacedir="$d" AC_SUBST(libreplacedir) break; fi done +if [ x"$libreplacedir" = "x" ]; then + AC_MSG_ERROR([cannot find libreplace in $libreplacepaths]) +fi LIBREPLACEOBJ="replace.o" AC_SUBST(LIBREPLACEOBJ) Modified: branches/SAMBA_4_0/source/lib/talloc/libtalloc.m4 === --- branches/SAMBA_4_0/source/lib/talloc/libtalloc.m4 2006-09-17 05:11:57 UTC (rev 18593) +++ branches/SAMBA_4_0/source/lib/talloc/libtalloc.m4 2006-09-17 19:17:41 UTC (rev 18594) @@ -1,13 +1,17 @@ dnl find the talloc sources. This is meant to work both for dnl talloc standalone builds, and builds of packages using talloc tallocdir="" -for d in "$srcdir" "$srcdir/lib/talloc" "$srcdir/talloc" "$srcdir/../talloc"; do +tallocpaths="$srcdir $srcdir/lib/talloc $srcdir/talloc $srcdir/../talloc" +for d in $tallocpaths; do if test -f "$d/talloc.c"; then tallocdir="$d" AC_SUBST(tallocdir) break; fi done +if [ x"$tallocdir" = "x" ]; then + AC_MSG_ERROR([cannot find talloc source in $tallocpaths]) +fi TALLOCOBJ="talloc.o" AC_SUBST(TALLOCOBJ) Modified: branches/SAMBA_4_0/source/lib/tdb/libtdb.m4 === --- branches/SAMBA_4_0/source/lib/tdb/libtdb.m4 2006-09-17 05:11:57 UTC (rev 18593) +++ branches/SAMBA_4_0/source/lib/tdb/libtdb.m4 2006-09-17 19:17:41 UTC (rev 18594) @@ -1,13 +1,17 @@ dnl find the tdb sources. This is meant to work both for dnl tdb standalone builds, and builds of packages using tdb tdbdir="" -for d in "$srcdir" "$srcdir/lib/tdb" "$srcdir/tdb" "$srcdir/../tdb"; do +tdbpaths="$srcdir $srcdir/lib/tdb $srcdir/tdb $srcdir/../tdb" +for d in $tdbpaths; do if test -f "$d/common/tdb.c"; then tdbdir="$d" AC_SUBST(tdbdir) break; fi done +if [ x"$tdbdir" = "x" ]; then + AC_MSG_ERROR([cannot find tdb source in $tdbpaths]) +fi TDBOBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o" TDBOBJ="$TDBOBJ common/freelist.o common/io.o common/lock.o common/open.o" AC_SUBST(TDBOBJ)
