svn commit: samba r19879 - in branches/SAMBA_4_0/source: .

[jelmer]

Author: jelmer
Date: 2006-11-24 16:21:23 + (Fri, 24 Nov 2006)
New Revision: 19879

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=19879

Log:
Make test targets depend on libraries (might be required for the pidl tests)

Modified:
   branches/SAMBA_4_0/source/main.mk


Changeset:
Modified: branches/SAMBA_4_0/source/main.mk
===
--- branches/SAMBA_4_0/source/main.mk   2006-11-24 16:08:57 UTC (rev 19878)
+++ branches/SAMBA_4_0/source/main.mk   2006-11-24 16:21:23 UTC (rev 19879)
@@ -285,16 +285,16 @@
 
 test: $(DEFAULT_TEST_TARGET)
 
-test-swrap: all
+test-swrap: all libraries
$(srcdir)/script/tests/selftest.sh ${selftest_prefix} all SOCKET_WRAPPER
 
-test-noswrap: all
+test-noswrap: all libraries
$(srcdir)/script/tests/selftest.sh ${selftest_prefix} all
 
 quicktest: all
$(srcdir)/script/tests/selftest.sh ${selftest_prefix} quick 
SOCKET_WRAPPER
 
-testenv: all
+testenv: all libraries
$(srcdir)/script/tests/selftest.sh ${selftest_prefix} xterm 
SOCKET_WRAPPER
 
 valgrindtest: valgrindtest-quick
@@ -304,12 +304,12 @@
VALGRIND=valgrind -q --num-callers=30 
--log-file=${selftest_prefix}/valgrind.log \
$(srcdir)/script/tests/selftest.sh ${selftest_prefix} quick 
SOCKET_WRAPPER
 
-valgrindtest-all: all
+valgrindtest-all: all libraries
SMBD_VALGRIND=xterm -n smbd -e valgrind -q --db-attach=yes 
--num-callers=30 \
VALGRIND=valgrind -q --num-callers=30 
--log-file=${selftest_prefix}/valgrind.log \
$(srcdir)/script/tests/selftest.sh ${selftest_prefix} all SOCKET_WRAPPER
 
-valgrindtest-env: all
+valgrindtest-env: all libraries
SMBD_VALGRIND=xterm -n smbd -e valgrind -q --db-attach=yes 
--num-callers=30 \
VALGRIND=valgrind -q --num-callers=30 
--log-file=${selftest_prefix}/valgrind.log \
$(srcdir)/script/tests/selftest.sh ${selftest_prefix} xterm 
SOCKET_WRAPPER
@@ -320,7 +320,7 @@
SMBD_VALGRIND=xterm -n smbd -e gdb --args  \
$(srcdir)/script/tests/selftest.sh ${selftest_prefix} quick 
SOCKET_WRAPPER
 
-gdbtest-all: all
+gdbtest-all: all libraries
SMBD_VALGRIND=xterm -n smbd -e gdb --args  \
$(srcdir)/script/tests/selftest.sh ${selftest_prefix} all SOCKET_WRAPPER
 

svn commit: samba r19880 - in branches/SAMBA_4_0/source/script: .

[jelmer]

Author: jelmer
Date: 2006-11-24 16:31:42 + (Fri, 24 Nov 2006)
New Revision: 19880

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=19880

Log:
Eliminate duplicates in the output.

Modified:
   branches/SAMBA_4_0/source/script/pkg-config


Changeset:
Modified: branches/SAMBA_4_0/source/script/pkg-config
===
--- branches/SAMBA_4_0/source/script/pkg-config 2006-11-24 16:21:23 UTC (rev 
19879)
+++ branches/SAMBA_4_0/source/script/pkg-config 2006-11-24 16:31:42 UTC (rev 
19880)
@@ -124,7 +124,21 @@
push (@out, Cflags($pkg)) if ($opt_cflags);
 }
 
+sub nub
+{
+   my @list = @_;
+   my @ret = ();
+   my %seen = ();
+   foreach (@list) {
+   next if (defined($seen{$_}));
+   push (@ret, $_);
+   $seen{$_} = 1;
+   }
+   return @ret;
+}
+
 if ($#out = 0) {
+   @out = nub(@out);
print join(' ', @out) . \n;
 }
 

svn commit: samba r19881 - in branches/SAMBA_4_0/source/build/smb_build: .

[jelmer]

Author: jelmer
Date: 2006-11-24 16:45:42 + (Fri, 24 Nov 2006)
New Revision: 19881

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=19881

Log:
Add private library flags when linking to static libraries.

Modified:
   branches/SAMBA_4_0/source/build/smb_build/env.pm
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/env.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/env.pm2006-11-24 16:31:42 UTC 
(rev 19880)
+++ branches/SAMBA_4_0/source/build/smb_build/env.pm2006-11-24 16:45:42 UTC 
(rev 19881)
@@ -53,9 +53,9 @@
$self-{automatic_deps} = ($self-{config}-{automatic_dependencies} eq 
yes);
 }
 
-sub PkgConfig($$$)
+sub PkgConfig()
 {
-   my 
($self,$path,$name,$libs,$cflags,$version,$desc,$hasmodules,$pubdep,$privdep,$dirs)
 = @_;
+   my 
($self,$path,$name,$libs,$privlibs,$cflags,$version,$desc,$hasmodules,$pubdep,$privdep,$dirs)
 = @_;
 
print __FILE__.: creating $path\n;
 
@@ -83,6 +83,7 @@
print OUT Requires.private: $privdep\n if defined($privdep);
print OUT Version: $version\n;
print OUT Libs: $libs\n;
+   print OUT Libs.private: $privlibs\n if (defined($privlibs));
print OUT Cflags: -I\${includedir} $cflags\n;
 
close(OUT);

Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm   2006-11-24 
16:31:42 UTC (rev 19880)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm   2006-11-24 
16:45:42 UTC (rev 19881)
@@ -411,6 +411,7 @@
 
my $pubs;
my $privs;
+   my $privlibs;
 
if (defined($ctx-{PUBLIC_DEPENDENCIES})) {
foreach (@{$ctx-{PUBLIC_DEPENDENCIES}}) {
@@ -425,12 +426,17 @@
 
if (defined($ctx-{PRIVATE_DEPENDENCIES})) {
foreach (@{$ctx-{PRIVATE_DEPENDENCIES}}) {
-   next unless ($other-{$_}-{TYPE} eq LIBRARY);
+   if ($other-{$_}-{TYPE} eq LIBRARY) {
+   s/^LIB//g;
+   $_ = lc($_);
 
-   s/^LIB//g;
-   $_ = lc($_);
+   $privs .= $_ ;
+   } else {
+   s/^LIB//g;
+   $_ = lc($_);
 
-   $privs .= $_ ;
+   $privlibs .= -l$_ ;
+   }
}
}
 
@@ -438,6 +444,7 @@
$path,
$link_name,
-L\${libdir} -l$link_name,
+   $privlibs,
,
$ctx-{VERSION},
$ctx-{DESCRIPTION},
@@ -455,6 +462,7 @@
bin/pkgconfig/$link_name-uninstalled.pc,
$link_name,
-Lbin/shared -Lbin/static -l$link_name,
+   $privlibs,
-I. -Iinclude -Ilib -Ilib/replace,
$ctx-{VERSION},
$ctx-{DESCRIPTION},

svn commit: samba r19882 - in branches/SAMBA_4_0/source/build/smb_build: .

[jelmer]

Author: jelmer
Date: 2006-11-24 17:05:04 + (Fri, 24 Nov 2006)
New Revision: 19882

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=19882

Log:
Fix static link flags in pkg-config files. Should allow running 
pidl tests on systems without shared libs.

Modified:
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm   2006-11-24 
16:45:42 UTC (rev 19881)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm   2006-11-24 
17:05:04 UTC (rev 19882)
@@ -415,17 +415,24 @@
 
if (defined($ctx-{PUBLIC_DEPENDENCIES})) {
foreach (@{$ctx-{PUBLIC_DEPENDENCIES}}) {
-   next unless ($other-{$_}-{TYPE} eq LIBRARY);
+   next if ($other-{$_}-{ENABLE} eq NO);
+   if ($other-{$_}-{TYPE} eq LIBRARY) {
+   s/^LIB//g;
+   $_ = lc($_);
 
-   s/^LIB//g;
-   $_ = lc($_);
+   $pubs .= $_ ;
+   } else {
+   s/^LIB//g;
+   $_ = lc($_);
 
-   $pubs .= $_ ;
+   $privlibs .= -l$_ ;
+   }
}
}
 
if (defined($ctx-{PRIVATE_DEPENDENCIES})) {
foreach (@{$ctx-{PRIVATE_DEPENDENCIES}}) {
+   next if ($other-{$_}-{ENABLE} eq NO);
if ($other-{$_}-{TYPE} eq LIBRARY) {
s/^LIB//g;
$_ = lc($_);

svn commit: samba r19908 - in branches/SAMBA_4_0/source/build/smb_build: .

[jelmer]

Author: jelmer
Date: 2006-11-26 16:06:11 + (Sun, 26 Nov 2006)
New Revision: 19908

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=19908

Log:
Fix order of paths in pc files.

Modified:
   branches/SAMBA_4_0/source/build/smb_build/env.pm
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/env.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/env.pm2006-11-26 06:04:35 UTC 
(rev 19907)
+++ branches/SAMBA_4_0/source/build/smb_build/env.pm2006-11-26 16:06:11 UTC 
(rev 19908)
@@ -66,8 +66,8 @@
mkpath(dirname($path),0,0755);
open(OUT, $path) or die(Can't open $path: $!);
 
-   foreach (keys %$dirs) {
-   print OUT $_= . $dirs-{$_} . \n;
+   foreach (@$dirs) {
+   print OUT $_\n;
}
if ($hasmodules) {
print OUT modulesdir=$self-{config}-{modulesdir}/$name\n ;

Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm   2006-11-26 
06:04:35 UTC (rev 19907)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm   2006-11-26 
16:06:11 UTC (rev 19908)
@@ -458,12 +458,12 @@
defined($ctx-{INIT_FUNCTIONS}),
$pubs,
$privs,
-   {
-   prefix = $self-{config}-{prefix},
-   exec_prefix = $self-{config}-{exec_prefix},
-   libdir = $self-{config}-{libdir},
-   includedir = $self-{config}-{includedir}
-   }
+   [
+   prefix=$self-{config}-{prefix},
+   exec_prefix=$self-{config}-{exec_prefix},
+   libdir=$self-{config}-{libdir},
+   includedir=$self-{config}-{includedir}
+   ]
); 
smb_build::env::PkgConfig($self,
bin/pkgconfig/$link_name-uninstalled.pc,
@@ -476,10 +476,10 @@
defined($ctx-{INIT_FUNCTIONS}),
$pubs,
$privs,
-   {
-   prefix = bin/,
-   includedir = $ctx-{BASEDIR}
-   }
+   [
+   prefix=bin/,
+   includedir=$ctx-{BASEDIR}
+   ]
); 
 }
 

svn commit: samba r20298 - in branches/SAMBA_4_0/source: build/smb_build include pidl/tests

[jelmer]

Author: jelmer
Date: 2006-12-21 01:51:35 + (Thu, 21 Dec 2006)
New Revision: 20298

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20298

Log:
Fix pidl tests (missing symlink..).

Modified:
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/build/smb_build/output.pm
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/pidl/tests/Util.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm   2006-12-21 
00:53:38 UTC (rev 20297)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm   2006-12-21 
01:51:35 UTC (rev 20298)
@@ -264,22 +264,24 @@
}
 
my $soarg = ;
-   my $soargdebug = ;
+   my $lns = ;
if ($self-{config}-{SONAMEFLAG} ne  and 
defined($ctx-{LIBRARY_SONAME})) {
$soarg = $self-{config}-{SONAMEFLAG}$ctx-{LIBRARY_SONAME} ;
if ($ctx-{LIBRARY_REALNAME} ne $ctx-{LIBRARY_SONAME}) {
-   $soargdebug = [EMAIL PROTECTED] -fs 
$ctx-{LIBRARY_REALNAME} $ctx-{SHAREDDIR}/$ctx-{LIBRARY_SONAME};
+   $lns .= [EMAIL PROTECTED] -fs $ctx-{LIBRARY_REALNAME} 
$ctx-{SHAREDDIR}/$ctx-{LIBRARY_SONAME};
}
}
 
-   my $singlesoarg = ;
-
if ($self-{config}-{SONAMEFLAG} ne  and 
defined($ctx-{LIBRARY_SONAME}) and 
$ctx-{LIBRARY_REALNAME} ne $ctx-{LIBRARY_SONAME}) {
-   $singlesoarg = [EMAIL PROTECTED] -fs $ctx-{LIBRARY_REALNAME} 
$ctx-{SHAREDDIR}/$ctx-{LIBRARY_SONAME};
+   $lns .= [EMAIL PROTECTED] -fs $ctx-{LIBRARY_REALNAME} 
$ctx-{SHAREDDIR}/$ctx-{LIBRARY_SONAME};
}
 
+   if (defined($ctx-{LIBRARY_SONAME})) {
+   $lns .= [EMAIL PROTECTED] -fs $ctx-{LIBRARY_REALNAME} 
$ctx-{SHAREDDIR}/$ctx-{LIBRARY_DEBUGNAME};
+   }
+
$self-output( __EOD__
 #
 
@@ -290,7 +292,7 @@
\$($ctx-{TYPE}_$ctx-{NAME}\_FULL_OBJ_LIST) \\
\$($ctx-{TYPE}_$ctx-{NAME}_LINK_FLAGS) $extraflags \\
 $soarg \\
-   $init_obj $singlesoarg$soargdebug
+   $init_obj $lns
 __EOD__
 );
 

Modified: branches/SAMBA_4_0/source/build/smb_build/output.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/output.pm 2006-12-21 00:53:38 UTC 
(rev 20297)
+++ branches/SAMBA_4_0/source/build/smb_build/output.pm 2006-12-21 01:51:35 UTC 
(rev 20298)
@@ -65,6 +65,8 @@
}
}
 
+   $lib-{LIBRARY_DEBUGNAME} = $lib-{LIBRARY_REALNAME};
+
if (defined($lib-{VERSION})) {
$lib-{LIBRARY_SONAME} = 
$lib-{LIBRARY_REALNAME}.$lib-{SO_VERSION};
$lib-{LIBRARY_REALNAME} = 
$lib-{LIBRARY_REALNAME}.$lib-{VERSION};

Modified: branches/SAMBA_4_0/source/include/includes.h
===
--- branches/SAMBA_4_0/source/include/includes.h2006-12-21 00:53:38 UTC 
(rev 20297)
+++ branches/SAMBA_4_0/source/include/includes.h2006-12-21 01:51:35 UTC 
(rev 20298)
@@ -77,7 +77,9 @@
 #include system/time.h
 #include system/wait.h
 
+#ifndef _PRINTF_ATTRIBUTE
 #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
+#endif
 
 /* Lists, trees, caching, database... */
 #include talloc/talloc.h

Modified: branches/SAMBA_4_0/source/pidl/tests/Util.pm
===
--- branches/SAMBA_4_0/source/pidl/tests/Util.pm2006-12-21 00:53:38 UTC 
(rev 20297)
+++ branches/SAMBA_4_0/source/pidl/tests/Util.pm2006-12-21 01:51:35 UTC 
(rev 20298)
@@ -46,9 +46,9 @@
$outfile = test-$name;
}
 
-   my $cflags = `pkg-config --libs --cflags ndr`;
+   my $flags = `pkg-config --libs --cflags ndr samba-config`;
 
-   open CC, |cc -x c - -o $outfile $cflags;
+   open CC, |cc -x c - -o $outfile $flags;
print CC #define uint_t unsigned int\n;
print CC #define _GNU_SOURCE\n;
print CC #include stdint.h\n;

svn commit: samba r20299 - in branches/SAMBA_4_0/source/pidl/tests: .

[jelmer]

Author: jelmer
Date: 2006-12-21 02:48:46 + (Thu, 21 Dec 2006)
New Revision: 20299

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20299

Log:
Disable two new tests that are apparently broken.

Modified:
   branches/SAMBA_4_0/source/pidl/tests/Util.pm
   branches/SAMBA_4_0/source/pidl/tests/ndr_fullptr.pl
   branches/SAMBA_4_0/source/pidl/tests/ndr_string.pl


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/tests/Util.pm
===
--- branches/SAMBA_4_0/source/pidl/tests/Util.pm2006-12-21 01:51:35 UTC 
(rev 20298)
+++ branches/SAMBA_4_0/source/pidl/tests/Util.pm2006-12-21 02:48:46 UTC 
(rev 20299)
@@ -43,7 +43,7 @@
if (defined($test_data_prefix)) {
$outfile = $test_data_prefix/test-$name;  
} else {
-   $outfile = test-$name;
+   $outfile = ./test-$name;
}
 
my $flags = `pkg-config --libs --cflags ndr samba-config`;
@@ -74,7 +74,7 @@
 
ok(-f $outfile, ($name) compile);
 
-   my $ret = system(./$outfile, ())  8;
+   my $ret = system($outfile, ())  8;
print # return code: $ret\n if ($ret != 0);
 
ok($ret == 0, ($name) run);

Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_fullptr.pl
===
--- branches/SAMBA_4_0/source/pidl/tests/ndr_fullptr.pl 2006-12-21 01:51:35 UTC 
(rev 20298)
+++ branches/SAMBA_4_0/source/pidl/tests/ndr_fullptr.pl 2006-12-21 02:48:46 UTC 
(rev 20299)
@@ -10,6 +10,9 @@
 use lib $RealBin;
 use Util qw(test_samba4_ndr);
 
+SKIP: {
+   skip full pointers not supported yet, 8;
+
 test_samba4_ndr(fullptr-push-dup, 
 '  
[public] uint16 echo_TestFull([in,ptr] uint32 *x, [in,ptr] uint32 *y);
@@ -39,3 +42,4 @@
return 3;
}
 ');
+}

Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_string.pl
===
--- branches/SAMBA_4_0/source/pidl/tests/ndr_string.pl  2006-12-21 01:51:35 UTC 
(rev 20298)
+++ branches/SAMBA_4_0/source/pidl/tests/ndr_string.pl  2006-12-21 02:48:46 UTC 
(rev 20299)
@@ -54,9 +54,12 @@
return 4;
 ');
 
+SKIP: {
+   skip doesn't seem to work yet, 8;
+
 test_samba4_ndr(string-out, 
 '
-   [public] void TestString([out,string] uint8 **data);
+   [public] void TestString([out,string,charset(UNIX)] uint8 **data);
 ',
 '
uint8_t data[] = { 0x03, 0x00, 0x00, 0x00, 
@@ -77,8 +80,9 @@
return 3;
 
if (strncmp(r.out.data, foo, 3) != 0)
-   return 3;
+   return 4;
 
if (r.out.data[4] != 0)
-   return 4;
+   return 5;
 ');
+}

svn commit: samba r20300 - in branches/SAMBA_4_0/source/librpc: .

[jelmer]

Author: jelmer
Date: 2006-12-21 03:39:33 + (Thu, 21 Dec 2006)
New Revision: 20300

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20300

Log:
Trim number of shared libs significantly.

Modified:
   branches/SAMBA_4_0/source/librpc/config.mk


Changeset:
Sorry, the patch is too large (607 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20300

svn commit: samba-docs r1011 - in tags: .

[jelmer]

Author: jelmer
Date: 2006-12-30 04:45:00 + (Sat, 30 Dec 2006)
New Revision: 1011

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=1011

Log:
Create tag again, this time from correct trunk.

Added:
   tags/release-3-0-21rc2/


Changeset:
Copied: tags/release-3-0-21rc2 (from rev 880, trunk)

svn commit: samba r20509 - in branches/SAMBA_4_0/source/script: .

[jelmer]

Author: jelmer
Date: 2007-01-03 13:24:24 + (Wed, 03 Jan 2007)
New Revision: 20509

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20509

Log:
Warn about the fact that no tests have been run rather than showing division by 
zero errors.

Modified:
   branches/SAMBA_4_0/source/script/subunit-summary


Changeset:
Modified: branches/SAMBA_4_0/source/script/subunit-summary
===
--- branches/SAMBA_4_0/source/script/subunit-summary2007-01-03 12:02:44 UTC 
(rev 20508)
+++ branches/SAMBA_4_0/source/script/subunit-summary2007-01-03 13:24:24 UTC 
(rev 20509)
@@ -57,6 +57,11 @@
 
 print \n if ($opt_progress);
 
+if ($numtests == 0) {
+print No tests run\n;
+exit(0);
+}
+
 printf(%d%%: %d tests, %d succeeded, %d failed, %d skipped\n, 
($numsuccess / $numtests * 100),
   $numtests,

svn commit: samba r20511 - in branches/SAMBA_4_0/source/pidl/lib/Parse: . Pidl Pidl/Samba3 Pidl/Samba4 Pidl/Wireshark

[jelmer]

Author: jelmer
Date: 2007-01-03 15:34:01 + (Wed, 03 Jan 2007)
New Revision: 20511

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20511

Log:
Combine warnings/errors/fatal functions and move them to Parse::Pidl.

Modified:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Compat.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/TDR.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm


Changeset:
Sorry, the patch is too large (506 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20511

svn commit: samba r20543 - in branches/SAMBA_4_0/source/pidl: lib/Parse/Pidl tests

[jelmer]

Author: jelmer
Date: 2007-01-05 12:56:15 + (Fri, 05 Jan 2007)
New Revision: 20543

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20543

Log:
Merge some pidl bug fixes:
 * C expressions that just started with a constant were erroneously flagged 
   as being a constant.
 * 1-length variable names in expressions were broken.

Added:
   branches/SAMBA_4_0/source/pidl/tests/util.pl
Modified:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Util.pm


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Util.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Util.pm   2007-01-05 
11:31:28 UTC (rev 20542)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Util.pm   2007-01-05 
12:56:15 UTC (rev 20543)
@@ -26,12 +26,9 @@
 # see if a pidl property list contains a given property
 sub has_property($$)
 {
-   my($e) = shift;
-   my($p) = shift;
+   my($e, $p) = @_;
 
-   if (!defined $e-{PROPERTIES}) {
-   return undef;
-   }
+   return undef if (not defined($e-{PROPERTIES}));
 
return $e-{PROPERTIES}-{$p};
 }
@@ -40,9 +37,7 @@
 # see if a pidl property matches a value
 sub property_matches($$$)
 {
-   my($e) = shift;
-   my($p) = shift;
-   my($v) = shift;
+   my($e,$p,$v) = @_;
 
if (!defined has_property($e, $p)) {
return undef;
@@ -59,7 +54,7 @@
 sub is_constant($)
 {
my $s = shift;
-   if (defined $s  $s =~ /^\d/) {
+   if (defined $s  $s =~ /^\d$/) {
return 1;
}
return 0;
@@ -72,7 +67,7 @@
if (substr($str, 0, 1) eq \) {
return $str;
}
-   return \ . $str . \;
+   return \$str\;
 }
 
 sub print_uuid($)
@@ -80,6 +75,7 @@
my ($uuid) = @_;
$uuid =~ s///g;
my ($time_low,$time_mid,$time_hi,$clock_seq,$node) = split /-/, $uuid;
+   return undef if not defined($node);
 
my @clock_seq = $clock_seq =~ /(..)/g;
my @node = $node =~ /(..)/g;
@@ -106,7 +102,7 @@
 
die(Undefined value in ParseExpr) if not defined($expr);
 
-   my @tokens = split /((?:[A-Za-z_])(?:(?:(?:[A-Za-z0-9_.])|(?:-))+))/, 
$expr;
+   my @tokens = split /((?:[A-Za-z_])(?:(?:(?:[A-Za-z0-9_.])|(?:-))+)?)/, 
$expr;
my $ret = ;
 
foreach my $t (@tokens) {

Added: branches/SAMBA_4_0/source/pidl/tests/util.pl
===
--- branches/SAMBA_4_0/source/pidl/tests/util.pl2007-01-05 11:31:28 UTC 
(rev 20542)
+++ branches/SAMBA_4_0/source/pidl/tests/util.pl2007-01-05 12:56:15 UTC 
(rev 20543)
@@ -0,0 +1,55 @@
+#!/usr/bin/perl
+# (C) 2007 Jelmer Vernooij [EMAIL PROTECTED]
+# Published under the GNU General Public License
+use strict;
+
+use Test::More tests = 25;
+use FindBin qw($RealBin);
+use lib $RealBin/../lib;
+use Parse::Pidl::Util;
+
+# has_property()
+is(undef, has_property({}, foo));
+is(undef, has_property({PROPERTIES = {}}, foo));
+is(data, has_property({PROPERTIES = {foo = data}}, foo));
+is(undef, has_property({PROPERTIES = {foo = undef}}, foo));
+
+# is_constant()
+ok(is_constant(2));
+ok(not is_constant(str));
+ok(not is_constant(2 * expr));
+
+# make_str()
+is(\bla\, make_str(bla));
+is(\bla\, make_str(\bla\));
+is(\\bla\\, make_str(\\bla\\));
+is(\bla\\, make_str(bla\));
+is(\foo\bar\, make_str(foo\bar));
+
+# print_uuid()
+is(undef, print_uuid(invalid));
+is({0x12345778,0x1234,0xabcd,{0xef,0x00},{0x01,0x23,0x45,0x67,0x89,0xac}}, 
+   print_uuid(12345778-1234-abcd-ef00-0123456789ac));
+is({0x12345778,0x1234,0xabcd,{0xef,0x00},{0x01,0x23,0x45,0x67,0x89,0xac}}, 
+   print_uuid(\12345778-1234-abcd-ef00-0123456789ac\));
+
+# property_matches()
+# missing property
+ok(not property_matches({PROPERTIES = {}}, x, data));
+# data not matching
+ok(not property_matches({PROPERTIES = {x = bar}}, x, data));
+# data matching exactly
+ok(property_matches({PROPERTIES = {x = data}}, x, data));
+# regex matching
+ok(property_matches({PROPERTIES = {x = data}}, x, ^([dat]+)\$));
+
+# ParseExpr()
+is(, ParseExpr(, {}));
+is(a, ParseExpr(a, {b = 2}));
+is(2, ParseExpr(a, {a = 2}));
+is(2*2, ParseExpr(a*a, {a = 2}));
+is(r-length+r-length, 
+   ParseExpr(length+length, {length = r-length}));
+is(2/2*(r-length), 
+   ParseExpr(constant/constant*(len), {constant = 2, 
+ len = r-length}));


Property changes on: branches/SAMBA_4_0/source/pidl/tests/util.pl
___
Name: svn:executable
   + *

svn commit: samba r20545 - in branches/SAMBA_4_0/source/pidl: lib/Parse/Pidl tests

[jelmer]

Author: jelmer
Date: 2007-01-05 14:25:21 + (Fri, 05 Jan 2007)
New Revision: 20545

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20545

Log:
Fix is_constant().

Modified:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Util.pm
   branches/SAMBA_4_0/source/pidl/tests/util.pl


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Util.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Util.pm   2007-01-05 
13:13:15 UTC (rev 20544)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Util.pm   2007-01-05 
14:25:21 UTC (rev 20545)
@@ -54,9 +54,8 @@
 sub is_constant($)
 {
my $s = shift;
-   if (defined $s  $s =~ /^\d$/) {
-   return 1;
-   }
+   return 1 if (defined $s  $s =~ /^\d+$/);
+   return 1 if (defined $s  $s =~ /^0x[0-9A-Fa-f]+$/);
return 0;
 }
 

Modified: branches/SAMBA_4_0/source/pidl/tests/util.pl
===
--- branches/SAMBA_4_0/source/pidl/tests/util.pl2007-01-05 13:13:15 UTC 
(rev 20544)
+++ branches/SAMBA_4_0/source/pidl/tests/util.pl2007-01-05 14:25:21 UTC 
(rev 20545)
@@ -3,7 +3,7 @@
 # Published under the GNU General Public License
 use strict;
 
-use Test::More tests = 25;
+use Test::More tests = 29;
 use FindBin qw($RealBin);
 use lib $RealBin/../lib;
 use Parse::Pidl::Util;
@@ -16,6 +16,10 @@
 
 # is_constant()
 ok(is_constant(2));
+ok(is_constant(256));
+ok(is_constant(0x400));
+ok(is_constant(0x4BC));
+ok(not is_constant(0x4BGC));
 ok(not is_constant(str));
 ok(not is_constant(2 * expr));
 

svn commit: samba r20547 - in branches/SAMBA_4_0/source/pidl: lib/Parse tests

[jelmer]

Author: jelmer
Date: 2007-01-05 14:55:26 + (Fri, 05 Jan 2007)
New Revision: 20547

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20547

Log:
Add tests for expected errors/warnings.

Added:
   branches/SAMBA_4_0/source/pidl/tests/ndr_compat.pl
   branches/SAMBA_4_0/source/pidl/tests/test_util.pl
Modified:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl.pm
   branches/SAMBA_4_0/source/pidl/tests/Util.pm


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl.pm2007-01-05 14:52:10 UTC 
(rev 20546)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl.pm2007-01-05 14:55:26 UTC 
(rev 20547)
@@ -9,7 +9,7 @@
 
 require Exporter;
 @ISA = qw(Exporter);
[EMAIL PROTECTED] = qw(warning error fatal);
[EMAIL PROTECTED] = qw(warning error fatal);
 
 use strict;
 

Modified: branches/SAMBA_4_0/source/pidl/tests/Util.pm
===
--- branches/SAMBA_4_0/source/pidl/tests/Util.pm2007-01-05 14:52:10 UTC 
(rev 20546)
+++ branches/SAMBA_4_0/source/pidl/tests/Util.pm2007-01-05 14:55:26 UTC 
(rev 20547)
@@ -6,10 +6,28 @@
 
 require Exporter;
 @ISA = qw(Exporter);
[EMAIL PROTECTED] = qw(test_samba4_ndr);
[EMAIL PROTECTED] = qw(test_samba4_ndr test_warnings test_errors);
 
 use strict;
 
+use FindBin qw($RealBin);
+use lib $RealBin/../lib;
+
+use Parse::Pidl;
+my $warnings = ;
+sub Parse::Pidl::warning($$) 
+{ 
+   my ($e, $l) = @_;
+   $warnings .= $e-{FILE}:$e-{LINE}: $l\n;
+};
+
+my $errors = ;
+sub Parse::Pidl::error($$) 
+{ 
+   my ($e, $l) = @_;
+   $errors .= $e-{FILE}:$e-{LINE}: $l\n;
+};
+
 use Test::More;
 use Parse::Pidl::IDL;
 use Parse::Pidl::NDR;
@@ -84,4 +102,25 @@
}
 }
 
+sub test_warnings($$)
+{
+   my ($exp, $code) = @_;
+
+   $warnings = ;
+
+   $code-();
+
+   is($warnings, $exp);
+}
+
+
+sub test_errors($$)
+{
+   my ($exp, $code) = @_;
+   $errors = ;
+   $code-();
+
+   is($errors, $exp);
+}
+
 1;

Added: branches/SAMBA_4_0/source/pidl/tests/ndr_compat.pl
===
--- branches/SAMBA_4_0/source/pidl/tests/ndr_compat.pl  2007-01-05 14:52:10 UTC 
(rev 20546)
+++ branches/SAMBA_4_0/source/pidl/tests/ndr_compat.pl  2007-01-05 14:55:26 UTC 
(rev 20547)
@@ -0,0 +1,27 @@
+#!/usr/bin/perl
+# (C) 2007 Jelmer Vernooij [EMAIL PROTECTED]
+# Published under the GNU General Public License
+use strict;
+
+use Test::More tests = 3;
+use FindBin qw($RealBin);
+use lib $RealBin;
+use Util; 
+use Parse::Pidl;
+use Parse::Pidl::IDL;
+
+sub parse_idl($) 
+{
+   my $idl = shift;
+   my $pidl = Parse::Pidl::IDL::parse_string(interface echo { $idl }; , 
nofile);
+   Parse::Pidl::NDR::Parse($pidl);
+}
+
+test_warnings(, sub {parse_idl(void x();); });
+test_warnings(nofile:0: top-level [out] pointer `x' is not a [ref] 
pointer\n, sub {parse_idl(void x([out,unique] int *x);); });
+
+test_warnings(nofile:0: pointer_default_top() is a pidl extension and should 
not be used\n, sub {
+   my $pidl = 
Parse::Pidl::IDL::parse_string([pointer_default_top(unique)] interface echo { 
void x(); }; , nofile);
+   Parse::Pidl::NDR::Parse($pidl);
+});
+


Property changes on: branches/SAMBA_4_0/source/pidl/tests/ndr_compat.pl
___
Name: svn:executable
   + *

Added: branches/SAMBA_4_0/source/pidl/tests/test_util.pl
===
--- branches/SAMBA_4_0/source/pidl/tests/test_util.pl   2007-01-05 14:52:10 UTC 
(rev 20546)
+++ branches/SAMBA_4_0/source/pidl/tests/test_util.pl   2007-01-05 14:55:26 UTC 
(rev 20547)
@@ -0,0 +1,22 @@
+#!/usr/bin/perl
+# (C) 2007 Jelmer Vernooij [EMAIL PROTECTED]
+# Published under the GNU General Public License
+use strict;
+
+use Test::More tests = 6;
+use FindBin qw($RealBin);
+use lib $RealBin/../lib;
+use lib $RealBin;
+use Util qw(test_warnings test_errors);
+use Parse::Pidl qw(warning error);
+
+test_warnings(, sub {});
+
+test_warnings(x:1: msg\n, sub { warning({FILE = x, LINE = 1}, msg); });
+test_warnings(, sub {});
+
+test_errors(, sub {});
+
+test_errors(x:1: msg\n, sub { error({FILE = x, LINE = 1}, msg); });
+test_errors(, sub {});
+


Property changes on: branches/SAMBA_4_0/source/pidl/tests/test_util.pl
___
Name: svn:executable
   + *

svn commit: samba r20548 - in branches/SAMBA_4_0/source/pidl: lib/Parse tests

[jelmer]

Author: jelmer
Date: 2007-01-05 15:03:21 + (Fri, 05 Jan 2007)
New Revision: 20548

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20548

Log:
Remove unnecessary use lib, fix warnings.

Modified:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl.pm
   branches/SAMBA_4_0/source/pidl/tests/Util.pm
   branches/SAMBA_4_0/source/pidl/tests/ndr_align.pl
   branches/SAMBA_4_0/source/pidl/tests/ndr_alloc.pl
   branches/SAMBA_4_0/source/pidl/tests/ndr_array.pl
   branches/SAMBA_4_0/source/pidl/tests/ndr_fullptr.pl
   branches/SAMBA_4_0/source/pidl/tests/ndr_refptr.pl
   branches/SAMBA_4_0/source/pidl/tests/ndr_represent.pl
   branches/SAMBA_4_0/source/pidl/tests/ndr_simple.pl
   branches/SAMBA_4_0/source/pidl/tests/ndr_string.pl
   branches/SAMBA_4_0/source/pidl/tests/ndr_tagtype.pl
   branches/SAMBA_4_0/source/pidl/tests/test_util.pl


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl.pm2007-01-05 14:55:26 UTC 
(rev 20547)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl.pm2007-01-05 15:03:21 UTC 
(rev 20548)
@@ -17,13 +17,13 @@
 
 $VERSION = '0.02';
 
-sub warning($$)
+sub warning
 {
my ($l,$m) = @_;
print STDERR $l-{FILE}:$l-{LINE}: warning: $m\n;
 }
 
-sub error($$)
+sub error
 {
my ($l,$m) = @_;
print STDERR $l-{FILE}:$l-{LINE}: error: $m\n;

Modified: branches/SAMBA_4_0/source/pidl/tests/Util.pm
===
--- branches/SAMBA_4_0/source/pidl/tests/Util.pm2007-01-05 14:55:26 UTC 
(rev 20547)
+++ branches/SAMBA_4_0/source/pidl/tests/Util.pm2007-01-05 15:03:21 UTC 
(rev 20548)
@@ -15,15 +15,15 @@
 
 use Parse::Pidl;
 my $warnings = ;
-sub Parse::Pidl::warning($$) 
-{ 
+undef Parse::Pidl::warning;
+*Parse::Pidl::warning = sub { 
my ($e, $l) = @_;
$warnings .= $e-{FILE}:$e-{LINE}: $l\n;
 };
 
 my $errors = ;
-sub Parse::Pidl::error($$) 
-{ 
+undef Parse::Pidl::error;
+*Parse::Pidl::error = sub { 
my ($e, $l) = @_;
$errors .= $e-{FILE}:$e-{LINE}: $l\n;
 };

Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_align.pl
===
--- branches/SAMBA_4_0/source/pidl/tests/ndr_align.pl   2007-01-05 14:55:26 UTC 
(rev 20547)
+++ branches/SAMBA_4_0/source/pidl/tests/ndr_align.pl   2007-01-05 15:03:21 UTC 
(rev 20548)
@@ -5,7 +5,6 @@
 
 use Test::More tests = 5 * 8;
 use FindBin qw($RealBin);
-use lib $RealBin/../lib;
 use lib $RealBin;
 use Util qw(test_samba4_ndr);
 

Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_alloc.pl
===
--- branches/SAMBA_4_0/source/pidl/tests/ndr_alloc.pl   2007-01-05 14:55:26 UTC 
(rev 20547)
+++ branches/SAMBA_4_0/source/pidl/tests/ndr_alloc.pl   2007-01-05 15:03:21 UTC 
(rev 20548)
@@ -5,7 +5,6 @@
 
 use Test::More tests = 5 * 8;
 use FindBin qw($RealBin);
-use lib $RealBin/../lib;
 use lib $RealBin;
 use Util qw(test_samba4_ndr);
 

Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_array.pl
===
--- branches/SAMBA_4_0/source/pidl/tests/ndr_array.pl   2007-01-05 14:55:26 UTC 
(rev 20547)
+++ branches/SAMBA_4_0/source/pidl/tests/ndr_array.pl   2007-01-05 15:03:21 UTC 
(rev 20548)
@@ -6,7 +6,6 @@
 
 use Test::More tests = 8;
 use FindBin qw($RealBin);
-use lib $RealBin/../lib;
 use lib $RealBin;
 use Util qw(test_samba4_ndr);
 

Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_fullptr.pl
===
--- branches/SAMBA_4_0/source/pidl/tests/ndr_fullptr.pl 2007-01-05 14:55:26 UTC 
(rev 20547)
+++ branches/SAMBA_4_0/source/pidl/tests/ndr_fullptr.pl 2007-01-05 15:03:21 UTC 
(rev 20548)
@@ -6,7 +6,6 @@
 
 use Test::More tests = 1 * 8;
 use FindBin qw($RealBin);
-use lib $RealBin/../lib;
 use lib $RealBin;
 use Util qw(test_samba4_ndr);
 

Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_refptr.pl
===
--- branches/SAMBA_4_0/source/pidl/tests/ndr_refptr.pl  2007-01-05 14:55:26 UTC 
(rev 20547)
+++ branches/SAMBA_4_0/source/pidl/tests/ndr_refptr.pl  2007-01-05 15:03:21 UTC 
(rev 20548)
@@ -7,7 +7,6 @@
 
 use Test::More tests = 22 * 8;
 use FindBin qw($RealBin);
-use lib $RealBin/../lib;
 use lib $RealBin;
 use Util qw(test_samba4_ndr);
 

Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_represent.pl
===
--- branches/SAMBA_4_0/source/pidl/tests/ndr_represent.pl   2007-01-05 
14:55:26 UTC (rev 20547)
+++ branches/SAMBA_4_0/source/pidl/tests/ndr_represent.pl   2007-01-05 
15:03:21 UTC (rev 20548)
@@ -5,7 +5,6 @@
 
 use Test::More tests = 1 * 8;
 use FindBin qw($RealBin);
-use lib $RealBin/../lib;
 use lib $RealBin;
 use

svn commit: samba r20550 - in branches/SAMBA_4_0/source/pidl: . lib/Parse/Pidl tests

[jelmer]

Author: jelmer
Date: 2007-01-05 15:20:23 + (Fri, 05 Jan 2007)
New Revision: 20550

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20550

Log:
Use standard error mechanism in parser. 
Make sure errors are reported correctly.

Modified:
   branches/SAMBA_4_0/source/pidl/idl.yp
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/IDL.pm
   branches/SAMBA_4_0/source/pidl/tests/parse_idl.pl


Changeset:
Sorry, the patch is too large (1031 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20550

svn commit: samba r20556 - in branches/SAMBA_4_0/source/pidl/tests: .

[jelmer]

Author: jelmer
Date: 2007-01-05 17:18:22 + (Fri, 05 Jan 2007)
New Revision: 20556

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20556

Log:
Add more tests to make sure nothing breaks when I replace the ParseExpr code.

Modified:
   branches/SAMBA_4_0/source/pidl/tests/util.pl


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/tests/util.pl
===
--- branches/SAMBA_4_0/source/pidl/tests/util.pl2007-01-05 16:26:16 UTC 
(rev 20555)
+++ branches/SAMBA_4_0/source/pidl/tests/util.pl2007-01-05 17:18:22 UTC 
(rev 20556)
@@ -3,7 +3,7 @@
 # Published under the GNU General Public License
 use strict;
 
-use Test::More tests = 29;
+use Test::More tests = 41;
 use FindBin qw($RealBin);
 use lib $RealBin/../lib;
 use Parse::Pidl::Util;
@@ -57,3 +57,21 @@
 is(2/2*(r-length), 
ParseExpr(constant/constant*(len), {constant = 2, 
  len = r-length}));
+is(2+2-r-length, 
+   ParseExpr(constant+constant-len, {constant = 2, 
+ len = r-length}));
+is(*r-length, ParseExpr(*len, { len = r-length}));
+is(**r-length, ParseExpr(**len, { len = r-length}));
+is(r-length2, ParseExpr(len2, { len = r-length}));
+is(r-length, ParseExpr(len, { len = r-length}));
+is(strlen(\data\), ParseExpr(strlen(foo), { foo = \data\}));
+is(strlen(\data\, 4), ParseExpr(strlen(foo, 4), { foo = \data\}));
+is(foo / bar, ParseExpr(foo / bar, { bla = \data\}));
+is(r-length%2, ParseExpr(len%2, { len = r-length}));
+is(r-length==2, ParseExpr(len==2, { len = r-length}));
+is(r-length!=2, ParseExpr(len!=2, { len = r-length}));
+is(pr-length, ParseExpr(pr-length, { p = r}));
+TODO: {
+   todo_skip 1, Broken at the moment;
+   is(r-length, ParseExpr(p-length, { p = r}));
+}

svn commit: samba r20561 - in branches/SAMBA_4_0/source/pidl: . lib/Parse/Pidl

[jelmer]

Author: jelmer
Date: 2007-01-05 20:12:21 + (Fri, 05 Jan 2007)
New Revision: 20561

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20561

Log:
Add parser for subexpressions used in IDL attributes.

Added:
   branches/SAMBA_4_0/source/pidl/expr.yp
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Expr.pm


Changeset:
Sorry, the patch is too large (1484 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20561

svn commit: samba r20562 - in branches/SAMBA_4_0/source: . pidl pidl/lib/Parse pidl/lib/Parse/Yapp

[jelmer]

Author: jelmer
Date: 2007-01-05 20:13:48 + (Fri, 05 Jan 2007)
New Revision: 20562

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20562

Log:
Start building expr parser. Add separate copy of Yapp::Driver 
rather than including it in each individual parser.

Added:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Yapp/
   branches/SAMBA_4_0/source/pidl/lib/Parse/Yapp/Driver.pm
Modified:
   branches/SAMBA_4_0/source/main.mk
   branches/SAMBA_4_0/source/pidl/Makefile.PL


Changeset:
Sorry, the patch is too large (530 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20562

svn commit: samba r20563 - in branches/SAMBA_4_0/source/pidl: lib/Parse/Pidl tests

[jelmer]

Author: jelmer
Date: 2007-01-05 20:18:33 + (Fri, 05 Jan 2007)
New Revision: 20563

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20563

Log:
Start using the new parser in ParseExpr(). It's now trivial to use this 
to check for NULL pointers when pointers are being dereferenced (#4218).

There are exactly 500 tests for pidl now :-)

Modified:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/IDL.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Util.pm
   branches/SAMBA_4_0/source/pidl/tests/util.pl


Changeset:
Sorry, the patch is too large (606 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20563

svn commit: samba r20566 - in branches/SAMBA_4_0/source/librpc/idl: .

[jelmer]

Author: jelmer
Date: 2007-01-05 20:51:19 + (Fri, 05 Jan 2007)
New Revision: 20566

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20566

Log:
Prepending with r- is no longer necessary.

Modified:
   branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl
   branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
   branches/SAMBA_4_0/source/librpc/idl/epmapper.idl
   branches/SAMBA_4_0/source/librpc/idl/initshutdown.idl
   branches/SAMBA_4_0/source/librpc/idl/krb5pac.idl
   branches/SAMBA_4_0/source/librpc/idl/nbt.idl


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl   2007-01-05 20:31:24 UTC 
(rev 20565)
+++ branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl   2007-01-05 20:51:19 UTC 
(rev 20566)
@@ -159,7 +159,7 @@
NTTIME time;
uint32 u2;
uint32 u3;
-   [value(ndr_size_ldapControlDirSyncExtra(r-extra, 
r-extra.data.uptodateness_vector.count, 0))] 
+   [value(ndr_size_ldapControlDirSyncExtra(extra, 
extra.data.uptodateness_vector.count, 0))] 
uint32 extra_length;
drsuapi_DsReplicaHighWaterMark highwatermark;
GUID guid1;

Modified: branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl2007-01-05 20:31:24 UTC 
(rev 20565)
+++ branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl2007-01-05 20:51:19 UTC 
(rev 20566)
@@ -127,7 +127,7 @@
/* Function 0x02 */
typedef [public,gensize] struct {
[value(ndr_size_drsuapi_DsReplicaObjectIdentifier(r, 
ndr-flags)-4)] uint32 __ndr_size;
-   [value(ndr_size_dom_sid28(r-sid, ndr-flags))]  uint32 
__ndr_size_sid;
+   [value(ndr_size_dom_sid28(sid, ndr-flags))]  uint32 
__ndr_size_sid;
GUID guid;
dom_sid28 sid;
[flag(STR_SIZE4|STR_CHARLEN|STR_CONFORMANT)] string dn;
@@ -327,7 +327,7 @@
 * 2.5.5.17 = dom_sid
 */
typedef [nopush,nopull] struct {
-   [range(0,1),value(ndr_size_drsuapi_DsReplicaOID_oid(r-oid, 
0))] uint32 __ndr_size;
+   [range(0,1),value(ndr_size_drsuapi_DsReplicaOID_oid(oid, 
0))] uint32 __ndr_size;
[size_is(__ndr_size),charset(DOS)] uint8 *oid; /* it's encoded 
with asn1_write_OID_String() */
} drsuapi_DsReplicaOID;
 
@@ -436,7 +436,7 @@
 
/* Generic DATA_BLOB values */
typedef struct {
-   [range(0,10485760),value(ndr_size_DATA_BLOB(0,r-blob,0))] 
uint32 __ndr_size;
+   [range(0,10485760),value(ndr_size_DATA_BLOB(0,blob,0))] uint32 
__ndr_size;
DATA_BLOB *blob;
} drsuapi_DsAttributeValue;
 
@@ -448,7 +448,7 @@
/* DN String values */
typedef [public,gensize] struct {
[value(ndr_size_drsuapi_DsReplicaObjectIdentifier3(r, 
ndr-flags))] uint32 __ndr_size;
-   [value(ndr_size_dom_sid28(r-sid,ndr-flags))]  uint32 
__ndr_size_sid;
+   [value(ndr_size_dom_sid28(sid,ndr-flags))]  uint32 
__ndr_size_sid;
GUID guid;
dom_sid28 sid;
[flag(STR_SIZE4|STR_CHARLEN)] string dn;
@@ -456,11 +456,11 @@
 
typedef [public,gensize] struct {
[value(ndr_size_drsuapi_DsReplicaObjectIdentifier3Binary(r, 
ndr-flags))] uint32 __ndr_size;
-   [value(ndr_size_dom_sid28(r-sid,ndr-flags))]  uint32 
__ndr_size_sid;
+   [value(ndr_size_dom_sid28(sid,ndr-flags))]  uint32 
__ndr_size_sid;
GUID guid;
dom_sid28 sid;
[flag(STR_SIZE4|STR_CHARLEN)] string dn;
-   [value(r-binary.length + 4)] uint32 __ndr_size_binary;
+   [value(binary.length + 4)] uint32 __ndr_size_binary;
[flag(NDR_REMAINING)] DATA_BLOB binary;
} drsuapi_DsReplicaObjectIdentifier3Binary;
 
@@ -557,7 +557,7 @@
typedef struct {
uint32 decompressed_length;
uint32 compressed_length;
-   [subcontext(4),subcontext_size(r-compressed_length),
+   [subcontext(4),subcontext_size(compressed_length),
 
compression(NDR_COMPRESSION_MSZIP,compressed_length,decompressed_length)]
 drsuapi_DsGetNCChangesCtr1 *ctr1;
} drsuapi_DsGetNCChangesMSZIPCtr1;
@@ -565,7 +565,7 @@
typedef struct {
uint32 decompressed_length;
uint32 compressed_length;
-   [subcontext(4),subcontext_size(r-compressed_length),
+   [subcontext(4),subcontext_size(compressed_length),
 
compression(NDR_COMPRESSION_MSZIP,compressed_length,decompressed_length)]
 drsuapi_DsGetNCChangesCtr6 *ctr6

svn commit: samba r20567 - in branches/SAMBA_4_0/source/pidl: . lib/Parse/Pidl lib/Parse/Pidl/Samba3 lib/Parse/Pidl/Samba4 lib/Parse/Pidl/Samba4/NDR lib/Parse/Pidl/Wireshark tests

[jelmer]

Author: jelmer
Date: 2007-01-05 20:52:12 + (Fri, 05 Jan 2007)
New Revision: 20567

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20567

Log:
Print proper errors with filename and line numbers in ParseExpr()

Modified:
   branches/SAMBA_4_0/source/pidl/expr.yp
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Expr.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/TDR.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Util.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
   branches/SAMBA_4_0/source/pidl/tests/util.pl


Changeset:
Sorry, the patch is too large (809 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20567

svn commit: samba r20571 - in branches/SAMBA_4_0/source/pidl/tests: .

[jelmer]

Author: jelmer
Date: 2007-01-05 21:26:28 + (Fri, 05 Jan 2007)
New Revision: 20571

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20571

Log:
fix '' case
Modified:
   branches/SAMBA_4_0/source/pidl/tests/util.pl


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/tests/util.pl
===
--- branches/SAMBA_4_0/source/pidl/tests/util.pl2007-01-05 21:22:15 UTC 
(rev 20570)
+++ branches/SAMBA_4_0/source/pidl/tests/util.pl2007-01-05 21:26:28 UTC 
(rev 20571)
@@ -3,7 +3,7 @@
 # Published under the GNU General Public License
 use strict;
 
-use Test::More tests = 55;
+use Test::More tests = 56;
 use FindBin qw($RealBin);
 use lib $RealBin;
 use Util;
@@ -49,7 +49,7 @@
 ok(property_matches({PROPERTIES = {x = data}}, x, ^([dat]+)\$));
 
 # ParseExpr()
-#is(, ParseExpr(, {}));
+is(undef, ParseExpr(, {}, undef));
 is(a, ParseExpr(a, {b = 2}, undef));
 is(2, ParseExpr(a, {a = 2}, undef));
 is(2 * 2, ParseExpr(a*a, {a = 2}, undef));

svn commit: samba r20616 - in branches/SAMBA_4_0: .

[jelmer]

Author: jelmer
Date: 2007-01-08 17:28:14 + (Mon, 08 Jan 2007)
New Revision: 20616

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20616

Log:
Point at the wiki
Modified:
   branches/SAMBA_4_0/howto.txt


Changeset:
Modified: branches/SAMBA_4_0/howto.txt
===
--- branches/SAMBA_4_0/howto.txt2007-01-08 16:57:34 UTC (rev 20615)
+++ branches/SAMBA_4_0/howto.txt2007-01-08 17:28:14 UTC (rev 20616)
@@ -4,6 +4,9 @@
 [EMAIL PROTECTED], December 2004
 
 
+A more up to date version of this howto can be found in the wiki 
+at http://wiki.samba.org/index.php/Samba4/HOWTO.
+
 This is a very basic document on how to setup a simple Samba4
 server. This is aimed at developers who are already familiar with
 Samba3 and wish to participate in Samba4 development. This is not

svn commit: samba r20625 - in branches/SAMBA_4_0/source/pidl: . lib/Parse/Pidl tests

[jelmer]

Author: jelmer
Date: 2007-01-09 06:02:41 + (Tue, 09 Jan 2007)
New Revision: 20625

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20625

Log:
Fix couple of warnings.

Modified:
   branches/SAMBA_4_0/source/pidl/expr.yp
   branches/SAMBA_4_0/source/pidl/idl.yp
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Expr.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/IDL.pm
   branches/SAMBA_4_0/source/pidl/tests/Util.pm
   branches/SAMBA_4_0/source/pidl/tests/util.pl


Changeset:
Sorry, the patch is too large (1626 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20625

svn commit: samba r20631 - in branches/SAMBA_4_0/source/pidl: lib/Parse/Pidl tests

[jelmer]

Author: jelmer
Date: 2007-01-09 15:50:36 + (Tue, 09 Jan 2007)
New Revision: 20631

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20631

Log:
Add some tests for the ndr parser.

Added:
   branches/SAMBA_4_0/source/pidl/tests/ndr.pl
Modified:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Util.pm


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm2007-01-09 
13:24:33 UTC (rev 20630)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm2007-01-09 
15:50:36 UTC (rev 20631)
@@ -35,6 +35,7 @@
 $VERSION = '0.01';
 @ISA = qw(Exporter);
 @EXPORT = qw(GetPrevLevel GetNextLevel ContainsDeferred ContainsString);
[EMAIL PROTECTED] = qw(GetElementLevelTable ParseElement);
 
 use strict;
 use Parse::Pidl qw(warning fatal);
@@ -837,7 +838,7 @@
return unless defined $e-{PROPERTIES};
 
foreach my $key (keys %{$e-{PROPERTIES}}) {
-   fatal($e, el_name($e) . : unknown property '$key')
+   warning($e, el_name($e) . : unknown property '$key')
unless defined($property_list{$key});
 
fatal($e, el_name($e) . : property '$key' not allowed on '$t')

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Util.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Util.pm   2007-01-09 
13:24:33 UTC (rev 20630)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Util.pm   2007-01-09 
15:50:36 UTC (rev 20631)
@@ -6,7 +6,7 @@
 
 require Exporter;
 @ISA = qw(Exporter);
[EMAIL PROTECTED] = qw(has_property property_matches ParseExpr is_constant 
make_str print_uuid);
[EMAIL PROTECTED] = qw(has_property property_matches ParseExpr is_constant 
make_str print_uuid MyDumper);
 use vars qw($VERSION);
 $VERSION = '0.01';
 

Added: branches/SAMBA_4_0/source/pidl/tests/ndr.pl
===
--- branches/SAMBA_4_0/source/pidl/tests/ndr.pl 2007-01-09 13:24:33 UTC (rev 
20630)
+++ branches/SAMBA_4_0/source/pidl/tests/ndr.pl 2007-01-09 15:50:36 UTC (rev 
20631)
@@ -0,0 +1,154 @@
+#!/usr/bin/perl
+# (C) 2007 Jelmer Vernooij [EMAIL PROTECTED]
+# Published under the GNU General Public License
+use strict;
+use warnings;
+
+use Test::More tests = 9;
+use FindBin qw($RealBin);
+use lib $RealBin;
+use Util;
+use Parse::Pidl::Util qw(MyDumper);
+use Parse::Pidl::NDR qw(GetElementLevelTable ParseElement);
+
+# Case 1
+
+my $e = {
+   'FILE' = 'foo.idl',
+   'NAME' = 'v',
+   'PROPERTIES' = {},
+   'POINTERS' = 0,
+   'TYPE' = 'uint8',
+   'LINE' = 42 };
+
+is_deeply(GetElementLevelTable($e), [
+   {
+   'IS_DEFERRED' = 0,
+   'LEVEL_INDEX' = 0,
+   'DATA_TYPE' = 'uint8',
+   'CONVERT_FROM' = undef,
+   'CONTAINS_DEFERRED' = 0,
+   'TYPE' = 'DATA',
+   'IS_SURROUNDING' = 0,
+   'CONVERT_TO' = undef
+   }
+]);
+
+my $ne = ParseElement($e);
+is($ne-{ORIGINAL}, $e);
+is($ne-{NAME}, v);
+is($ne-{ALIGN}, 1);
+is($ne-{TYPE}, uint8);
+is_deeply($ne-{LEVELS},  [
+   {
+   'IS_DEFERRED' = 0,
+   'LEVEL_INDEX' = 0,
+   'DATA_TYPE' = 'uint8',
+   'CONVERT_FROM' = undef,
+   'CONTAINS_DEFERRED' = 0,
+   'TYPE' = 'DATA',
+   'IS_SURROUNDING' = 0,
+   'CONVERT_TO' = undef
+   }
+]);
+
+# Case 2 : pointers
+#
+$e = {
+   'FILE' = 'foo.idl',
+   'NAME' = 'v',
+   'PROPERTIES' = {},
+   'POINTERS' = 1,
+   'TYPE' = 'uint8',
+   'LINE' = 42 };
+
+is_deeply(GetElementLevelTable($e), [
+   {
+   LEVEL_INDEX = 0,
+   IS_DEFERRED = 0,
+   TYPE = 'POINTER',
+   POINTER_TYPE = undef,
+   POINTER_INDEX = 0,
+   LEVEL = 'EMBEDDED'
+   },
+   {
+   'IS_DEFERRED' = 1,
+   'LEVEL_INDEX' = 1,
+   'DATA_TYPE' = 'uint8',
+   'CONVERT_FROM' = undef,
+   'CONTAINS_DEFERRED' = 0,
+   'TYPE' = 'DATA',
+   'IS_SURROUNDING' = 0,
+   'CONVERT_TO' = undef
+   }
+]);
+
+# Case 3 : double pointers
+#
+$e = {
+   'FILE' = 'foo.idl',
+   'NAME' = 'v',
+   'PROPERTIES' = {},
+   'POINTERS' = 2,
+   'TYPE' = 'uint8',
+   'LINE' = 42 };
+
+is_deeply(GetElementLevelTable($e), [
+   {
+   LEVEL_INDEX = 0,
+   IS_DEFERRED = 0,
+   TYPE = 'POINTER',
+   POINTER_TYPE = undef,
+   POINTER_INDEX = 0,
+   LEVEL = 'EMBEDDED'
+   },
+   {
+   LEVEL_INDEX = 1,
+   IS_DEFERRED = 1

svn commit: samba r20633 - in branches/SAMBA_4_0/source/pidl/tests: .

[jelmer]

Author: jelmer
Date: 2007-01-09 15:54:36 + (Tue, 09 Jan 2007)
New Revision: 20633

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20633

Log:
Add another test, fix warnings.

Modified:
   branches/SAMBA_4_0/source/pidl/tests/ndr.pl


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/tests/ndr.pl
===
--- branches/SAMBA_4_0/source/pidl/tests/ndr.pl 2007-01-09 15:50:40 UTC (rev 
20632)
+++ branches/SAMBA_4_0/source/pidl/tests/ndr.pl 2007-01-09 15:54:36 UTC (rev 
20633)
@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 
-use Test::More tests = 9;
+use Test::More tests = 10;
 use FindBin qw($RealBin);
 use lib $RealBin;
 use Util;
@@ -19,6 +19,7 @@
'PROPERTIES' = {},
'POINTERS' = 0,
'TYPE' = 'uint8',
+   'PARENT' = { TYPE = 'STRUCT' },
'LINE' = 42 };
 
 is_deeply(GetElementLevelTable($e), [
@@ -57,8 +58,9 @@
 $e = {
'FILE' = 'foo.idl',
'NAME' = 'v',
-   'PROPERTIES' = {},
+   'PROPERTIES' = {unique = 1},
'POINTERS' = 1,
+   'PARENT' = { TYPE = 'STRUCT' },
'TYPE' = 'uint8',
'LINE' = 42 };
 
@@ -67,7 +69,7 @@
LEVEL_INDEX = 0,
IS_DEFERRED = 0,
TYPE = 'POINTER',
-   POINTER_TYPE = undef,
+   POINTER_TYPE = unique,
POINTER_INDEX = 0,
LEVEL = 'EMBEDDED'
},
@@ -88,9 +90,10 @@
 $e = {
'FILE' = 'foo.idl',
'NAME' = 'v',
-   'PROPERTIES' = {},
+   'PROPERTIES' = {unique = 1},
'POINTERS' = 2,
'TYPE' = 'uint8',
+   'PARENT' = { TYPE = 'STRUCT' },
'LINE' = 42 };
 
 is_deeply(GetElementLevelTable($e), [
@@ -98,7 +101,7 @@
LEVEL_INDEX = 0,
IS_DEFERRED = 0,
TYPE = 'POINTER',
-   POINTER_TYPE = undef,
+   POINTER_TYPE = unique,
POINTER_INDEX = 0,
LEVEL = 'EMBEDDED'
},
@@ -106,7 +109,7 @@
LEVEL_INDEX = 1,
IS_DEFERRED = 1,
TYPE = 'POINTER',
-   POINTER_TYPE = undef,
+   POINTER_TYPE = unique,
POINTER_INDEX = 1,
LEVEL = 'EMBEDDED'
},
@@ -122,7 +125,7 @@
}
 ]);
 
-# Case 2 : ref pointers
+# Case 3 : ref pointers
 #
 $e = {
'FILE' = 'foo.idl',
@@ -130,6 +133,7 @@
'PROPERTIES' = {ref = 1},
'POINTERS' = 1,
'TYPE' = 'uint8',
+   'PARENT' = { TYPE = 'STRUCT' },
'LINE' = 42 };
 
 is_deeply(GetElementLevelTable($e), [
@@ -152,3 +156,36 @@
'CONVERT_TO' = undef
}
 ]);
+
+
+# Case 4 : top-level ref pointers
+#
+$e = {
+   'FILE' = 'foo.idl',
+   'NAME' = 'v',
+   'PROPERTIES' = {ref = 1},
+   'POINTERS' = 1,
+   'TYPE' = 'uint8',
+   'PARENT' = { TYPE = 'FUNCTION' },
+   'LINE' = 42 };
+
+is_deeply(GetElementLevelTable($e), [
+   {
+   LEVEL_INDEX = 0,
+   IS_DEFERRED = 0,
+   TYPE = 'POINTER',
+   POINTER_TYPE = ref,
+   POINTER_INDEX = 0,
+   LEVEL = 'TOP'
+   },
+   {
+   'IS_DEFERRED' = 0,
+   'LEVEL_INDEX' = 1,
+   'DATA_TYPE' = 'uint8',
+   'CONVERT_FROM' = undef,
+   'CONTAINS_DEFERRED' = 0,
+   'TYPE' = 'DATA',
+   'IS_SURROUNDING' = 0,
+   'CONVERT_TO' = undef
+   }
+]);

svn commit: samba r20637 - in branches/SAMBA_4_0/source/pidl: lib/Parse/Pidl lib/Parse/Pidl/Samba4/NDR tests

[jelmer]

Author: jelmer
Date: 2007-01-09 23:41:25 + (Tue, 09 Jan 2007)
New Revision: 20637

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20637

Log:
Don't check for NULL pointers when the pointer is guaranteed to not be NULL 
(if it is a ref pointer).

Added:
   branches/SAMBA_4_0/source/pidl/tests/samba-ndr.pl
Modified:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Util.pm


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm  
2007-01-09 20:04:46 UTC (rev 20636)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm  
2007-01-09 23:41:25 UTC (rev 20637)
@@ -10,12 +10,14 @@
 require Exporter;
 @ISA = qw(Exporter);
 @EXPORT = qw(is_charset_array);
[EMAIL PROTECTED] = qw(check_null_pointer);
 
 use strict;
 use Parse::Pidl::Typelist qw(hasType getType mapType);
-use Parse::Pidl::Util qw(has_property ParseExpr print_uuid);
+use Parse::Pidl::Util qw(has_property ParseExpr ParseExprExt print_uuid);
 use Parse::Pidl::NDR qw(GetPrevLevel GetNextLevel ContainsDeferred);
 use Parse::Pidl::Samba4 qw(is_intree choose_header);
+use Parse::Pidl qw(warning);
 
 use vars qw($VERSION);
 $VERSION = '0.01';
@@ -165,29 +167,6 @@
 }
 
 #
-# check that a variable we get from ParseExpr isn't a null pointer
-sub check_null_pointer($)
-{
-   my $size = shift;
-   if ($size =~ /^\*/) {
-   my $size2 = substr($size, 1);
-   pidl if ($size2 == NULL) return 
NT_STATUS_INVALID_PARAMETER_MIX;;
-   }
-}
-
-#
-# check that a variable we get from ParseExpr isn't a null pointer, 
-# putting the check at the end of the structure/function
-sub check_null_pointer_deferred($)
-{
-   my $size = shift;
-   if ($size =~ /^\*/) {
-   my $size2 = substr($size, 1);
-   defer if ($size2 == NULL) return 
NT_STATUS_INVALID_PARAMETER_MIX;;
-   }
-}
-
-#
 # declare a function public or static, depending on its attributes
 sub fn_declare($$$)
 {
@@ -325,6 +304,61 @@
return $length;
 }
 
+sub check_null_pointer($$$)
+{
+   my ($element, $env, $print_fn) = @_;
+
+   return sub ($) {
+   my $expandedvar = shift;
+   my $check = 0;
+
+   # Figure out the number of pointers in $ptr
+   $expandedvar =~ s/^(\**)//;
+   my $ptr = $1;
+
+   my $var = undef;
+   foreach (keys %$env) {
+   if ($env-{$_} eq $expandedvar) {
+   $var = $_;
+   last;
+   }
+   }
+   
+   if (defined($var)) {
+   my $e;
+   # lookup ptr in $e
+   foreach (@{$element-{PARENT}-{ELEMENTS}}) {
+   if ($_-{NAME} eq $var) {
+   $e = $_;
+   last;
+   }
+   }
+
+   $e or die(Environment doesn't match siblings);
+
+   # See if pointer at pointer level $level
+   # needs to be checked.
+   foreach my $l (@{$e-{LEVELS}}) {
+   if ($l-{TYPE} eq POINTER and 
+   $l-{POINTER_INDEX} == length($ptr)) {
+   # No need to check ref pointers
+   $check = ($l-{POINTER_TYPE} ne ref);
+   last;
+   }
+
+   if ($l-{TYPE} eq DATA) {
+   warning($element, too much 
dereferences for `$var');
+   }
+   }
+   } else {
+   warning($element, unknown dereferenced expression 
`$expandedvar');
+   $check = 1;
+   }
+   
+   $print_fn-(if ($ptr$expandedvar == NULL) return 
NT_STATUS_INVALID_PARAMETER_MIX;) if $check;
+   }
+}
+
 #
 # parse an array - pull side
 sub ParseArrayPullHeader($)
@@ -339,21 +373,19 @@
} elsif ($l-{IS_ZERO_TERMINATED}) { # Noheader arrays
$length = $size = ndr_get_string_size($ndr, 
sizeof(*$var_name));
} else {
-   $length = $size = ParseExpr($l-{SIZE_IS}, $env, $e);
+   $length = $size = ParseExprExt($l

svn commit: samba r20638 - in branches/SAMBA_4_0/source/pidl: lib/Parse/Pidl/Samba4/NDR tests

[jelmer]

Author: jelmer
Date: 2007-01-10 00:37:30 + (Wed, 10 Jan 2007)
New Revision: 20638

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20638

Log:
Check for NULL pointers (where possible) in print functions. Fixes #4218, 
but without reintroducing coverity warnings. 

Modified:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
   branches/SAMBA_4_0/source/pidl/tests/samba-ndr.pl


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm  
2007-01-09 23:41:25 UTC (rev 20637)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm  
2007-01-10 00:37:30 UTC (rev 20638)
@@ -304,9 +304,9 @@
return $length;
 }
 
-sub check_null_pointer($$$)
+sub check_null_pointer()
 {
-   my ($element, $env, $print_fn) = @_;
+   my ($element, $env, $print_fn, $return) = @_;
 
return sub ($) {
my $expandedvar = shift;
@@ -355,7 +355,7 @@
$check = 1;
}

-   $print_fn-(if ($ptr$expandedvar == NULL) return 
NT_STATUS_INVALID_PARAMETER_MIX;) if $check;
+   $print_fn-(if ($ptr$expandedvar == NULL) $return) if $check;
}
 }
 
@@ -374,7 +374,7 @@
$length = $size = ndr_get_string_size($ndr, 
sizeof(*$var_name));
} else {
$length = $size = ParseExprExt($l-{SIZE_IS}, $env, $e, 
-  check_null_pointer($e, $env, 
\pidl));
+   check_null_pointer($e, $env, \pidl, return 
NT_STATUS_INVALID_PARAMETER_MIX;));
}
 
if ((!$l-{IS_SURROUNDING}) and $l-{IS_CONFORMANT}) {
@@ -397,7 +397,7 @@
if ($l-{IS_CONFORMANT} and not $l-{IS_ZERO_TERMINATED}) {
defer if ($var_name) {;
defer_indent;
-   my $size = ParseExprExt($l-{SIZE_IS}, $env, $e, 
check_null_pointer($e, $env, \defer));
+   my $size = ParseExprExt($l-{SIZE_IS}, $env, $e, 
check_null_pointer($e, $env, \defer, return 
NT_STATUS_INVALID_PARAMETER_MIX;));
defer NDR_CHECK(ndr_check_array_size(ndr, (void*) . 
get_pointer_to($var_name) . , $size));;
defer_deindent;
defer };
@@ -406,7 +406,7 @@
if ($l-{IS_VARYING} and not $l-{IS_ZERO_TERMINATED}) {
defer if ($var_name) {;
defer_indent;
-   my $length = ParseExprExt($l-{LENGTH_IS}, $env, $e, 
check_null_pointer($e, $env, \defer));
+   my $length = ParseExprExt($l-{LENGTH_IS}, $env, $e, 
check_null_pointer($e, $env, \defer, return 
NT_STATUS_INVALID_PARAMETER_MIX;));
defer NDR_CHECK(ndr_check_array_length(ndr, (void*) . 
get_pointer_to($var_name) . , $length));;
defer_deindent;
defer }
@@ -421,18 +421,16 @@
 
 sub compression_alg($$)
 {
-   my ($e,$l) = @_;
-   my $compression = $l-{COMPRESSION};
-   my ($alg, $clen, $dlen) = split(/ /, $compression);
+   my ($e, $l) = @_;
+   my ($alg, $clen, $dlen) = split(/ /, $l-{COMPRESSION});
 
return $alg;
 }
 
 sub compression_clen($$$)
 {
-   my ($e,$l,$env) = @_;
-   my $compression = $l-{COMPRESSION};
-   my ($alg, $clen, $dlen) = split(/ /, $compression);
+   my ($e, $l, $env) = @_;
+   my ($alg, $clen, $dlen) = split(/ /, $l-{COMPRESSION});
 
return ParseExpr($clen, $env, $e);
 }
@@ -440,8 +438,7 @@
 sub compression_dlen($$$)
 {
my ($e,$l,$env) = @_;
-   my $compression = $l-{COMPRESSION};
-   my ($alg, $clen, $dlen) = split(/ /, $compression);
+   my ($alg, $clen, $dlen) = split(/ /, $l-{COMPRESSION});
 
return ParseExpr($dlen, $env, $e);
 }
@@ -504,7 +501,7 @@
 {
my ($e,$l,$ndr,$env) = @_;
my $subndr = _ndr_$e-{NAME};
-   my $subcontext_size = ParseExpr($l-{SUBCONTEXT_SIZE},$env, $e);
+   my $subcontext_size = ParseExpr($l-{SUBCONTEXT_SIZE}, $env, $e);
 
pidl {;
indent;
@@ -522,7 +519,7 @@
 {
my ($e,$l,$ndr,$env) = @_;
my $subndr = _ndr_$e-{NAME};
-   my $subcontext_size = ParseExpr($l-{SUBCONTEXT_SIZE},$env, $e);
+   my $subcontext_size = ParseExpr($l-{SUBCONTEXT_SIZE}, $env, $e);
 
if (defined $l-{COMPRESSION}) {
ParseCompressionPushEnd($e, $l, $subndr, $env);
@@ -537,7 +534,7 @@
 {
my ($e,$l,$ndr,$env) = @_;
my $subndr = _ndr_$e-{NAME};
-   my $subcontext_size = ParseExpr($l-{SUBCONTEXT_SIZE},$env, $e);
+   my $subcontext_size = ParseExpr($l-{SUBCONTEXT_SIZE}, $env, $e);
 
pidl {;
indent;
@@ -555,7 +552,7 @@
 {
my ($e,$l,$ndr,$env) = @_;
my $subndr = _ndr_$e-{NAME};
-   my $subcontext_size = ParseExpr($l-{SUBCONTEXT_SIZE},$env, $e);
+   my $subcontext_size = ParseExpr($l

svn commit: samba r20674 - in branches/SAMBA_3_0/source/librpc/gen_ndr: .

[jelmer]

Author: jelmer
Date: 2007-01-11 01:47:22 + (Thu, 11 Jan 2007)
New Revision: 20674

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20674

Log:
Regenerate NDR parsers after pidl changes. This should fix a couple of 
coverity warnings.

Modified:
   branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_echo.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_initshutdown.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_lsa.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_netlogon.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_srvsvc.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_unixinfo.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_winreg.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_wkssvc.c


Changeset:
Sorry, the patch is too large (788 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20674

svn commit: samba r20675 - in branches/SAMBA_4_0/source/pidl: .

[jelmer]

Author: jelmer
Date: 2007-01-11 02:10:01 + (Thu, 11 Jan 2007)
New Revision: 20675

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20675

Log:
Fix installation.

Modified:
   branches/SAMBA_4_0/source/pidl/MANIFEST
   branches/SAMBA_4_0/source/pidl/Makefile.PL


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/MANIFEST
===
--- branches/SAMBA_4_0/source/pidl/MANIFEST 2007-01-11 01:47:22 UTC (rev 
20674)
+++ branches/SAMBA_4_0/source/pidl/MANIFEST 2007-01-11 02:10:01 UTC (rev 
20675)
@@ -7,6 +7,14 @@
 tests/ndr_align.pl
 tests/ndr_alloc.pl
 tests/ndr_array.pl
+tests/ndr.pl
+tests/samba-ndr.pl
+tests/util.pl
+tests/test_util.pl
+tests/ndr_represent.pl
+tests/ndr_compat.pl
+tests/ndr_fullptr.pl
+tests/ndr_tagtype.pl
 lib/Parse/Pidl/Samba3/Client.pm
 lib/Parse/Pidl/Samba3/ClientNDR.pm
 lib/Parse/Pidl/Samba3/Header.pm

Modified: branches/SAMBA_4_0/source/pidl/Makefile.PL
===
--- branches/SAMBA_4_0/source/pidl/Makefile.PL  2007-01-11 01:47:22 UTC (rev 
20674)
+++ branches/SAMBA_4_0/source/pidl/Makefile.PL  2007-01-11 02:10:01 UTC (rev 
20675)
@@ -3,8 +3,7 @@
 'NAME' = 'Parse::Pidl',
 'VERSION_FROM' = 'lib/Parse/Pidl.pm',
'EXE_FILES' = [ 'pidl' ],
-   'test' = { 'TESTS' = 'tests/*.pl' },
-   'PMLIBDIRS' = [ 'lib/Parse/Pidl']
+   'test' = { 'TESTS' = 'tests/*.pl' }
 );
 
 sub MY::postamble {

svn commit: samba r20676 - in branches/SAMBA_4_0/source: libnet librpc/idl torture/rpc

[jelmer]

Author: jelmer
Date: 2007-01-11 04:12:35 + (Thu, 11 Jan 2007)
New Revision: 20676

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20676

Log:
Add ref pointer to fix warning.

Modified:
   branches/SAMBA_4_0/source/libnet/libnet_become_dc.c
   branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
   branches/SAMBA_4_0/source/torture/rpc/drsuapi.c
   branches/SAMBA_4_0/source/torture/rpc/dssync.c


Changeset:
Modified: branches/SAMBA_4_0/source/libnet/libnet_become_dc.c
===
--- branches/SAMBA_4_0/source/libnet/libnet_become_dc.c 2007-01-11 02:10:01 UTC 
(rev 20675)
+++ branches/SAMBA_4_0/source/libnet/libnet_become_dc.c 2007-01-11 04:12:35 UTC 
(rev 20676)
@@ -1618,13 +1618,15 @@
struct composite_context *c = s-creq;
struct rpc_request *req;
struct drsuapi_DsGetNCChanges *r;
+   int32_t level;
 
r = talloc(s, struct drsuapi_DsGetNCChanges);
if (composite_nomem(r, c)) return;
 
+   r-in.level = level;
r-in.bind_handle   = drsuapi_h-bind_handle;
if (drsuapi_h-remote_info28.supported_extensions  
DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V8) {
-   r-in.level = 8;
+   level   = 8;
r-in.req.req8.destination_dsa_guid = 
partition-destination_dsa_guid;
r-in.req.req8.source_dsa_invocation_id = 
partition-source_dsa_invocation_id;
r-in.req.req8.naming_context   = partition-nc;
@@ -1640,7 +1642,7 @@
r-in.req.req8.mapping_ctr.num_mappings = 0;
r-in.req.req8.mapping_ctr.mappings = NULL;
} else {
-   r-in.level = 5;
+   level   = 5;
r-in.req.req5.destination_dsa_guid = 
partition-destination_dsa_guid;
r-in.req.req5.source_dsa_invocation_id = 
partition-source_dsa_invocation_id;
r-in.req.req5.naming_context   = partition-nc;
@@ -1679,16 +1681,16 @@
return r-out.result;
}
 
-   if (r-out.level == 1) {
+   if (*r-out.level == 1) {
ctr_level = 1;
ctr1 = r-out.ctr.ctr1;
-   } else if (r-out.level == 2) {
+   } else if (*r-out.level == 2) {
ctr_level = 1;
ctr1 = r-out.ctr.ctr2.ctr.mszip1.ctr1;
-   } else if (r-out.level == 6) {
+   } else if (*r-out.level == 6) {
ctr_level = 6;
ctr6 = r-out.ctr.ctr6;
-   } else if (r-out.level == 7 
+   } else if (*r-out.level == 7 
   r-out.ctr.ctr7.level == 6 
   r-out.ctr.ctr7.type == DRSUAPI_COMPRESSION_TYPE_MSZIP) {
ctr_level = 6;

Modified: branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl2007-01-11 02:10:01 UTC 
(rev 20675)
+++ branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl2007-01-11 04:12:35 UTC 
(rev 20676)
@@ -623,9 +623,9 @@
 
WERROR drsuapi_DsGetNCChanges(
[in] policy_handle *bind_handle,
-   [in,out] int32 level,
-   [in,switch_is(level)] drsuapi_DsGetNCChangesRequest req,
-   [out,switch_is(level)] drsuapi_DsGetNCChangesCtr ctr
+   [in,out,ref] int32 *level,
+   [in,switch_is(*level)] drsuapi_DsGetNCChangesRequest req,
+   [out,switch_is(*level)] drsuapi_DsGetNCChangesCtr ctr
);
 
/*/

Modified: branches/SAMBA_4_0/source/torture/rpc/drsuapi.c
===
--- branches/SAMBA_4_0/source/torture/rpc/drsuapi.c 2007-01-11 02:10:01 UTC 
(rev 20675)
+++ branches/SAMBA_4_0/source/torture/rpc/drsuapi.c 2007-01-11 04:12:35 UTC 
(rev 20676)
@@ -569,9 +569,9 @@
array[i].level);
 
r.in.bind_handle= priv-bind_handle;
-   r.in.level  = array[i].level;
+   r.in.level  = array[i].level;
 
-   switch (r.in.level) {
+   switch (*r.in.level) {
case 5:
nc.guid = null_guid;
nc.sid  = null_sid;

Modified: branches/SAMBA_4_0/source/torture/rpc/dssync.c
===
--- branches/SAMBA_4_0/source/torture/rpc/dssync.c  2007-01-11 02:10:01 UTC 
(rev 20675)
+++ branches/SAMBA_4_0/source/torture/rpc/dssync.c  2007-01-11 04:12:35 UTC 
(rev 20676)
@@ -412,9 +412,9 @@
array[i].level);
 
r.in.bind_handle= ctx-new_dc.drsuapi.bind_handle;
-   r.in.level  = array[i].level;
+   r.in.level  = array[i

svn commit: samba r20688 - in branches/SAMBA_4_0/source/pidl: .

[jelmer]

Author: jelmer
Date: 2007-01-11 22:47:29 + (Thu, 11 Jan 2007)
New Revision: 20688

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20688

Log:
Use argv[0] equivalent of perl.
Modified:
   branches/SAMBA_4_0/source/pidl/pidl


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/pidl
===
--- branches/SAMBA_4_0/source/pidl/pidl 2007-01-11 15:41:02 UTC (rev 20687)
+++ branches/SAMBA_4_0/source/pidl/pidl 2007-01-11 22:47:29 UTC (rev 20688)
@@ -391,7 +391,7 @@
 
 
 use strict;
-use FindBin qw($RealBin);
+use FindBin qw($RealBin $Script);
 use lib $RealBin;
 use lib $RealBin/lib;
 use Getopt::Long;
@@ -482,7 +482,7 @@
 Copyright (C) Andrew Tridgell [EMAIL PROTECTED]
 Copyright (C) Jelmer Vernooij [EMAIL PROTECTED]
 
-Usage: pidl [options] [--] idlfile [idlfile...]
+Usage: $Script [options] [--] idlfile [idlfile...]
 
 Generic Options:
  --help  this help page
@@ -770,7 +770,7 @@
 }
 
 if (scalar(@ARGV) == 0) {
-   print pidl: no input files\n;
+   print $Script: no input files\n;
exit(1);
 }
 

svn commit: samba r20693 - in branches/SAMBA_4_0/source/script/tests: .

[jelmer]

Author: jelmer
Date: 2007-01-12 02:33:09 + (Fri, 12 Jan 2007)
New Revision: 20693

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20693

Log:
Add reimplementation of selftest in perl. Once this has been tested 
more properly, I hope to use this as a replacement for the existing 
file.

Added:
   branches/SAMBA_4_0/source/script/tests/selftest.pl


Changeset:
Added: branches/SAMBA_4_0/source/script/tests/selftest.pl
===
--- branches/SAMBA_4_0/source/script/tests/selftest.pl  2007-01-12 02:12:15 UTC 
(rev 20692)
+++ branches/SAMBA_4_0/source/script/tests/selftest.pl  2007-01-12 02:33:09 UTC 
(rev 20693)
@@ -0,0 +1,253 @@
+#!/usr/bin/perl
+# Bootstrap Samba and run a number of tests against it.
+# Copyright (C) 2005-2007 Jelmer Vernooij [EMAIL PROTECTED]
+# Published under the GNU GPL, v3 or later.
+use strict;
+use warnings;
+
+use FindBin qw($RealBin $Script);
+use File::Spec;
+use POSIX;
+use Cwd;
+
+sub slapd_start($$) {
+   my ($conf, $uri) = @_;
+my $oldpath = $ENV{PATH};
+$ENV{PATH} = /usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH};
+   # running slapd in the background means it stays in the same process 
group, so it can be
+   # killed by timelimit
+system(slapd -d0 -f $conf -h $uri );
+$ENV{PATH} = $oldpath;
+return $?  8;
+}
+
+sub smbd_check_or_start($$) 
+{
+   my ($bindir, $test_fifo, $test_log, $socket_wrapper_dir, $max_time, 
$conffile) = @_;
+   return 0 if ( -p $test_fifo );
+
+   if (defined($socket_wrapper_dir)) {
+   if ( -d $socket_wrapper_dir ) {
+   unlink $socket_wrapper_dir/*;
+   } else {
+   mkdir($socket_wrapper_dir);
+   }
+   }
+
+   unlink($test_fifo);
+   system(mkfifo $test_fifo);
+
+   unlink($test_log);
+   
+   my $valgrind = ;
+   if (defined($ENV{SMBD_VALGRIND})) {
+   $valgrind = $ENV{SMBD_VALGRIND};
+   } 
+
+   print STARTING SMBD...;
+   my $pid = fork();
+   if ($pid == 0) {
+   my $ret = system($valgrind $bindir/smbd 
--maximum-runtime=$max_time -s $conffile -M single -i --leak-report-full  
$test_fifo  $test_log);
+   open LOG, $test_log;
+   if ($? == -1) {
+   print LOG Unable to start smbd: $ret: $!\n;
+   print Unable to start smbd: $ret: $!\n;
+   exit 1;
+   }
+   unlink($test_fifo);
+   unlink($socket_wrapper_dir/*) if 
(defined($socket_wrapper_dir) and -d $socket_wrapper_dir);
+   my $exit = $?  8;
+   if ( $ret == 0 ) {
+   print smbd exits with status $exit\n;
+   print LOG smbd exits with status $exit\n;
+   } elsif ( $ret  127 ) {
+   print smbd got signal .($ret  127). and exits with 
$exit!\n;
+   print LOG smbd got signal.($ret  127).  and exits 
with $exit!\n;
+   } else {
+   $ret = $?  8;
+   print smbd failed with status $exit!\n;
+   print LOG smbd failed with status $exit!\n;
+   }
+   close(LOG);
+   exit $exit;
+   }
+   print DONE\n;
+
+   return $pid;
+}
+
+sub teststatus($$) {
+   my ($name, $failed) = @_;
+
+   print TEST STATUS: $failed failures\n;
+   if ($failed  0) {
+print EOF
+
+*** TESTSUITE FAILED ***
+
+EOF
+;
+   }
+   exit $failed;
+}
+
+die(Usage: $Script PREFIX TESTS [SOCKET_WRAPPER]) if ( $#ARGV == -1);
+
+my $prefix = shift;
+my $tests = shift;
+my $socket_wrapper = shift;
+
+my $torture_maxtime = $ENV{TORTURE_MAXTIME};
+unless (defined($torture_maxtime)) {
+   $torture_maxtime = 1200;
+}
+
+# disable rpc validation when using valgrind - its way too slow
+my $valgrind = $ENV{VALGRIND};
+my $validate = undef;
+unless (defined($valgrind)) {
+   $validate = validate;
+}
+
+my $old_pwd = $RealBin/../..;
+my $ldap = (defined($ENV{TEST_LDAP}) and ($ENV{TEST_LDAP} eq yes))?1:0;
+
+$prefix =~ s+//+/+;
+$ENV{PREFIX} = $prefix;
+
+my $srcdir = $RealBin/../..;
+if (defined($ENV{srcdir})) {
+   $srcdir = $ENV{srcdir};
+}
+$ENV{SRCDIR} = $srcdir;
+
+my $bindir = $srcdir/bin;
+my $setupdir = $srcdir/setup;
+my $testsdir = $srcdir/script/tests;
+
+my $tls_enabled = 0;
+if ($tests eq all) {
+   $tls_enabled = 1;
+}
+
+$ENV{TLS_ENABLED} = ($tls_enabled?yes:no);
+$ENV{LD_LDB_MODULE_PATH} = $old_pwd/bin/modules/ldb;
+$ENV{LD_SAMBA_MODULE_PATH} = $old_pwd/bin/modules;
+if (defined($ENV{LD_LIBRARY_PATH})) {
+   $ENV{LD_LIBRARY_PATH} = $old_pwd/bin/shared:$ENV{LD_LIBRARY_PATH};
+} else {
+   $ENV{LD_LIBRARY_PATH} = $old_pwd/bin/shared;
+}
+$ENV{PKG_CONFIG_PATH} = $old_pwd/bin/pkgconfig:$ENV{PKG_CONFIG_PATH};
+$ENV{PATH

svn commit: samba r20696 - in branches/SAMBA_4_0/source/script/tests: .

[jelmer]

Author: jelmer
Date: 2007-01-12 03:00:47 + (Fri, 12 Jan 2007)
New Revision: 20696

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20696

Log:
Print mktestsetup errors to stderr rather than to either stderr or stdout.
Instead, print variables for the setup created to mktestsetup's stdout.

Modified:
   branches/SAMBA_4_0/source/script/tests/mktestsetup.sh
   branches/SAMBA_4_0/source/script/tests/selftest.sh


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/mktestsetup.sh
===
--- branches/SAMBA_4_0/source/script/tests/mktestsetup.sh   2007-01-12 
02:58:01 UTC (rev 20695)
+++ branches/SAMBA_4_0/source/script/tests/mktestsetup.sh   2007-01-12 
03:00:47 UTC (rev 20696)
@@ -392,7 +392,7 @@
 PROVISION_OPTIONS=$PROVISION_OPTIONS --quiet --domain $DOMAIN --realm $REALM
 PROVISION_OPTIONS=$PROVISION_OPTIONS --adminpass $PASSWORD --root=$ROOT
 PROVISION_OPTIONS=$PROVISION_OPTIONS --simple-bind-dn=cn=Manager,$BASEDN 
--password=$PASSWORD --root=$ROOT
-$srcdir/bin/smbscript $srcdir/setup/provision $PROVISION_OPTIONS
+$srcdir/bin/smbscript $srcdir/setup/provision $PROVISION_OPTIONS 2
 
 LDAPI=ldapi://$LDAPDIR/ldapi
 LDAPI_ESCAPE=ldapi://`echo $LDAPDIR/ldapi | sed 's|/|%2F|g'`
@@ -400,9 +400,9 @@
 export LDAPI_ESCAPE
 
 #This uses the provision we just did, to read out the schema
-$srcdir/bin/ad2oLschema $CONFIGURATION -H $PRIVATEDIR/sam.ldb -I 
$srcdir/setup/schema-map-openldap-2.3 -O $LDAPDIR/ad.schema
+$srcdir/bin/ad2oLschema $CONFIGURATION -H $PRIVATEDIR/sam.ldb -I 
$srcdir/setup/schema-map-openldap-2.3 -O $LDAPDIR/ad.schema 2
 #Now create an LDAP baseDN
-$srcdir/bin/smbscript $srcdir/setup/provision $PROVISION_OPTIONS --ldap-base
+$srcdir/bin/smbscript $srcdir/setup/provision $PROVISION_OPTIONS --ldap-base 
2
 
 OLDPATH=$PATH
 PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH
@@ -412,8 +412,8 @@
 rm -f $MODCONF
 touch $MODCONF
 
-slaptest -u -f $SLAPD_CONF  /dev/null 21 || {
-echo enabling slapd modules
+slaptest -u -f $SLAPD_CONF 2 || {
+echo enabling slapd modules 2
 cat  $MODCONF EOF 
 modulepath /usr/lib/ldap
 moduleload back_bdb
@@ -421,19 +421,18 @@
 }
 
 if slaptest -u -f $SLAPD_CONF; then
-slapadd -f $SLAPD_CONF  $PRIVATEDIR/$DNSNAME.ldif || {
-   echo slapadd failed
+slapadd -f $SLAPD_CONF  $PRIVATEDIR/$DNSNAME.ldif /dev/null || {
+   echo slapadd failed 2
 }
 
-slaptest -f $SLAPD_CONF || {
-   echo slaptest after database load failed
+slaptest -f $SLAPD_CONF /dev/null || {
+   echo slaptest after database load failed 2
 }
 fi
 
 PATH=$OLDPATH
 export PATH
 
-
 cat $PRIVATEDIR/wins_config.ldifEOF
 dn: name=TORTURE_6,CN=PARTNERS
 objectClass: wreplPartner
@@ -446,3 +445,29 @@
 
 $srcdir/bin/ldbadd -H $PRIVATEDIR/wins_config.ldb  
$PRIVATEDIR/wins_config.ldif /dev/null || exit 1
 
+echo KRB5_CONFIG=$KRB5_CONFIG
+echo PREFIX_ABS=$PREFIX_ABS
+echo TEST_DATA_PREFIX=$TEST_DATA_PREFIX
+echo CONFIGURATION=$CONFIGURATION
+echo CONFFILE=$CONFFILE
+echo SLAPD_CONF=$SLAPD_CONF
+echo PIDDIR=$PIDDIR
+echo AUTH=$AUTH
+echo SERVER=$SERVER
+echo NETBIOSNAME=$NETBIOSNAME
+echo LDAPI=$LDAPI
+echo LDAPI_ESCAPE=$LDAPI_ESCAPE
+echo DOMAIN=$DOMAIN
+echo USERNAME=$USERNAME
+echo REALM=$REALM
+echo DNSNAME=$DNSNAME
+echo BASEDN=$BASEDN
+echo PASSWORD=$PASSWORD
+echo AUTH=$AUTH
+echo SRCDIR=$SRCDIR
+echo ROOT=$ROOT
+echo SERVER=$SERVER
+echo NETBIOSNAME=$NETBIOSNAME
+echo PREFIX=$PREFIX
+echo SMBD_LOGLEVEL=$SMBD_LOGLEVEL
+echo LDAPDIR=$LDAPDIR

Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh
===
--- branches/SAMBA_4_0/source/script/tests/selftest.sh  2007-01-12 02:58:01 UTC 
(rev 20695)
+++ branches/SAMBA_4_0/source/script/tests/selftest.sh  2007-01-12 03:00:47 UTC 
(rev 20696)
@@ -52,7 +52,7 @@
 
 incdir=`dirname $ARG0`
 echo -n PROVISIONING...
-. $incdir/mktestsetup.sh $PREFIX || exit 1
+. $incdir/mktestsetup.sh $PREFIX /dev/null || exit 1
 echo DONE
 
 PATH=bin:$PATH

svn commit: samba r20737 - in branches/SAMBA_4_0/source/script/tests: .

[jelmer]

Author: jelmer
Date: 2007-01-13 16:08:58 + (Sat, 13 Jan 2007)
New Revision: 20737

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20737

Log:
Add option parsing.

Modified:
   branches/SAMBA_4_0/source/script/tests/selftest.pl


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/selftest.pl
===
--- branches/SAMBA_4_0/source/script/tests/selftest.pl  2007-01-13 15:49:32 UTC 
(rev 20736)
+++ branches/SAMBA_4_0/source/script/tests/selftest.pl  2007-01-13 16:08:58 UTC 
(rev 20737)
@@ -7,6 +7,7 @@
 
 use FindBin qw($RealBin $Script);
 use File::Spec;
+use Getopt::Long;
 use POSIX;
 use Cwd;
 
@@ -91,8 +92,36 @@
exit $failed;
 }
 
-die(Usage: $Script PREFIX TESTS [SOCKET_WRAPPER]) if ( $#ARGV == -1);
+sub ShowHelp()
+{
+   print Samba test runner
+Copyright (C) Jelmer Vernooij [EMAIL PROTECTED]
 
+Usage: $Script PREFIX TESTS [SOCKET_WRAPPER]
+
+Generic options:
+ --help this help page
+ --target=samba4|samba3 Samba version to target
+
+;
+   exit(0);
+}
+
+my $opt_help = 0;
+my $opt_target = samba4;
+
+my $result = GetOptions (
+   'help|h|?' = \$opt_help,
+   'target' = \$opt_target
+   );
+
+if (not $result) {
+   exit(1);
+}
+
+ShowHelp() if ($opt_help);
+ShowHelp() if ($#ARGV = 0);
+
 my $prefix = shift;
 my $tests = shift;
 my $socket_wrapper = shift;
@@ -160,14 +189,14 @@
print NOT USING SOCKET_WRAPPER\n;
 }
 
-#Start slapd before smbd
+# Start slapd before smbd
 if ($ldap) {
 slapd_start($ENV{SLAPD_CONF}, $ENV{LDAPI_ESCAPE}) or die(couldn't start 
slapd);
 print LDAP PROVISIONING...;
 system($bindir/smbscript $setupdir/provision $ENV{PROVISION_OPTIONS} 
--ldap-backend=$ENV{LDAPI}) or
die(LDAP PROVISIONING failed: $bindir/smbscript 
$setupdir/provision $ENV{PROVISION_OPTIONS} --ldap-backend=$ENV{LDAPI});
 
-#LDAP is slow
+# LDAP is slow
$torture_maxtime *= 2;
 }
 
@@ -189,7 +218,7 @@
 my @torture_options = (--option=interfaces=$ENV{TORTURE_INTERFACES} 
$ENV{CONFIGURATION});
 # ensure any one smbtorture call doesn't run too long
 push (@torture_options, --maximum-runtime=$torture_maxtime);
-push (@torture_options, --target=samba4);
+push (@torture_options, --target=$opt_target);
 push (@torture_options, --option=torture:progress=no) 
if (defined($ENV{RUN_FROM_BUILD_FARM}) and $ENV{RUN_FROM_BUILD_FARM} eq 
yes);
 

svn commit: samba r20746 - in branches/SAMBA_4_0: source/pidl/lib/Parse/Pidl source/script/tests testprogs testprogs/blackbox

[jelmer]

Author: jelmer
Date: 2007-01-14 01:33:16 + (Sun, 14 Jan 2007)
New Revision: 20746

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20746

Log:
Don't report each individual test in test_smbclient as a single testsuite. 
Create separate directory for blackbox tests.

Added:
   branches/SAMBA_4_0/testprogs/blackbox/
   branches/SAMBA_4_0/testprogs/blackbox/test_smbclient.sh
Removed:
   branches/SAMBA_4_0/source/script/tests/test_smbclient.sh
Modified:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Expr.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/IDL.pm
   branches/SAMBA_4_0/source/script/tests/tests_all.sh


Changeset:
Sorry, the patch is too large (1089 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20746

svn commit: samba r20747 - in branches/SAMBA_4_0: source/script/tests testprogs/blackbox

[jelmer]

Author: jelmer
Date: 2007-01-14 01:39:34 + (Sun, 14 Jan 2007)
New Revision: 20747

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20747

Log:
Move cifsdd to blackbox section
Added:
   branches/SAMBA_4_0/testprogs/blackbox/test_cifsdd.sh
Removed:
   branches/SAMBA_4_0/source/script/tests/test_cifsdd.sh
Modified:
   branches/SAMBA_4_0/source/script/tests/tests_all.sh


Changeset:
Deleted: branches/SAMBA_4_0/source/script/tests/test_cifsdd.sh
===
--- branches/SAMBA_4_0/source/script/tests/test_cifsdd.sh   2007-01-14 
01:33:16 UTC (rev 20746)
+++ branches/SAMBA_4_0/source/script/tests/test_cifsdd.sh   2007-01-14 
01:39:34 UTC (rev 20747)
@@ -1,79 +0,0 @@
-#!/bin/sh
-
-# Basic script to make sure that cifsdd can do both local and remote I/O.
-
-if [ $# -lt 4 ]; then
-cat EOF
-Usage: test_cifsdd.sh SERVER USERNAME PASSWORD DOMAIN
-EOF
-exit 1;
-fi
-
-SERVER=$1
-USERNAME=$2
-PASSWORD=$3
-DOMAIN=$4
-
-DD=bin/cifsdd
-
-SHARE=tmp
-DEBUGLEVEL=1
-
-failed=0
-
-failtest() {
-   failed=`expr $failed + 1`
-}
-
-runcopy() {
-   message=$1
-   shift
-   
-   testit $message $VALGRIND $DD $CONFIGURATION --debuglevel=$DEBUGLEVEL 
-W $DOMAIN -U $USERNAME%$PASSWORD \
-   $@
-}
-
-compare() {
-cmp $1 $2
-}
-
-incdir=`dirname $0`
-. $incdir/test_functions.sh
-
-sourcepath=tempfile.src.$$
-destpath=tempfile.dst.$$
-
-# Create a source file with arbitrary contents
-dd if=$DD of=$sourcepath bs=1024 count=50  /dev/null
-
-ls -l $sourcepath
-
-for bs in 512 4k 48k ; do
-
-echo Testing $bs block size ...
-
-# Check whether we can do local IO
-runcopy Testing local - local copy if=$sourcepath of=$destpath bs=$bs || 
failtest
-compare $sourcepath $destpath || failtest
-
-# Check whether we can do a round trip
-runcopy Testing local - remote copy \
-   if=$sourcepath of=//$SERVER/$SHARE/$sourcepath bs=$bs || failtest
-runcopy Testing remote - local copy \
-   if=//$SERVER/$SHARE/$sourcepath of=$destpath bs=$bs || failtest
-compare $sourcepath $destpath || failtest
-
-# Check that copying within the remote server works
-runcopy Testing local - remote copy \
-   if=//$SERVER/$SHARE/$sourcepath of=//$SERVER/$SHARE/$sourcepath 
bs=$bs || failtest
-runcopy Testing remote - remote copy \
-   if=//$SERVER/$SHARE/$sourcepath of=//$SERVER/$SHARE/$destpath 
bs=$bs || failtest
-runcopy Testing remote - local copy \
-   if=//$SERVER/$SHARE/$destpath of=$destpath bs=$bs || failtest
-compare $sourcepath $destpath || failtest
-
-done
-
-rm -f $sourcepath $destpath
-
-testok $0 $failed

Modified: branches/SAMBA_4_0/source/script/tests/tests_all.sh
===
--- branches/SAMBA_4_0/source/script/tests/tests_all.sh 2007-01-14 01:33:16 UTC 
(rev 20746)
+++ branches/SAMBA_4_0/source/script/tests/tests_all.sh 2007-01-14 01:39:34 UTC 
(rev 20747)
@@ -10,7 +10,6 @@
  $SRCDIR/script/tests/test_echo.sh $SERVER $USERNAME $PASSWORD $DOMAIN || 
totalfailed=`expr $totalfailed + $?`
  $SRCDIR/script/tests/test_posix.sh //$SERVER/tmp $USERNAME $PASSWORD  || 
totalfailed=`expr $totalfailed + $?`
  $SRCDIR/script/tests/test_local.sh || totalfailed=`expr $totalfailed + $?`
- $SRCDIR/script/tests/test_pidl.sh || totalfailed=`expr $totalfailed + $?`
  $SRCDIR/script/tests/test_blackbox.sh $SERVER $USERNAME $PASSWORD $DOMAIN 
$PREFIX || totalfailed=`expr $totalfailed + $?`
- $SRCDIR/script/tests/test_cifsdd.sh $SERVER $USERNAME $PASSWORD $DOMAIN || 
totalfailed=`expr $totalfailed + $?`
+ $SRCDIR/script/tests/test_pidl.sh || totalfailed=`expr $totalfailed + $?`
  $SRCDIR/script/tests/test_simple.sh //$SERVER/simple $USERNAME $PASSWORD  
|| totalfailed=`expr $totalfailed + $?`

Copied: branches/SAMBA_4_0/testprogs/blackbox/test_cifsdd.sh (from rev 20745, 
branches/SAMBA_4_0/source/script/tests/test_cifsdd.sh)
===
--- branches/SAMBA_4_0/source/script/tests/test_cifsdd.sh   2007-01-14 
00:08:31 UTC (rev 20745)
+++ branches/SAMBA_4_0/testprogs/blackbox/test_cifsdd.sh2007-01-14 
01:39:34 UTC (rev 20747)
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# Basic script to make sure that cifsdd can do both local and remote I/O.
+
+if [ $# -lt 4 ]; then
+cat EOF
+Usage: test_cifsdd.sh SERVER USERNAME PASSWORD DOMAIN
+EOF
+exit 1;
+fi
+
+SERVER=$1
+USERNAME=$2
+PASSWORD=$3
+DOMAIN=$4
+
+DD=bin/cifsdd
+
+SHARE=tmp
+DEBUGLEVEL=1
+
+failed=0
+
+testit() {
+   name=$1
+   shift
+   cmdline=$*
+   echo test: $name
+   $cmdline
+   status=$?
+   if [ x$status = x0 ]; then
+   echo success: $name
+   else
+   echo failure: $name
+   failed=`expr $failed + 1`
+   fi
+   return $status
+}
+
+
+
+runcopy() {
+   message=$1
+   shift
+   
+   testit $message $VALGRIND $DD $CONFIGURATION --debuglevel=$DEBUGLEVEL 
-W

svn commit: samba r20748 - in branches/SAMBA_4_0/source/script/tests: .

[jelmer]

Author: jelmer
Date: 2007-01-14 01:42:07 + (Sun, 14 Jan 2007)
New Revision: 20748

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20748

Log:
Add file I forgot to commit
Added:
   branches/SAMBA_4_0/source/script/tests/test_blackbox.sh


Changeset:
Added: branches/SAMBA_4_0/source/script/tests/test_blackbox.sh
===
--- branches/SAMBA_4_0/source/script/tests/test_blackbox.sh 2007-01-14 
01:39:34 UTC (rev 20747)
+++ branches/SAMBA_4_0/source/script/tests/test_blackbox.sh 2007-01-14 
01:42:07 UTC (rev 20748)
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# this runs tests that interact directly with the command-line tools rather 
than using the API
+
+if [ $# -lt 5 ]; then
+cat EOF
+Usage: test_blackbox.sh SERVER USERNAME PASSWORD DOMAIN PREFIX [...]
+EOF
+exit 1;
+fi
+
+SERVER=$1
+USERNAME=$2
+PASSWORD=$3
+DOMAIN=$4
+PREFIX=$5
+shift 5
+ADDARGS=$@
+
+incdir=`dirname $0`
+. $incdir/test_functions.sh
+
+testit smbclient $incdir/../../../testprogs/blackbox/test_smbclient.sh 
$SERVER $USERNAME $PASSWORD $DOMAIN $PREFIX $ADDARGS
+testit cifsdd $incdir/../../../testprogs/blackbox/test_cifsdd.sh $SERVER 
$USERNAME $PASSWORD $DOMAIN $ADDARGS
+
+testok $0 $failed


Property changes on: branches/SAMBA_4_0/source/script/tests/test_blackbox.sh
___
Name: svn:executable
   + *

svn commit: samba r20749 - in branches/SAMBA_4_0/webapps: qooxdoo-0.6.3-sdk/frontend/framework qooxdoo-0.6.3-sdk/frontend/framework/tool/modules swat

[jelmer]

Author: jelmer
Date: 2007-01-14 01:44:24 + (Sun, 14 Jan 2007)
New Revision: 20749

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20749

Log:
Ignore autogenerated files.
Modified:
   branches/SAMBA_4_0/webapps/qooxdoo-0.6.3-sdk/frontend/framework/
   branches/SAMBA_4_0/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/
   branches/SAMBA_4_0/webapps/swat/


Changeset:

Property changes on: 
branches/SAMBA_4_0/webapps/qooxdoo-0.6.3-sdk/frontend/framework
___
Name: svn:ignore
   + .cache



Property changes on: 
branches/SAMBA_4_0/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules
___
Name: svn:ignore
   + *.pyc



Property changes on: branches/SAMBA_4_0/webapps/swat
___
Name: svn:ignore
   + build

svn commit: samba r20750 - in branches/SAMBA_4_0/source/script/tests: .

[jelmer]

Author: jelmer
Date: 2007-01-14 02:02:06 + (Sun, 14 Jan 2007)
New Revision: 20750

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20750

Log:
Use files in script/tests to build a recipe rather than running the tests 
immediately.

Modified:
   branches/SAMBA_4_0/source/script/tests/selftest.sh
   branches/SAMBA_4_0/source/script/tests/test_functions.sh


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh
===
--- branches/SAMBA_4_0/source/script/tests/selftest.sh  2007-01-14 01:44:24 UTC 
(rev 20749)
+++ branches/SAMBA_4_0/source/script/tests/selftest.sh  2007-01-14 02:02:06 UTC 
(rev 20750)
@@ -104,6 +104,107 @@
TORTURE_OPTIONS=$TORTURE_OPTIONS --option=torture:progress=no
 fi
 
+ runtest() {
+   if [ -z $PREFIX ]; then
+   PREFIX=test_prefix
+   mkdir -p $PREFIX
+   fi
+   name=$1
+   shift 1
+   cmdline=$*
+
+   SMBD_IS_UP=no
+
+   shname=`echo $name | \
+   sed -e 
's%[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\-]%_%g'`
+
+   UNIQUE_PID=`/bin/sh -c 'echo $$'`
+   TEST_LOG=$PREFIX/test_log.${UNIQUE_PID}
+   TEST_PCAP=$PREFIX/test_${shname}_${UNIQUE_PID}.pcap
+   trap rm -f $TEST_LOG $TEST_PCAP EXIT
+
+if [ -n $SMBD_TEST_LOG -a -z $smbd_log_size ]; then
+   smbd_log_size=`wc -l  $SMBD_TEST_LOG`;
+   fi
+
+   if [ x$RUN_FROM_BUILD_FARM = xyes ];then
+   echo --==--==--==--==--==--==--==--==--==--==--
+   echo Running test $name (level 0 stdout)
+   echo --==--==--==--==--==--==--==--==--==--==--
+   date
+   echo Testing $name
+   else
+   nf=`expr $failed + $totalfailed`;
+   if [ $nf = 0 ]; then 
+   echo Testing $name
+   else 
+   echo Testing $name ($nf tests failed so far)
+   fi
+   fi
+
+   smbd_check_only  SMBD_IS_UP=yes
+   if [ x$SMBD_IS_UP != xyes ];then
+   if [ x$RUN_FROM_BUILD_FARM = xyes ];then
+   echo SMBD is down! Skipping: $cmdline
+   echo ==
+   echo TEST SKIPPED: $name (reason SMBD is down)
+   echo ==
+   else
+   echo TEST SKIPPED: $name (reason SMBD is down)
+   fi
+   return 1
+   fi
+
+   if [ x$MAKE_TEST_ENABLE_PCAP = xyes ];then
+   SOCKET_WRAPPER_PCAP_FILE=$TEST_PCAP
+   export SOCKET_WRAPPER_PCAP_FILE
+   fi
+
+   ( $cmdline  $TEST_LOG 21 )
+   status=$?
+   # show any additional output from smbd that has happened in this test
+   smbd_have_test_log  { 
+   new_log_size=`wc -l  $SMBD_TEST_LOG`;
+   test $new_log_size = $smbd_log_size || {
+   echo SMBD OUTPUT:;
+   incr_log_size=`expr $new_log_size - $smbd_log_size`;
+   tail -$incr_log_size $SMBD_TEST_LOG;
+   smbd_log_size=$new_log_size;
+   }
+   }
+   if [ x$status != x0 ]; then
+   echo TEST OUTPUT:
+   cat $TEST_LOG;
+   rm -f $TEST_LOG;
+   if [ x$MAKE_TEST_ENABLE_PCAP = xyes ];then
+   echo TEST PCAP: $TEST_PCAP
+   fi
+   if [ x$RUN_FROM_BUILD_FARM = xyes ];then
+   echo ==
+   echo TEST FAILED: $name (status $status)
+   echo ==
+   else
+   echo TEST FAILED: $cmdline (status $status)
+   fi
+   trap  EXIT
+   return 1;
+   fi
+   rm -f $TEST_LOG;
+   if [ x$MAKE_TEST_KEEP_PCAP = xyes ];then
+   echo TEST PCAP: $TEST_PCAP
+   else
+   rm -f $TEST_PCAP;
+   fi
+   if [ x$RUN_FROM_BUILD_FARM = xyes ];then
+   echo ALL OK: $cmdline
+   echo ==
+   echo TEST PASSED: $name
+   echo ==
+   fi
+   trap  EXIT
+   return 0;
+}
+
 START=`date`
 (
  # give time for nbt server to register its names
@@ -123,7 +224,19 @@
 totalfailed=0
 export totalfailed
 
- . script/tests/tests_$TESTS.sh
+. script/tests/tests_$TESTS.sh | (
+   while read LINE
+   do
+   if [ $LINE = -- TEST -- ]; then
+   read NAME
+   read CMDLINE
+   runtest $NAME $CMDLINE
+   else
+   echo $LINE
+   fi
+ done
+)
+
  exit $totalfailed
 ) 9$SMBD_TEST_FIFO
 failed=$?

Modified: branches/SAMBA_4_0/source

svn commit: samba r20754 - in branches/SAMBA_4_0/source/script/tests: .

[jelmer]

Author: jelmer
Date: 2007-01-14 03:18:04 + (Sun, 14 Jan 2007)
New Revision: 20754

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20754

Log:
Simplify code for calculating total number of failed tests.

Modified:
   branches/SAMBA_4_0/source/script/tests/selftest.sh
   branches/SAMBA_4_0/source/script/tests/tests_all.sh
   branches/SAMBA_4_0/source/script/tests/tests_quick.sh


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh
===
--- branches/SAMBA_4_0/source/script/tests/selftest.sh  2007-01-14 03:03:40 UTC 
(rev 20753)
+++ branches/SAMBA_4_0/source/script/tests/selftest.sh  2007-01-14 03:18:04 UTC 
(rev 20754)
@@ -230,7 +230,7 @@
if [ $LINE = -- TEST -- ]; then
read NAME
read CMDLINE
-   runtest $NAME $CMDLINE
+   runtest $NAME $CMDLINE || totalfailed=`expr 
$totalfailed + $?`
else
echo $LINE
fi

Modified: branches/SAMBA_4_0/source/script/tests/tests_all.sh
===
--- branches/SAMBA_4_0/source/script/tests/tests_all.sh 2007-01-14 03:03:40 UTC 
(rev 20753)
+++ branches/SAMBA_4_0/source/script/tests/tests_all.sh 2007-01-14 03:18:04 UTC 
(rev 20754)
@@ -1,15 +1,15 @@
 #!/bin/sh
- $SRCDIR/script/tests/test_ejs.sh $DOMAIN $USERNAME $PASSWORD || 
totalfailed=`expr $totalfailed + $?`
- $SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD || 
totalfailed=`expr $totalfailed + $?`
- $SRCDIR/script/tests/test_nbt.sh $SERVER || totalfailed=`expr $totalfailed + 
$?`
- $SRCDIR/script/tests/test_quick.sh //$SERVER/cifs $USERNAME $PASSWORD  || 
totalfailed=`expr $totalfailed + $?`
- $SRCDIR/script/tests/test_rpc.sh $SERVER $USERNAME $PASSWORD $DOMAIN || 
totalfailed=`expr $totalfailed + $?`
- $SRCDIR/script/tests/test_net.sh $SERVER $USERNAME $PASSWORD $DOMAIN || 
totalfailed=`expr $totalfailed + $?`
- $SRCDIR/script/tests/test_session_key.sh $SERVER $USERNAME $PASSWORD $DOMAIN 
$NETBIOSNAME || totalfailed=`expr $totalfailed + $?`
- $SRCDIR/script/tests/test_binding_string.sh $SERVER $USERNAME $PASSWORD 
$DOMAIN || totalfailed=`expr $totalfailed + $?`
- $SRCDIR/script/tests/test_echo.sh $SERVER $USERNAME $PASSWORD $DOMAIN || 
totalfailed=`expr $totalfailed + $?`
- $SRCDIR/script/tests/test_posix.sh //$SERVER/tmp $USERNAME $PASSWORD  || 
totalfailed=`expr $totalfailed + $?`
- $SRCDIR/script/tests/test_local.sh || totalfailed=`expr $totalfailed + $?`
- $SRCDIR/script/tests/test_blackbox.sh $SERVER $USERNAME $PASSWORD $DOMAIN 
$PREFIX || totalfailed=`expr $totalfailed + $?`
- $SRCDIR/script/tests/test_pidl.sh || totalfailed=`expr $totalfailed + $?`
- $SRCDIR/script/tests/test_simple.sh //$SERVER/simple $USERNAME $PASSWORD  
|| totalfailed=`expr $totalfailed + $?`
+ $SRCDIR/script/tests/test_ejs.sh $DOMAIN $USERNAME $PASSWORD
+ $SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD
+ $SRCDIR/script/tests/test_nbt.sh $SERVER
+ $SRCDIR/script/tests/test_quick.sh //$SERVER/cifs $USERNAME $PASSWORD 
+ $SRCDIR/script/tests/test_rpc.sh $SERVER $USERNAME $PASSWORD $DOMAIN
+ $SRCDIR/script/tests/test_net.sh $SERVER $USERNAME $PASSWORD $DOMAIN
+ $SRCDIR/script/tests/test_session_key.sh $SERVER $USERNAME $PASSWORD $DOMAIN 
$NETBIOSNAME
+ $SRCDIR/script/tests/test_binding_string.sh $SERVER $USERNAME $PASSWORD 
$DOMAIN
+ $SRCDIR/script/tests/test_echo.sh $SERVER $USERNAME $PASSWORD $DOMAIN
+ $SRCDIR/script/tests/test_posix.sh //$SERVER/tmp $USERNAME $PASSWORD 
+ $SRCDIR/script/tests/test_local.sh
+ $SRCDIR/script/tests/test_blackbox.sh $SERVER $USERNAME $PASSWORD $DOMAIN 
$PREFIX
+ $SRCDIR/script/tests/test_pidl.sh
+ $SRCDIR/script/tests/test_simple.sh //$SERVER/simple $USERNAME $PASSWORD 

Modified: branches/SAMBA_4_0/source/script/tests/tests_quick.sh
===
--- branches/SAMBA_4_0/source/script/tests/tests_quick.sh   2007-01-14 
03:03:40 UTC (rev 20753)
+++ branches/SAMBA_4_0/source/script/tests/tests_quick.sh   2007-01-14 
03:18:04 UTC (rev 20754)
@@ -4,9 +4,9 @@
 TORTURE_QUICK=yes
 export TORTURE_QUICK
 
-$SRCDIR/script/tests/test_ejs.sh $DOMAIN $USERNAME $PASSWORD || 
totalfailed=`expr $totalfailed + $?`
-$SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD || 
totalfailed=`expr $totalfailed + $?`
-$SRCDIR/script/tests/test_nbt.sh $SERVER || totalfailed=`expr $totalfailed + 
$?`
-$SRCDIR/script/tests/test_quick.sh //$SERVER/cifs $USERNAME $PASSWORD  || 
totalfailed=`expr $totalfailed + $?`
-$SRCDIR/script/tests/test_rpc_quick.sh $SERVER $USERNAME $PASSWORD $DOMAIN || 
totalfailed=`expr $totalfailed + $?`
+$SRCDIR/script/tests/test_ejs.sh $DOMAIN $USERNAME $PASSWORD
+$SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD
+$SRCDIR/script/tests/test_nbt.sh $SERVER
+$SRCDIR/script/tests/test_quick.sh

svn commit: samba r20755 - in branches/SAMBA_4_0/source/script/tests: .

[jelmer]

Author: jelmer
Date: 2007-01-14 03:38:56 + (Sun, 14 Jan 2007)
New Revision: 20755

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20755

Log:
Add progress indicator to test runner
Modified:
   branches/SAMBA_4_0/source/script/tests/selftest.sh


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh
===
--- branches/SAMBA_4_0/source/script/tests/selftest.sh  2007-01-14 03:18:04 UTC 
(rev 20754)
+++ branches/SAMBA_4_0/source/script/tests/selftest.sh  2007-01-14 03:38:56 UTC 
(rev 20755)
@@ -136,9 +136,9 @@
else
nf=`expr $failed + $totalfailed`;
if [ $nf = 0 ]; then 
-   echo Testing $name
+   echo [$current/$total] Testing $name
else 
-   echo Testing $name ($nf tests failed so far)
+   echo [$current/$total, $nf failures] Testing $name
fi
fi
 
@@ -224,12 +224,16 @@
 totalfailed=0
 export totalfailed
 
-. script/tests/tests_$TESTS.sh | (
+. script/tests/tests_$TESTS.sh  $PREFIX/recipe
+total=`grep TEST -- $PREFIX/recipe | wc -l`
+current=0
+cat $PREFIX/recipe | (
while read LINE
do
if [ $LINE = -- TEST -- ]; then
read NAME
read CMDLINE
+   current=`expr $current + 1`
runtest $NAME $CMDLINE || totalfailed=`expr 
$totalfailed + $?`
else
echo $LINE

svn commit: samba r20756 - in branches/SAMBA_4_0/source/script/tests: .

[jelmer]

Author: jelmer
Date: 2007-01-14 04:32:11 + (Sun, 14 Jan 2007)
New Revision: 20756

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20756

Log:
Update to use generated recipes.

Modified:
   branches/SAMBA_4_0/source/script/tests/selftest.pl


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/selftest.pl
===
--- branches/SAMBA_4_0/source/script/tests/selftest.pl  2007-01-14 03:38:56 UTC 
(rev 20755)
+++ branches/SAMBA_4_0/source/script/tests/selftest.pl  2007-01-14 04:32:11 UTC 
(rev 20756)
@@ -104,7 +104,7 @@
  --target=samba4|samba3|win Samba version to target
  --socket-wrapper   enable socket wrapper
  --quickrun quick overall test
-
+ --one  abort when the first test fails
 ;
exit(0);
 }
@@ -113,12 +113,14 @@
 my $opt_target = samba4;
 my $opt_quick = 0;
 my $opt_socket_wrapper = 0;
+my $opt_one = 0;
 
 my $result = GetOptions (
'help|h|?' = \$opt_help,
'target' = \$opt_target,
'socket-wrapper' = \$opt_socket_wrapper,
-   'quick' = \$opt_quick
+   'quick' = \$opt_quick,
+   'one' = \$opt_one
);
 
 if (not $result) {
@@ -263,16 +265,50 @@
 
 # start off with 0 failures
 $ENV{failed} = 0;
-$ENV{totalfailed} = 0;
+my $totalfailed = 0;
 
+my @todo = ();
+
 if ($opt_target eq win) {
system($testsdir/test_win.sh);
-} elsif ($opt_quick) {
-   system($testsdir/tests_quick.sh);
-} else {
-   system($testsdir/tests_all.sh);
+} else { 
+   if ($opt_quick) {
+   open(IN, $testsdir/tests_quick.sh|);
+   } else {
+   open(IN, $testsdir/tests_all.sh|);
+   }
+   while (IN) {
+   if ($_ eq -- TEST --\n) {
+   my $name = IN;
+   $name =~ s/\n//g;
+   my $cmdline = IN;
+   $cmdline =~ s/\n//g;
+   push (@todo, [$name, $cmdline]);
+   } else {
+   print;
+   }
+   }
+   close(IN);
 }
 
+my $total = $#todo + 1;
+my $i = 0;
+$| = 1;
+
+foreach (@todo) {
+   $i = $i + 1;
+   my $err = ;
+   if ($totalfailed  0) { $err = , $totalfailed errors; }
+   printf [$i/$total in  . (time() - $start).s$err] $$_[0]\n;
+   my $ret = system($$_[1] /dev/null 2/dev/null);
+   if ($ret != 0) {
+   $totalfailed++;
+   exit(1) if ($opt_one);
+   }
+}
+
+print \n;
+
 close(DATA);
 
 my $failed = $?  8;
@@ -291,6 +327,7 @@
 
 my $end=time();
 print DURATION:  . ($end-$start).  seconds\n;
+print $totalfailed failures\n;
 
 # if there were any valgrind failures, show them
 foreach ($prefix/valgrind.log*) {

svn commit: samba r20757 - in branches/SAMBA_4_0/source/torture: .

[jelmer]

Author: jelmer
Date: 2007-01-14 05:06:50 + (Sun, 14 Jan 2007)
New Revision: 20757

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20757

Log:
Strip recipe functionality (should be one layer up)
Modified:
   branches/SAMBA_4_0/source/torture/smbtorture.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/smbtorture.c
===
--- branches/SAMBA_4_0/source/torture/smbtorture.c  2007-01-14 04:32:11 UTC 
(rev 20756)
+++ branches/SAMBA_4_0/source/torture/smbtorture.c  2007-01-14 05:06:50 UTC 
(rev 20757)
@@ -423,33 +423,6 @@
.test_result = quiet_test_result
 };
 
-void run_recipe(struct torture_context *tctx, const char *recipe)
-{
-   int numlines, i, ret;
-   char **lines;
-
-   lines = file_lines_load(recipe, numlines, NULL);
-   if (lines == NULL) {
-   fprintf(stderr, Unable to load file %s\n, recipe);
-   return;
-   }
-
-   for (i = 0; i  numlines; i++) {
-   int argc;
-   const char **argv;
-
-   ret = poptParseArgvString(lines[i], argc, argv);
-   if (ret != 0) {
-   fprintf(stderr, Error parsing line\n);
-   continue;
-   }
-
-   run_test(tctx, argv[0]);
-   }
-
-   talloc_free(lines);
-}
-
 void run_shell(struct torture_context *tctx)
 {
char *cline;
@@ -686,9 +659,7 @@
double rate;
int unexpected_failures;
for (i=2;iargc_new;i++) {
-   if (argv_new[i][0] == '@') {
-   run_recipe(torture, argv_new[i]+1);
-   } else if (!run_test(torture, argv_new[i])) {
+   if (!run_test(torture, argv_new[i])) {
correct = false;
}
}

svn commit: samba r20784 - in branches/SAMBA_4_0/source: librpc/idl torture/rpc

[jelmer]

Author: jelmer
Date: 2007-01-14 22:28:29 + (Sun, 14 Jan 2007)
New Revision: 20784

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20784

Log:
Add ref pointer
Modified:
   branches/SAMBA_4_0/source/librpc/idl/mgmt.idl
   branches/SAMBA_4_0/source/torture/rpc/mgmt.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/mgmt.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/mgmt.idl   2007-01-14 20:47:46 UTC 
(rev 20783)
+++ branches/SAMBA_4_0/source/librpc/idl/mgmt.idl   2007-01-14 22:28:29 UTC 
(rev 20784)
@@ -48,14 +48,14 @@
WERROR mgmt_inq_stats (
[in]uint32 max_count,
[in]uint32 unknown,
-   [out]   mgmt_statisticsstatistics
+   [out,ref]   mgmt_statistics*statistics
);
 
 
/***/
/* Function 0x02   */
boolean32 mgmt_is_server_listening (
-   [out]   error_status_t  status
+   [out,ref]   error_status_t  *status
);
 
 

Modified: branches/SAMBA_4_0/source/torture/rpc/mgmt.c
===
--- branches/SAMBA_4_0/source/torture/rpc/mgmt.c2007-01-14 20:47:46 UTC 
(rev 20783)
+++ branches/SAMBA_4_0/source/torture/rpc/mgmt.c2007-01-14 22:28:29 UTC 
(rev 20784)
@@ -80,16 +80,16 @@
return False;
}
 
-   if (r.out.statistics.count != MGMT_STATS_ARRAY_MAX_SIZE) {
-   printf(Unexpected array size %d\n, r.out.statistics.count);
+   if (r.out.statistics-count != MGMT_STATS_ARRAY_MAX_SIZE) {
+   printf(Unexpected array size %d\n, r.out.statistics-count);
return False;
}
 
printf(\tcalls_in %6d  calls_out %6d\n\tpkts_in  %6d  pkts_out  %6d\n,
-  r.out.statistics.statistics[MGMT_STATS_CALLS_IN],
-  r.out.statistics.statistics[MGMT_STATS_CALLS_OUT],
-  r.out.statistics.statistics[MGMT_STATS_PKTS_IN],
-  r.out.statistics.statistics[MGMT_STATS_PKTS_OUT]);
+  r.out.statistics-statistics[MGMT_STATS_CALLS_IN],
+  r.out.statistics-statistics[MGMT_STATS_CALLS_OUT],
+  r.out.statistics-statistics[MGMT_STATS_PKTS_IN],
+  r.out.statistics-statistics[MGMT_STATS_PKTS_OUT]);
 
return True;
 }
@@ -142,7 +142,7 @@
return False;
}
 
-   if (r.out.status != 0 || r.out.result == 0) {
+   if (*r.out.status != 0 || r.out.result == 0) {
printf(\tserver is NOT listening\n);
} else {
printf(\tserver is listening\n);

svn commit: samba r20785 - in branches/SAMBA_4_0/source/rpc_server: . mgmt

[jelmer]

Author: jelmer
Date: 2007-01-15 00:42:16 + (Mon, 15 Jan 2007)
New Revision: 20785

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20785

Log:
Add stub implementation for mgmt interface.
Added:
   branches/SAMBA_4_0/source/rpc_server/mgmt/
   branches/SAMBA_4_0/source/rpc_server/mgmt/dcesrv_mgmt.c
Modified:
   branches/SAMBA_4_0/source/rpc_server/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/rpc_server/config.mk
===
--- branches/SAMBA_4_0/source/rpc_server/config.mk  2007-01-14 22:28:29 UTC 
(rev 20784)
+++ branches/SAMBA_4_0/source/rpc_server/config.mk  2007-01-15 00:42:16 UTC 
(rev 20785)
@@ -35,6 +35,17 @@
 
 
 
+# Start MODULE dcerpc_mgmt
+[MODULE::dcerpc_mgmt]
+INIT_FUNCTION = dcerpc_server_mgmt_init
+SUBSYSTEM = dcerpc_server
+OBJ_FILES = \
+   echo/rpc_echo.o
+PUBLIC_DEPENDENCIES = NDR_MGMT
+# End MODULE dcerpc_mgmt
+
+
+
 # Start MODULE dcerpc_remote
 [MODULE::dcerpc_remote]
 INIT_FUNCTION = dcerpc_server_remote_init

Added: branches/SAMBA_4_0/source/rpc_server/mgmt/dcesrv_mgmt.c
===
--- branches/SAMBA_4_0/source/rpc_server/mgmt/dcesrv_mgmt.c 2007-01-14 
22:28:29 UTC (rev 20784)
+++ branches/SAMBA_4_0/source/rpc_server/mgmt/dcesrv_mgmt.c 2007-01-15 
00:42:16 UTC (rev 20785)
@@ -0,0 +1,80 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   endpoint server for the mgmt pipe
+
+   Copyright (C) Jelmer Vernooij 2006
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include includes.h
+#include rpc_server/dcerpc_server.h
+#include librpc/gen_ndr/ndr_mgmt.h
+#include rpc_server/common/common.h
+
+/* 
+  mgmt_inq_if_ids 
+*/
+static WERROR mgmt_inq_if_ids(struct dcesrv_call_state *dce_call, TALLOC_CTX 
*mem_ctx,
+  struct mgmt_inq_if_ids *r)
+{
+   DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+}
+
+
+/* 
+  mgmt_inq_stats 
+*/
+static WERROR mgmt_inq_stats(struct dcesrv_call_state *dce_call, TALLOC_CTX 
*mem_ctx,
+  struct mgmt_inq_stats *r)
+{
+   DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+}
+
+
+/* 
+  mgmt_is_server_listening 
+*/
+static uint32_t mgmt_is_server_listening(struct dcesrv_call_state *dce_call, 
TALLOC_CTX *mem_ctx,
+  struct mgmt_is_server_listening *r)
+{
+   *r-out.status = 1;
+   return 0;
+}
+
+
+/* 
+  mgmt_stop_server_listening 
+*/
+static WERROR mgmt_stop_server_listening(struct dcesrv_call_state *dce_call, 
TALLOC_CTX *mem_ctx,
+  struct mgmt_stop_server_listening *r)
+{
+   DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+}
+
+
+/* 
+  mgmt_inq_princ_name 
+*/
+static WERROR mgmt_inq_princ_name(struct dcesrv_call_state *dce_call, 
TALLOC_CTX *mem_ctx,
+  struct mgmt_inq_princ_name *r)
+{
+   DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+}
+
+
+/* include the generated boilerplate */
+#include librpc/gen_ndr/ndr_mgmt_s.c

svn commit: samba r20786 - in branches/SAMBA_4_0: . source/gtk/tools source/heimdal/lib/com_err source/rpc_server source/scripting/ejs

[jelmer]

Author: jelmer
Date: 2007-01-15 02:23:40 + (Mon, 15 Jan 2007)
New Revision: 20786

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20786

Log:
Fix the build.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/gtk/tools/gepdump.c
   branches/SAMBA_4_0/source/heimdal/lib/com_err/lex.c
   branches/SAMBA_4_0/source/rpc_server/config.mk
   branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c


Changeset:
Sorry, the patch is too large (2223 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20786

svn commit: samba r20822 - in branches/SAMBA_4_0/source/script/tests: .

[jelmer]

Author: jelmer
Date: 2007-01-15 23:42:52 + (Mon, 15 Jan 2007)
New Revision: 20822

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20822

Log:
Fix total failure counting. 

Modified:
   branches/SAMBA_4_0/source/script/tests/selftest.sh


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh
===
--- branches/SAMBA_4_0/source/script/tests/selftest.sh  2007-01-15 19:28:24 UTC 
(rev 20821)
+++ branches/SAMBA_4_0/source/script/tests/selftest.sh  2007-01-15 23:42:52 UTC 
(rev 20822)
@@ -219,8 +219,6 @@
  bin/nmblookup $CONFIGURATION -U $SERVER $NETBIOSNAME
 
 # start off with 0 failures
-failed=0
-export failed
 totalfailed=0
 export totalfailed
 
@@ -238,12 +236,12 @@
else
echo $LINE
fi
- done
-)
-
- exit $totalfailed
+   done
+   exit $totalfailed
+)
+exit $?
 ) 9$SMBD_TEST_FIFO
-failed=$?
+totalfailed=$?
 
 kill `cat $PIDDIR/smbd.pid`
 
@@ -261,10 +259,10 @@
 for f in $PREFIX/valgrind.log*; do
if [ -s $f ]  grep -v DWARF2.CFI.reader $f  /dev/null; then
echo VALGRIND FAILURE;
-   failed=`expr $failed + 1`
+   totalfailed=`expr $totalfailed + 1`
cat $f
fi
 done
 fi
 
-teststatus $ARG0 $failed
+teststatus $ARG0 $totalfailed

svn commit: smb-build r69 - in trunk: .

[jelmer]

Author: jelmer
Date: 2007-01-16 01:13:13 + (Tue, 16 Jan 2007)
New Revision: 69

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=smb-buildrev=69

Log:
Check if the build breakage script still works.
Modified:
   trunk/foo.c


Changeset:
Modified: trunk/foo.c
===
--- trunk/foo.c 2006-10-11 12:08:17 UTC (rev 68)
+++ trunk/foo.c 2007-01-16 01:13:13 UTC (rev 69)
@@ -1,3 +1,4 @@
+#error Fails
 #include stdio.h
 
 #define eprintf(...) fprintf(stderr, __VA_ARGS__)

svn commit: samba r20823 - in branches/SAMBA_4_0/source/torture: basic local

[jelmer]

Author: jelmer
Date: 2007-01-16 01:36:15 + (Tue, 16 Jan 2007)
New Revision: 20823

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20823

Log:
Remove newlines in calls to torture_fail().
Modified:
   branches/SAMBA_4_0/source/torture/basic/base.c
   branches/SAMBA_4_0/source/torture/local/dbspeed.c
   branches/SAMBA_4_0/source/torture/local/iconv.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/basic/base.c
===
--- branches/SAMBA_4_0/source/torture/basic/base.c  2007-01-15 23:42:52 UTC 
(rev 20822)
+++ branches/SAMBA_4_0/source/torture/basic/base.c  2007-01-16 01:36:15 UTC 
(rev 20823)
@@ -93,7 +93,7 @@
if (status) {
torture_fail(tctx, talloc_asprintf(tctx, 
   tconx to share %s with type %s 
-  should have failed but succeeded\n,
+  should have failed but succeeded,
   myshare, devtype));
} else {
if (NT_STATUS_EQUAL(smbcli_nt_error(cli-tree),
@@ -725,7 +725,7 @@
 NT_STATUS_INVALID_HANDLE)) {
torture_fail(tctx, talloc_asprintf(tctx, 
qfileinfo should have returned DOS error 
-  ERRSRV:ERRbaduid\n  but returned %s\n,
+  ERRSRV:ERRbaduid\n  but returned %s,
   smbcli_errstr(cli-tree)));
}
 

Modified: branches/SAMBA_4_0/source/torture/local/dbspeed.c
===
--- branches/SAMBA_4_0/source/torture/local/dbspeed.c   2007-01-15 23:42:52 UTC 
(rev 20822)
+++ branches/SAMBA_4_0/source/torture/local/dbspeed.c   2007-01-16 01:36:15 UTC 
(rev 20823)
@@ -63,7 +63,7 @@
tdbw = tdb_wrap_open(tmp_ctx, test.tdb, 
 1, 0, O_RDWR|O_CREAT|O_TRUNC, 0600);
if (!tdbw) {
-   torture_fail(torture, Failed to open test.tdb\n);
+   torture_fail(torture, Failed to open test.tdb);
goto failed;
}
 
@@ -171,7 +171,7 @@
ldb = ldb_wrap_connect(tmp_ctx, tdb://test.ldb, 
NULL, NULL, LDB_FLG_NOSYNC, NULL);
if (!ldb) {
-   torture_fail(torture, Failed to open test.ldb\n);
+   torture_fail(torture, Failed to open test.ldb);
goto failed;
}
 
@@ -207,20 +207,20 @@
i = random() % torture_entries;
dn = ldb_dn_new_fmt(tmp_ctx, ldb, 
SID=S-1-5-21-53173311-3623041448-2049097239-%u, i);
if (ldb_search(ldb, dn, LDB_SCOPE_BASE, NULL, NULL, res) != 
LDB_SUCCESS || res-count != 1) {
-   torture_fail(torture, talloc_asprintf(torture, Failed 
to find SID %d\n, i));
+   torture_fail(torture, talloc_asprintf(torture, Failed 
to find SID %d, i));
}
talloc_free(res);
talloc_free(dn);
expr = talloc_asprintf(tmp_ctx, (UID=%u), i);
if (ldb_search(ldb, NULL, LDB_SCOPE_SUBTREE, expr, NULL, res) 
!= LDB_SUCCESS || res-count != 1) {
-   torture_fail(torture, talloc_asprintf(torture, Failed 
to find UID %d\n, i));
+   torture_fail(torture, talloc_asprintf(torture, Failed 
to find UID %d, i));
}
talloc_free(res);
talloc_free(expr);
}
 
if (talloc_total_blocks(torture)  100) {
-   torture_fail(torture, memory leak in ldb search\n);
+   torture_fail(torture, memory leak in ldb search);
goto failed;
}
 

Modified: branches/SAMBA_4_0/source/torture/local/iconv.c
===
--- branches/SAMBA_4_0/source/torture/local/iconv.c 2007-01-15 23:42:52 UTC 
(rev 20822)
+++ branches/SAMBA_4_0/source/torture/local/iconv.c 2007-01-16 01:36:15 UTC 
(rev 20823)
@@ -133,7 +133,7 @@
if (cd == (iconv_t)-1) {
torture_fail(test, 
 talloc_asprintf(test, 
-failed to open %s to 
UTF-16LE\n,
+failed to open %s to 
UTF-16LE,
 charset));
cd = NULL;
return false;

svn commit: samba r20829 - in branches/SAMBA_4_0: .

[jelmer]

Author: jelmer
Date: 2007-01-16 14:32:56 + (Tue, 16 Jan 2007)
New Revision: 20829

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20829

Log:
Update ignores.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/.bzrignore


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/.bzrignore
===
--- branches/SAMBA_4_0/.bzrignore   2007-01-16 11:15:10 UTC (rev 20828)
+++ branches/SAMBA_4_0/.bzrignore   2007-01-16 14:32:56 UTC (rev 20829)
@@ -132,3 +132,21 @@
 source/winbind/wb_proto.h
 source/wrepl_server/wrepl_server_proto.h
 tags
+webapps/swat/build
+webapps/qooxdoo-0.6.3-sdk/frontend/framework/.cache
+source/auth/credentials/credentials_krb5_proto.h
+source/kdc/pac_glue.h
+source/lib/cmdline/popt_credentials.h
+source/lib/samba3/samba3_smbpasswd_proto.h
+source/lib/util/util_tdb.h
+source/ntvfs/cifs_posix_cli/proto.h
+source/param/secrets_proto.h
+source/smbd/pidfile.h
+source/torture/rap/proto.h
+*_asn1.h
+*_asn1_files
+*_err.c
+*_err.h
+source/heimdal/lib/roken/err.h
+source/scripting/ejs/ejsnet/proto.h
+source/heimdal/lib/hx509/asn1_*.c

svn commit: samba r20830 - in branches/SAMBA_4_0: . source/librpc/idl source/pidl/lib/Parse/Pidl/Samba4/NDR source/rpc_server source/script/tests source/torture/rpc

[jelmer]

Author: jelmer
Date: 2007-01-16 14:44:23 + (Tue, 16 Jan 2007)
New Revision: 20830

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20830

Log:
merge mgmt work
Added:
   branches/SAMBA_4_0/source/rpc_server/dcesrv_mgmt.c
Removed:
   branches/SAMBA_4_0/source/rpc_server/mgmt/
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/librpc/idl/mgmt.idl
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
   branches/SAMBA_4_0/source/rpc_server/config.mk
   branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c
   branches/SAMBA_4_0/source/script/tests/test_rpc.sh
   branches/SAMBA_4_0/source/torture/rpc/mgmt.c


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/librpc/idl/mgmt.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/mgmt.idl   2007-01-16 14:32:56 UTC 
(rev 20829)
+++ branches/SAMBA_4_0/source/librpc/idl/mgmt.idl   2007-01-16 14:44:23 UTC 
(rev 20830)
@@ -6,7 +6,6 @@
   uuid(afa8bd80-7d8a-11c9-bef4-08002b102989), 
   version(1.0),
   pointer_default(unique),
-  endpoint(ncalrpc:[EPMAPPER], ncacn_ip_tcp:[135], 
ncacn_np:[\\pipe\\epmapper]),
   helpstring(DCE/RPC Remote Management)
 ] 
 interface mgmt
@@ -24,7 +23,7 @@
/***/
/* Function 0x00   */
WERROR mgmt_inq_if_ids (
-   [out,unique]   rpc_if_id_vector_t  *if_id_vector
+   [out]   rpc_if_id_vector_t  **if_id_vector
);
 
 

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm  
2007-01-16 14:32:56 UTC (rev 20829)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm  
2007-01-16 14:44:23 UTC (rev 20830)
@@ -186,7 +186,7 @@
return NT_STATUS_OK;
 }
 
-static const struct dcesrv_interface $name\_interface = {
+const struct dcesrv_interface dcesrv\_$name\_interface = {
.name   = \$name\,
.syntax_id  = {.print_uuid($uuid).,$if_version},
.bind   = $name\__op_bind,
@@ -217,7 +217,7 @@
NTSTATUS ret;
const char *name = dcerpc_table_$name.endpoints-names[i];
 
-   ret = dcesrv_interface_register(dce_ctx, name, 
$name\_interface, NULL);
+   ret = dcesrv_interface_register(dce_ctx, name, 
dcesrv_$name\_interface, NULL);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(1,(\$name\_op_init_server: failed to register 
endpoint \'%s\'\\n\,name));
return ret;
@@ -229,9 +229,9 @@
 
 static BOOL $name\__op_interface_by_uuid(struct dcesrv_interface *iface, const 
struct GUID *uuid, uint32_t if_version)
 {
-   if ($name\_interface.syntax_id.if_version == if_version 
-   GUID_equal(\$name\_interface.syntax_id.uuid, uuid)) {
-   memcpy(iface,$name\_interface, sizeof(*iface));
+   if (dcesrv_$name\_interface.syntax_id.if_version == if_version 
+   GUID_equal(\dcesrv\_$name\_interface.syntax_id.uuid, uuid)) {
+   memcpy(iface,dcesrv\_$name\_interface, sizeof(*iface));
return True;
}
 
@@ -240,8 +240,8 @@
 
 static BOOL $name\__op_interface_by_name(struct dcesrv_interface *iface, const 
char *name)
 {
-   if (strcmp($name\_interface.name, name)==0) {
-   memcpy(iface,$name\_interface, sizeof(*iface));
+   if (strcmp(dcesrv_$name\_interface.name, name)==0) {
+   memcpy(iface, dcesrv_$name\_interface, sizeof(*iface));
return True;
}
 

Modified: branches/SAMBA_4_0/source/rpc_server/config.mk
===
--- branches/SAMBA_4_0/source/rpc_server/config.mk  2007-01-16 14:32:56 UTC 
(rev 20829)
+++ branches/SAMBA_4_0/source/rpc_server/config.mk  2007-01-16 14:44:23 UTC 
(rev 20830)
@@ -35,17 +35,6 @@
 
 
 
-# Start MODULE dcerpc_mgmt
-[MODULE::dcerpc_mgmt]
-INIT_FUNCTION = dcerpc_server_mgmt_init
-SUBSYSTEM = dcerpc_server
-OBJ_FILES = \
-   mgmt/dcesrv_mgmt.o
-PUBLIC_DEPENDENCIES = NDR_MGMT
-# End MODULE dcerpc_mgmt

svn commit: samba r20831 - in branches/SAMBA_4_0: . source/torture/rpc

[jelmer]

Author: jelmer
Date: 2007-01-16 15:18:53 + (Tue, 16 Jan 2007)
New Revision: 20831

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20831

Log:
Update RPC-SCANNER as well after IDL changes.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/torture/rpc/scanner.c


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/torture/rpc/scanner.c
===
--- branches/SAMBA_4_0/source/torture/rpc/scanner.c 2007-01-16 14:44:23 UTC 
(rev 20830)
+++ branches/SAMBA_4_0/source/torture/rpc/scanner.c 2007-01-16 15:18:53 UTC 
(rev 20831)
@@ -100,7 +100,10 @@
 {
NTSTATUS status;
struct mgmt_inq_if_ids r;
+   struct rpc_if_id_vector_t *vector;
int i;
+
+   r.out.if_id_vector = vector;

status = dcerpc_mgmt_inq_if_ids(p, mem_ctx, r);
if (!NT_STATUS_IS_OK(status)) {
@@ -118,9 +121,9 @@
return False;
}
 
-   for (i=0;ir.out.if_id_vector-count;i++) {
+   for (i=0;ivector-count;i++) {
const char *uuid;
-   struct dcerpc_syntax_id *id = r.out.if_id_vector-if_id[i].id;
+   struct dcerpc_syntax_id *id = vector-if_id[i].id;
if (!id) continue;
 
uuid = GUID_string(mem_ctx, id-uuid),

svn commit: samba r20832 - in branches/SAMBA_3_0: . source/client source/libmsrpc source/librpc/gen_ndr source/librpc/idl source/libsmb source/rpc_server source/rpcclient source/utils

[jelmer]

Author: jelmer
Date: 2007-01-16 15:42:03 + (Tue, 16 Jan 2007)
New Revision: 20832

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20832

Log:
Remove extra pointers previously added to unique [out] pointers. Instead, 
add [ref] pointers where necessary (top-level [ref] pointers, 
by spec, don't appear on the wire). 

This brings us closer to the DCE/RPC standard again.

Modified:
   branches/SAMBA_3_0/
   branches/SAMBA_3_0/source/client/client.c
   branches/SAMBA_3_0/source/libmsrpc/cac_winreg.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/cli_dfs.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/cli_dfs.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/cli_echo.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/cli_echo.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/cli_lsa.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/cli_lsa.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/cli_netlogon.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/cli_netlogon.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/cli_srvsvc.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/cli_srvsvc.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/cli_svcctl.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/cli_svcctl.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/cli_unixinfo.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/cli_unixinfo.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/cli_winreg.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/cli_winreg.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/cli_wkssvc.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/cli_wkssvc.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_winreg.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_winreg.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/winreg.h
   branches/SAMBA_3_0/source/librpc/idl/unixinfo.idl
   branches/SAMBA_3_0/source/librpc/idl/winreg.idl
   branches/SAMBA_3_0/source/libsmb/libsmbclient.c
   branches/SAMBA_3_0/source/rpc_server/srv_winreg_nt.c
   branches/SAMBA_3_0/source/rpcclient/cmd_dfs.c
   branches/SAMBA_3_0/source/rpcclient/cmd_echo.c
   branches/SAMBA_3_0/source/rpcclient/cmd_srvsvc.c
   branches/SAMBA_3_0/source/rpcclient/cmd_unixinfo.c
   branches/SAMBA_3_0/source/utils/net_rpc.c
   branches/SAMBA_3_0/source/utils/net_rpc_registry.c
   branches/SAMBA_3_0/source/utils/smbtree.c


Changeset:
Sorry, the patch is too large (3197 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20832

svn commit: samba r20834 - in branches/SAMBA_4_0: . source/pidl/lib/Parse/Pidl source/pidl/lib/Parse/Pidl/Samba3

[jelmer]

Author: jelmer
Date: 2007-01-16 15:51:37 + (Tue, 16 Jan 2007)
New Revision: 20834

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20834

Log:
No longer generate extra pointers for top-level [out] unique pointers.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4.pm


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm   
2007-01-16 15:50:25 UTC (rev 20833)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm   
2007-01-16 15:51:37 UTC (rev 20834)
@@ -11,7 +11,7 @@
 use Parse::Pidl::Typelist qw(hasType getType mapType scalar_is_reference);
 use Parse::Pidl::Util qw(has_property is_constant);
 use Parse::Pidl::NDR qw(GetPrevLevel GetNextLevel ContainsDeferred);
-use Parse::Pidl::Samba4 qw(DeclLong_cli IsUniqueOut);
+use Parse::Pidl::Samba4 qw(DeclLong);
 
 use vars qw($VERSION);
 $VERSION = '0.01';
@@ -35,7 +35,7 @@
my $ufn = DCERPC_.uc($fn-{NAME});
 
foreach (@{$fn-{ELEMENTS}}) {
-   $defargs .= ,  . DeclLong_cli($_);
+   $defargs .= ,  . DeclLong($_);
}
fn_declare NTSTATUS rpccli_$fn-{NAME}(struct rpc_pipe_client *cli, 
TALLOC_CTX *mem_ctx$defargs);
pidl {;
@@ -47,12 +47,7 @@
 
foreach (@{$fn-{ELEMENTS}}) {
if (grep(/in/, @{$_-{DIRECTION}})) {
-   if ( IsUniqueOut($_) ) {
-   pidl r.in.$_-{NAME} = *$_-{NAME};;
-   }
-   else {
pidl r.in.$_-{NAME} = $_-{NAME};;
-   }
} 
}
 
@@ -83,8 +78,12 @@
 
fatal($e, [out] argument is not a pointer or array) if 
($e-{LEVELS}[0]-{TYPE} ne POINTER and $e-{LEVELS}[0]-{TYPE} ne ARRAY);
 
-   if ( IsUniqueOut($e) ) {
-   pidl *$e-{NAME} = r.out.$e-{NAME};;
+   if ( ($e-{LEVELS}[0]-{TYPE} eq POINTER)  
($e-{LEVELS}[0]-{POINTER_TYPE} eq unique) ) {
+   pidl if ( $e-{NAME} ) {;
+   indent;
+   pidl *$e-{NAME} = *r.out.$e-{NAME};;
+   deindent;
+   pidl };
} else {
pidl *$e-{NAME} = *r.out.$e-{NAME};;
}

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4.pm 2007-01-16 
15:50:25 UTC (rev 20833)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4.pm 2007-01-16 
15:51:37 UTC (rev 20834)
@@ -7,7 +7,7 @@
 
 require Exporter;
 @ISA = qw(Exporter);
[EMAIL PROTECTED] = qw(is_intree choose_header DeclLong DeclLong_cli 
IsUniqueOut);
[EMAIL PROTECTED] = qw(is_intree choose_header DeclLong);
 
 use Parse::Pidl::Util qw(has_property is_constant);
 use Parse::Pidl::Typelist qw(mapType scalar_is_reference);
@@ -32,19 +32,9 @@
return #include $out;
 }
 
-sub IsUniqueOut($)
+sub DeclLong($)
 {
-my ($e) = shift;
-
-return grep(/out/, @{$e-{DIRECTION}}) 
-   ((($e-{LEVELS}[0]-{TYPE} eq POINTER) 
- ($e-{LEVELS}[0]-{POINTER_TYPE} eq unique)) ||
-($e-{LEVELS}[0]-{TYPE} eq ARRAY));
-}
-
-sub DeclLong_int($$)
-{
-   my($element,$cli) = @_;
+   my($element) = shift;
my $ret = ;
 
if (has_property($element, represent_as)) {
@@ -67,9 +57,6 @@
not has_property($element, charset);
$numstar++;
}
-   if ($cli  IsUniqueOut($element)) {
-   $numstar++;
-   }
$ret.=* foreach (1..$numstar);
}
$ret.=$element-{NAME};
@@ -81,14 +68,4 @@
return $ret;
 }
 
-sub DeclLong($)
-{
-return DeclLong_int($_, 0);
-}
-
-sub DeclLong_cli($)
-{
-return DeclLong_int($_, 1);
-}
-
 1;

svn commit: samba r20836 - in branches/SAMBA_4_0: . source/pidl/lib/Parse/Pidl/Samba3

[jelmer]

Author: jelmer
Date: 2007-01-16 17:45:33 + (Tue, 16 Jan 2007)
New Revision: 20836

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20836

Log:
Use real type name, to fix compilation with -WC++-compat
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm   
2007-01-16 17:39:13 UTC (rev 20835)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm   
2007-01-16 17:45:33 UTC (rev 20836)
@@ -8,9 +8,9 @@
 
 use strict;
 use Parse::Pidl qw(warning fatal);
-use Parse::Pidl::Typelist qw(hasType getType mapType scalar_is_reference);
-use Parse::Pidl::Util qw(has_property ParseExpr is_constant);
-use Parse::Pidl::NDR qw(GetPrevLevel GetNextLevel ContainsDeferred);
+use Parse::Pidl::Typelist qw(mapType scalar_is_reference);
+use Parse::Pidl::Util qw(ParseExpr has_property is_constant);
+use Parse::Pidl::NDR qw(GetNextLevel);
 use Parse::Pidl::Samba4 qw(DeclLong);
 
 use vars qw($VERSION);
@@ -25,21 +25,59 @@
 sub pidl_hdr($) { $res_hdr .= (shift).\n; }
 sub fn_declare($) { my ($n) = @_; pidl $n; pidl_hdr $n;; }
 
+sub DeclLevel($$) 
+{
+   sub DeclLevel($$);
+   my ($e, $l) = @_;
+
+   my $ret = ;
+
+   if (has_property($e, charset)) {
+   $ret.=const char;
+   } else {
+   $ret.=mapType($e-{TYPE});
+   }
+
+   my $numstar = $e-{ORIGINAL}-{POINTERS};
+   if ($numstar = 1) {
+   $numstar-- if scalar_is_reference($e-{TYPE});
+   }
+   foreach (@{$e-{ORIGINAL}-{ARRAY_LEN}})
+   {
+   next if is_constant($_) and 
+   not has_property($e, charset);
+   $numstar++;
+   }
+   $numstar -= $l;
+   die (Too few pointers) if $numstar  0;
+   if ($numstar  0) 
+   {
+   $ret.= ;
+   $ret.=* foreach (1..$numstar);
+   }
+
+   return $ret;
+}
+
 sub AllocOutVar()
 {
my ($e, $mem_ctx, $name, $env) = @_;
 
my $l = $e-{LEVELS}[0];
+   my $nl = $l;
 
if ($l-{TYPE} eq POINTER) {
-   $l = GetNextLevel($e, $l);
+   $nl = GetNextLevel($e, $l);
}
 
if ($l-{TYPE} eq ARRAY) {
my $size = ParseExpr($l-{SIZE_IS}, $env, $e);
-   pidl $name = talloc_zero_size($mem_ctx, sizeof(*$name) * 
$size);;
+   pidl $name = talloc_zero_array($mem_ctx,  . DeclLevel($e, 1) 
. , $size);;
+   } elsif ($l-{TYPE} eq POINTER and $nl-{TYPE} eq ARRAY) {
+   my $size = ParseExpr($nl-{SIZE_IS}, $env, $e);
+   pidl $name = talloc_zero_array($mem_ctx,  . DeclLevel($e, 1) 
. , $size);;
} else {
-   pidl $name = talloc_zero_size($mem_ctx, sizeof(*$name));;
+   pidl $name = talloc_zero($mem_ctx,  . DeclLevel($e, 1) . );;
}
 
pidl if ($name == NULL) {;
@@ -101,7 +139,8 @@
my @dir = @{$_-{DIRECTION}};
if (grep(/in/, @dir) and grep(/out/, @dir)) {
pidl r.out.$_-{NAME} = r.in.$_-{NAME};;
-   } elsif (grep(/out/, @dir)) {
+   } elsif (grep(/out/, @dir) and not 
+has_property($_, represent_as)) {
AllocOutVar($_, mem_ctx, r.out.$_-{NAME}, \%env);
}
if (grep(/in/, @dir)) { $ret .= , r.in.$_-{NAME}; }

svn commit: samba r20837 - in branches/SAMBA_3_0: . source/librpc/gen_ndr

[jelmer]

Author: jelmer
Date: 2007-01-16 17:48:59 + (Tue, 16 Jan 2007)
New Revision: 20837

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20837

Log:
Use real type name, to fix compilation with -WC++-compat
Modified:
   branches/SAMBA_3_0/
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_dfs.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_echo.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_eventlog.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_lsa.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_netlogon.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_srvsvc.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_svcctl.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_unixinfo.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_winreg.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_wkssvc.c


Changeset:
Sorry, the patch is too large (1599 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20837

svn commit: samba r20839 - in branches/SAMBA_3_0: . source/librpc/ndr source/rpcclient

[jelmer]

Author: jelmer
Date: 2007-01-16 18:26:02 + (Tue, 16 Jan 2007)
New Revision: 20839

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20839

Log:
Fix other C++ warnings
Modified:
   branches/SAMBA_3_0/
   branches/SAMBA_3_0/source/librpc/ndr/libndr.h
   branches/SAMBA_3_0/source/rpcclient/cmd_echo.c


Changeset:

Property changes on: branches/SAMBA_3_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_3_0/source/librpc/ndr/libndr.h
===
--- branches/SAMBA_3_0/source/librpc/ndr/libndr.h   2007-01-16 18:05:37 UTC 
(rev 20838)
+++ branches/SAMBA_3_0/source/librpc/ndr/libndr.h   2007-01-16 18:26:02 UTC 
(rev 20839)
@@ -274,7 +274,7 @@
 
 
 #define NDR_PUSH_ALLOC_SIZE(ndr, s, size) do { \
-   (s) = talloc_size(ndr, size); \
+   (s) = talloc_array(ndr, uint8, size); \
if (!(s)) return ndr_push_error(ndr, NDR_ERR_ALLOC, push alloc %u 
failed: %s\n, (unsigned)size, __location__); \
 } while (0)
 

Modified: branches/SAMBA_3_0/source/rpcclient/cmd_echo.c
===
--- branches/SAMBA_3_0/source/rpcclient/cmd_echo.c  2007-01-16 18:05:37 UTC 
(rev 20838)
+++ branches/SAMBA_3_0/source/rpcclient/cmd_echo.c  2007-01-16 18:26:02 UTC 
(rev 20839)
@@ -101,7 +101,7 @@
 
size = atoi(argv[1]);
 
-   out_data = SMB_MALLOC(size);
+   out_data = SMB_MALLOC_ARRAY(uint8, size);
result = rpccli_echo_SourceData(cli, mem_ctx, size, out_data);
 
if (!NT_STATUS_IS_OK(result))

svn commit: samba r20850 - in branches/SAMBA_4_0: . source/pidl/lib/Parse/Pidl/Samba4 source/pidl/lib/Parse/Pidl/Samba4/NDR source/rpc_server source/rpc_server/drsuapi source/rpc_server/echo source/rp

[jelmer]

Author: jelmer
Date: 2007-01-17 14:49:36 + (Wed, 17 Jan 2007)
New Revision: 20850

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20850

Log:
Prefix all server calls with dcesrv_
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Template.pm
   branches/SAMBA_4_0/source/rpc_server/dcesrv_mgmt.c
   branches/SAMBA_4_0/source/rpc_server/drsuapi/dcesrv_drsuapi.c
   branches/SAMBA_4_0/source/rpc_server/echo/rpc_echo.c
   branches/SAMBA_4_0/source/rpc_server/epmapper/rpc_epmapper.c
   branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c
   branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c
   branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c
   branches/SAMBA_4_0/source/rpc_server/samr/samr_password.c
   branches/SAMBA_4_0/source/rpc_server/spoolss/dcesrv_spoolss.c
   branches/SAMBA_4_0/source/rpc_server/srvsvc/dcesrv_srvsvc.c
   branches/SAMBA_4_0/source/rpc_server/unixinfo/dcesrv_unixinfo.c
   branches/SAMBA_4_0/source/rpc_server/winreg/rpc_winreg.c
   branches/SAMBA_4_0/source/rpc_server/wkssvc/dcesrv_wkssvc.c


Changeset:
Sorry, the patch is too large (5474 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20850

svn commit: samba r20875 - in branches/SAMBA_3_0: . source/librpc/gen_ndr source/rpc_server

[jelmer]

Author: jelmer
Date: 2007-01-18 10:18:59 + (Thu, 18 Jan 2007)
New Revision: 20875

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20875

Log:
Pass DCE/RPC server call arguments as a struct rather than as separate 
arguments.

This makes it a bit more similar to the Samba4 code.

Modified:
   branches/SAMBA_3_0/
   branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_winreg.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_dfs.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_dfs.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_echo.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_echo.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_eventlog.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_eventlog.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_initshutdown.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_initshutdown.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_lsa.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_lsa.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_netlogon.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_netlogon.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_srvsvc.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_srvsvc.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_svcctl.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_svcctl.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_unixinfo.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_unixinfo.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_winreg.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_winreg.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_wkssvc.c
   branches/SAMBA_3_0/source/librpc/gen_ndr/srv_wkssvc.h
   branches/SAMBA_3_0/source/rpc_server/srv_dfs_nt.c
   branches/SAMBA_3_0/source/rpc_server/srv_echo_nt.c
   branches/SAMBA_3_0/source/rpc_server/srv_initshutdown_nt.c
   branches/SAMBA_3_0/source/rpc_server/srv_lsa_nt.c
   branches/SAMBA_3_0/source/rpc_server/srv_srvsvc_nt.c
   branches/SAMBA_3_0/source/rpc_server/srv_unixinfo_nt.c
   branches/SAMBA_3_0/source/rpc_server/srv_winreg_nt.c
   branches/SAMBA_3_0/source/rpc_server/srv_wkssvc_nt.c


Changeset:
Sorry, the patch is too large (7686 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20875

svn commit: samba r20942 - in branches/SAMBA_4_0: . source source/build/m4 source/build/smb_build source/pidl source/pidl/lib/Parse/Pidl source/pidl/lib/Parse/Pidl/Samba4

[jelmer]

Author: jelmer
Date: 2007-01-22 00:04:59 + (Mon, 22 Jan 2007)
New Revision: 20942

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20942

Log:
Simplify handling of systems that don't support negative enum values by using 
an ifdef rather than a pidl argument.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/build/m4/check_cc.m4
   branches/SAMBA_4_0/source/build/m4/check_perl.m4
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/main.mk
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Util.pm
   branches/SAMBA_4_0/source/pidl/pidl


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/build/m4/check_cc.m4
===
--- branches/SAMBA_4_0/source/build/m4/check_cc.m4  2007-01-21 23:37:32 UTC 
(rev 20941)
+++ branches/SAMBA_4_0/source/build/m4/check_cc.m4  2007-01-22 00:04:59 UTC 
(rev 20942)
@@ -47,8 +47,7 @@
 ],

SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes,SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=no)])
 if test x$SMB_BUILD_CC_NEGATIVE_ENUM_VALUES != xyes; then
-   AC_MSG_WARN([using --unit-enums for pidl])
-   PIDL_ARGS=$PIDL_ARGS --uint-enums
+   AC_DEFINE(USE_UINT_ENUMS, 1, [Whether the compiler has uint enum 
support])
 fi
 
 AC_MSG_CHECKING([for test routines])

Modified: branches/SAMBA_4_0/source/build/m4/check_perl.m4
===
--- branches/SAMBA_4_0/source/build/m4/check_perl.m42007-01-21 23:37:32 UTC 
(rev 20941)
+++ branches/SAMBA_4_0/source/build/m4/check_perl.m42007-01-22 00:04:59 UTC 
(rev 20942)
@@ -26,6 +26,3 @@
 export PERL
 
 AC_PATH_PROG(YAPP, yapp, false)
-
-PIDL_ARGS=
-AC_SUBST(PIDL_ARGS)

Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm   2007-01-21 
23:37:32 UTC (rev 20941)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm   2007-01-22 
00:04:59 UTC (rev 20942)
@@ -154,7 +154,6 @@
 LEX=$self-{config}-{LEX}
 YACC=$self-{config}-{YACC}
 YAPP=$self-{config}-{YAPP}
-PIDL_ARGS=$self-{config}-{PIDL_ARGS}
 
 GCOV=$self-{config}-{GCOV}
 

Modified: branches/SAMBA_4_0/source/main.mk
===
--- branches/SAMBA_4_0/source/main.mk   2007-01-21 23:37:32 UTC (rev 20941)
+++ branches/SAMBA_4_0/source/main.mk   2007-01-22 00:04:59 UTC (rev 20942)
@@ -208,10 +208,10 @@
$(IDL_NDR_EJS_C_FILES) $(IDL_NDR_EJS_H_FILES): idl
 
 idl_full: pidl/lib/Parse/Pidl/IDL.pm pidl/lib/Parse/Pidl/Expr.pm 
-   @CPP=$(CPP) PERL=$(PERL) srcdir=$(srcdir) 
$(srcdir)/script/build_idl.sh FULL $(PIDL_ARGS)
+   @CPP=$(CPP) PERL=$(PERL) srcdir=$(srcdir) 
$(srcdir)/script/build_idl.sh FULL
 
 idl: pidl/lib/Parse/Pidl/IDL.pm pidl/lib/Parse/Pidl/Expr.pm 
-   @CPP=$(CPP) PERL=$(PERL) srcdir=$(srcdir) 
$(srcdir)/script/build_idl.sh PARTIAL $(PIDL_ARGS)
+   @CPP=$(CPP) PERL=$(PERL) srcdir=$(srcdir) 
$(srcdir)/script/build_idl.sh PARTIAL 
 
 pidl/lib/Parse/Pidl/IDL.pm: pidl/idl.yp
-$(YAPP) -m 'Parse::Pidl::IDL' -o pidl/lib/Parse/Pidl/IDL.pm 
pidl/idl.yp ||\

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm  
2007-01-21 23:37:32 UTC (rev 20941)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm  
2007-01-22 00:04:59 UTC (rev 20942)
@@ -118,8 +118,8 @@
 my($enum,$name) = @_;
 my $first = 1;
 
-if (not Parse::Pidl::Util::useUintEnums()) {
-   pidl enum $name {\n;
+   pidl #ifndef USE_UINT_ENUMS\n;
+   pidl enum $name {\n;
$tab_depth++;
foreach my $e (@{$enum-{ELEMENTS}}) {
unless ($first) { pidl ,\n; }
@@ -129,9 +129,9 @@
}
pidl \n;
$tab_depth--;
-   pidl };
-} else {
-my $count = 0;
+   pidl };\n;
+   pidl #else\n;
+   my $count = 0;
pidl enum $name { __donnot_use_enum_$name

svn commit: samba r20954 - in branches/SAMBA_4_0: . source/torture

[jelmer]

Author: jelmer
Date: 2007-01-22 18:16:01 + (Mon, 22 Jan 2007)
New Revision: 20954

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20954

Log:
Add lcov target, fix gcov.

Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/torture/config.mk


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/torture/config.mk
===
--- branches/SAMBA_4_0/source/torture/config.mk 2007-01-22 18:15:54 UTC (rev 
20953)
+++ branches/SAMBA_4_0/source/torture/config.mk 2007-01-22 18:16:01 UTC (rev 
20954)
@@ -338,9 +338,18 @@
 
 gcov: 
@$(MAKE) test \
+   HOSTCC_CFLAGS=$(HOSTCC_CFLAGS) $(GCOV_FLAGS) \
CFLAGS=$(CFLAGS) $(GCOV_FLAGS) \
-   LD_FLAGS=$(LD_FLAGS) $(GCOV_FLAGS) \
-   LIBS=$(LIBS) $(GCOV_LIBS)
+   LDFLAGS=$(LDFLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)
for I in $(sort $(dir $(ALL_OBJS))); \
do $(GCOV) -p -o $$I $$I/*.c; \
done
+
+lcov:
+   @$(MAKE) test \
+   HOSTCC_CFLAGS=$(HOSTCC_CFLAGS) $(GCOV_FLAGS) \
+   CFLAGS=$(CFLAGS) $(GCOV_FLAGS) \
+   LDFLAGS=$(LDFLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)
+   rm **/{lex,parse}.{gcda,gcno}
+   lcov --base-directory `pwd` --directory . --capture --output-file 
samba.info
+   genhtml -o coverage samba.info

svn commit: samba r20955 - in branches/SAMBA_4_0: . source/torture/local

[jelmer]

Author: jelmer
Date: 2007-01-22 18:24:24 + (Mon, 22 Jan 2007)
New Revision: 20955

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20955

Log:
Add tests
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/torture/local/ndr.c


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/torture/local/ndr.c
===
--- branches/SAMBA_4_0/source/torture/local/ndr.c   2007-01-22 18:16:01 UTC 
(rev 20954)
+++ branches/SAMBA_4_0/source/torture/local/ndr.c   2007-01-22 18:24:24 UTC 
(rev 20955)
@@ -70,6 +70,116 @@
return true;
 }
 
+static bool test_guid_from_string_valid(struct torture_context *tctx)
+{
+   /* FIXME */
+   return true;
+}
+
+static bool test_guid_from_string_null(struct torture_context *tctx)
+{
+   struct GUID guid;
+   torture_assert_ntstatus_equal(tctx, NT_STATUS_INVALID_PARAMETER, 
+ 
GUID_from_string(NULL, guid), 
+ NULL 
failed);
+   return true;
+}
+
+static bool test_guid_from_string_invalid(struct torture_context *tctx)
+{
+   struct GUID g1;
+   torture_assert_ntstatus_equal(tctx, NT_STATUS_INVALID_PARAMETER, 
+ 
GUID_from_string(bla, g1),
+ parameter 
not invalid);
+   return true;
+}  
+
+static bool test_guid_from_string(struct torture_context *tctx)
+{
+   struct GUID g1, exp;
+   torture_assert_ntstatus_ok(tctx,
+  
GUID_from_string(0001-0002-0003-0405-060708090a0b, g1),
+  invalid return 
code);
+   exp.time_low = 1;
+   exp.time_mid = 2;
+   exp.time_hi_and_version = 3;
+   exp.clock_seq[0] = 4;
+   exp.clock_seq[1] = 5;
+   exp.node[0] = 6;
+   exp.node[1] = 7;
+   exp.node[2] = 8;
+   exp.node[3] = 9;
+   exp.node[4] = 10;
+   exp.node[5] = 11;
+   torture_assert(tctx, GUID_equal(g1, exp), UUID parsed incorrectly);
+   torture_assert_ntstatus_ok(tctx,
+  
GUID_from_string({0001-0002-0003-0405-060708090a0b}, g1),
+  invalid return 
code);
+   torture_assert(tctx, GUID_equal(g1, exp), UUID parsed incorrectly);
+
+   return true;
+}
+
+static bool test_guid_string_valid(struct torture_context *tctx)
+{
+   struct GUID g;
+   g.time_low = 1;
+   g.time_mid = 2;
+   g.time_hi_and_version = 3;
+   g.clock_seq[0] = 4;
+   g.clock_seq[1] = 5;
+   g.node[0] = 6;
+   g.node[1] = 7;
+   g.node[2] = 8;
+   g.node[3] = 9;
+   g.node[4] = 10;
+   g.node[5] = 11;
+   torture_assert_str_equal(tctx, 0001-0002-0003-0405-060708090a0b, 
GUID_string(tctx, g), 
+parsing guid failed);
+   return true;
+}
+
+static bool test_guid_string2_valid(struct torture_context *tctx)
+{
+   struct GUID g;
+   g.time_low = 1;
+   g.time_mid = 2;
+   g.time_hi_and_version = 3;
+   g.clock_seq[0] = 4;
+   g.clock_seq[1] = 5;
+   g.node[0] = 6;
+   g.node[1] = 7;
+   g.node[2] = 8;
+   g.node[3] = 9;
+   g.node[4] = 10;
+   g.node[5] = 11;
+   torture_assert_str_equal(tctx, 
{0001-0002-0003-0405-060708090a0b}, GUID_string2(tctx, g), 
+parsing guid failed);
+   return true;
+}
+
+static bool test_compare_uuid(struct torture_context *tctx)
+{
+   struct GUID g1, g2;
+   ZERO_STRUCT(g1); ZERO_STRUCT(g2);
+   torture_assert_int_equal(tctx, 0, GUID_compare(g1, g2), 
+GUIDs not equal);
+   g1.time_low = 1;
+   torture_assert_int_equal(tctx, 1, GUID_compare(g1, g2

svn commit: samba r20959 - in branches/SAMBA_4_0: .

[jelmer]

Author: jelmer
Date: 2007-01-22 23:38:55 + (Mon, 22 Jan 2007)
New Revision: 20959

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20959

Log:
Add ignore entries
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/.bzrignore


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/.bzrignore
===
--- branches/SAMBA_4_0/.bzrignore   2007-01-22 23:09:07 UTC (rev 20958)
+++ branches/SAMBA_4_0/.bzrignore   2007-01-22 23:38:55 UTC (rev 20959)
@@ -150,3 +150,13 @@
 source/heimdal/lib/roken/err.h
 source/scripting/ejs/ejsnet/proto.h
 source/heimdal/lib/hx509/asn1_*.c
+*.gcno
+*.gcda
+source/bin/shared/*.so*
+*.1
+*.3
+*.8
+source/pidl/blib
+source/pidl/pm_to_blib
+source/coverage
+source/st

svn commit: samba r20961 - in branches/SAMBA_4_0: . source/torture

[jelmer]

Author: jelmer
Date: 2007-01-23 00:26:03 + (Tue, 23 Jan 2007)
New Revision: 20961

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20961

Log:
Fix lcov
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/.bzrignore
   branches/SAMBA_4_0/source/torture/config.mk


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/.bzrignore
===
--- branches/SAMBA_4_0/.bzrignore   2007-01-23 00:06:33 UTC (rev 20960)
+++ branches/SAMBA_4_0/.bzrignore   2007-01-23 00:26:03 UTC (rev 20961)
@@ -160,3 +160,4 @@
 source/pidl/pm_to_blib
 source/coverage
 source/st
+source/samba.info

Modified: branches/SAMBA_4_0/source/torture/config.mk
===
--- branches/SAMBA_4_0/source/torture/config.mk 2007-01-23 00:06:33 UTC (rev 
20960)
+++ branches/SAMBA_4_0/source/torture/config.mk 2007-01-23 00:26:03 UTC (rev 
20961)
@@ -336,20 +336,18 @@
 GCOV_FLAGS = -ftest-coverage -fprofile-arcs
 GCOV_LIBS = -lgcov
 
-gcov: 
+test_cov:
@$(MAKE) test \
HOSTCC_CFLAGS=$(HOSTCC_CFLAGS) $(GCOV_FLAGS) \
CFLAGS=$(CFLAGS) $(GCOV_FLAGS) \
LDFLAGS=$(LDFLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)
+
+gcov: test_cov
for I in $(sort $(dir $(ALL_OBJS))); \
do $(GCOV) -p -o $$I $$I/*.c; \
done
 
-lcov:
-   @$(MAKE) test \
-   HOSTCC_CFLAGS=$(HOSTCC_CFLAGS) $(GCOV_FLAGS) \
-   CFLAGS=$(CFLAGS) $(GCOV_FLAGS) \
-   LDFLAGS=$(LDFLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)
-   rm **/{lex,parse}.{gcda,gcno}
+lcov: test_cov
+   rm heimdal/lib/*/{lex,parse}.{gcda,gcno}
lcov --base-directory `pwd` --directory . --capture --output-file 
samba.info
genhtml -o coverage samba.info

svn commit: samba r20962 - in branches/SAMBA_4_0: . source/torture/local

[jelmer]

Author: jelmer
Date: 2007-01-23 00:39:12 + (Tue, 23 Jan 2007)
New Revision: 20962

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20962

Log:
Fix lcov
Added:
   branches/SAMBA_4_0/source/torture/local/tdr.c
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/torture/local/config.mk
   branches/SAMBA_4_0/source/torture/local/local.c


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/torture/local/config.mk
===
--- branches/SAMBA_4_0/source/torture/local/config.mk   2007-01-23 00:26:03 UTC 
(rev 20961)
+++ branches/SAMBA_4_0/source/torture/local/config.mk   2007-01-23 00:39:12 UTC 
(rev 20962)
@@ -26,12 +26,14 @@
util_file.o \
sddl.o \
ndr.o \
+   tdr.o \
event.o \
local.o \
dbspeed.o \
torture.o
 PUBLIC_DEPENDENCIES = \
RPC_NDR_ECHO \
+   TDR \
LIBCLI_SMB \
MESSAGING \
ICONV \

Modified: branches/SAMBA_4_0/source/torture/local/local.c
===
--- branches/SAMBA_4_0/source/torture/local/local.c 2007-01-23 00:26:03 UTC 
(rev 20961)
+++ branches/SAMBA_4_0/source/torture/local/local.c 2007-01-23 00:39:12 UTC 
(rev 20962)
@@ -40,6 +40,7 @@
torture_local_resolve,
torture_local_sddl,
torture_local_ndr, 
+   torture_local_tdr, 
torture_local_event, 
torture_local_torture,
torture_local_dbspeed, 

Added: branches/SAMBA_4_0/source/torture/local/tdr.c
===
--- branches/SAMBA_4_0/source/torture/local/tdr.c   2007-01-23 00:26:03 UTC 
(rev 20961)
+++ branches/SAMBA_4_0/source/torture/local/tdr.c   2007-01-23 00:39:12 UTC 
(rev 20962)
@@ -0,0 +1,61 @@
+/* 
+   Unix SMB/CIFS implementation.
+   test suite for basic tdr functions
+
+   Copyright (C) Jelmer Vernooij 2007
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include includes.h
+#include torture/torture.h
+#include lib/tdr/tdr.h
+
+static bool test_push_uint8(struct torture_context *tctx)
+{
+   uint8_t v = 4;
+   struct tdr_push *tdr = talloc_zero(tctx, struct tdr_push);
+
+   torture_assert_ntstatus_ok(tctx, tdr_push_uint8(tdr, v), push 
failed);
+   torture_assert_int_equal(tctx, tdr-data.length, 1, length incorrect);
+   torture_assert_int_equal(tctx, tdr-data.data[0], 4, data incorrect);
+   return true;
+}
+
+static bool test_pull_uint8(struct torture_context *tctx)
+{
+   uint8_t d = 2;
+   uint8_t l;
+   struct tdr_pull tdr;
+   tdr.data.data = d;
+   tdr.data.length = 1;
+   tdr.offset = 0;
+   tdr.flags = 0;
+   torture_assert_ntstatus_ok(tctx, tdr_pull_uint8(tdr, tctx, l), 
+  pull failed);
+   torture_assert_int_equal(tctx, 1, tdr.offset, 
+offset invalid);
+   return true;
+}
+
+struct torture_suite *torture_local_tdr(TALLOC_CTX *mem_ctx)
+{
+   struct torture_suite *suite = torture_suite_create(mem_ctx, TDR);
+
+   torture_suite_add_simple_test(suite, pull_uint8, test_pull_uint8

svn commit: samba r20963 - in branches/SAMBA_4_0: . source/libcli/raw source/librpc/ndr source/script/tests

[jelmer]

Author: jelmer
Date: 2007-01-23 01:29:17 + (Tue, 23 Jan 2007)
New Revision: 20963

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20963

Log:
remove unused functions, run LOCAL-TDR by default

Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/.bzrignore
   branches/SAMBA_4_0/source/libcli/raw/rawacl.c
   branches/SAMBA_4_0/source/librpc/ndr/ndr.c
   branches/SAMBA_4_0/source/script/tests/test_local.sh


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/.bzrignore
===
--- branches/SAMBA_4_0/.bzrignore   2007-01-23 00:39:12 UTC (rev 20962)
+++ branches/SAMBA_4_0/.bzrignore   2007-01-23 01:29:17 UTC (rev 20963)
@@ -161,3 +161,4 @@
 source/coverage
 source/st
 source/samba.info
+source/pidl/cover_db

Modified: branches/SAMBA_4_0/source/libcli/raw/rawacl.c
===
--- branches/SAMBA_4_0/source/libcli/raw/rawacl.c   2007-01-23 00:39:12 UTC 
(rev 20962)
+++ branches/SAMBA_4_0/source/libcli/raw/rawacl.c   2007-01-23 01:29:17 UTC 
(rev 20963)
@@ -131,12 +131,12 @@
nt.in.params.data = params;
nt.in.params.length = 8;
 
-   ndr = ndr_push_init();
+   ndr = ndr_push_init_ctx(NULL);
if (!ndr) return NULL;
 
status = ndr_push_security_descriptor(ndr, NDR_SCALARS|NDR_BUFFERS, 
io-set_secdesc.in.sd);
if (!NT_STATUS_IS_OK(status)) {
-   ndr_push_free(ndr);
+   talloc_free(ndr);
return NULL;
}
 
@@ -144,7 +144,7 @@
 
req = smb_raw_nttrans_send(tree, nt);
 
-   ndr_push_free(ndr);
+   talloc_free(ndr);
return req;
 }
 

Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr.c
===
--- branches/SAMBA_4_0/source/librpc/ndr/ndr.c  2007-01-23 00:39:12 UTC (rev 
20962)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr.c  2007-01-23 01:29:17 UTC (rev 
20963)
@@ -134,20 +134,6 @@
return ndr;
 }
 
-
-/* create a ndr_push structure, ready for some marshalling */
-_PUBLIC_ struct ndr_push *ndr_push_init(void)
-{
-   return ndr_push_init_ctx(NULL);
-}
-
-/* free a ndr_push structure */
-_PUBLIC_ void ndr_push_free(struct ndr_push *ndr)
-{
-   talloc_free(ndr);
-}
-
-
 /* return a DATA_BLOB structure for the current ndr_push marshalled data */
 _PUBLIC_ DATA_BLOB ndr_push_blob(struct ndr_push *ndr)
 {

Modified: branches/SAMBA_4_0/source/script/tests/test_local.sh
===
--- branches/SAMBA_4_0/source/script/tests/test_local.sh2007-01-23 
00:39:12 UTC (rev 20962)
+++ branches/SAMBA_4_0/source/script/tests/test_local.sh2007-01-23 
01:29:17 UTC (rev 20963)
@@ -4,7 +4,7 @@
 local_tests=$local_tests LOCAL-IDTREE LOCAL-EVENT
 local_tests=$local_tests LOCAL-SOCKET LOCAL-MESSAGING LOCAL-IRPC
 local_tests=$local_tests LOCAL-NDR LOCAL-BINDING LOCAL-FILE LOCAL-REGISTRY
-local_tests=$local_tests LOCAL-SDDL LOCAL-PAC LOCAL-DBSPEED
+local_tests=$local_tests LOCAL-SDDL LOCAL-PAC LOCAL-DBSPEED LOCAL-TDR 
 local_tests=$local_tests LOCAL-NTLMSSP LOCAL-CRYPTO-MD4
 local_tests=$local_tests LOCAL-CRYPTO-MD5 LOCAL-CRYPTO-HMACMD5
 local_tests=$local_tests LOCAL-CRYPTO-SHA1 LOCAL-CRYPTO-HMACSHA1

svn commit: samba r20967 - in branches/SAMBA_4_0: . source/pidl/tests source/script/tests source/torture

[jelmer]

Author: jelmer
Date: 2007-01-23 10:08:08 + (Tue, 23 Jan 2007)
New Revision: 20967

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20967

Log:
Allow pidl tests to work with gcov
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/pidl/tests/Util.pm
   branches/SAMBA_4_0/source/pidl/tests/ndr_align.pl
   branches/SAMBA_4_0/source/pidl/tests/ndr_refptr.pl
   branches/SAMBA_4_0/source/pidl/tests/ndr_tagtype.pl
   branches/SAMBA_4_0/source/script/tests/tests_all.sh
   branches/SAMBA_4_0/source/torture/config.mk


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/pidl/tests/Util.pm
===
--- branches/SAMBA_4_0/source/pidl/tests/Util.pm2007-01-23 04:12:51 UTC 
(rev 20966)
+++ branches/SAMBA_4_0/source/pidl/tests/Util.pm2007-01-23 10:08:08 UTC 
(rev 20967)
@@ -72,9 +72,27 @@
$outfile = ./test-$name;
}
 
+   my $cflags = $ENV{CFLAGS};
+   unless (defined($cflags)) {
+   $cflags = ;
+   }
+
+   my $ldflags = $ENV{LDFLAGS};
+   unless (defined($ldflags)) {
+   $ldflags = ;
+   }
+
+   my $cc = $ENV{CC};
+   unless (defined($cc)) {
+   $cc = cc;
+   }
+
my $flags = `pkg-config --libs --cflags ndr samba-config`;
 
-   open CC, |cc -x c - -o $outfile $flags;
+   my $cmd = $cc $cflags -x c - -o $outfile $flags $ldflags;
+   $cmd =~ s/\n//g;
+   print $cmd\n;
+   open CC, |$cmd;
print CC #define uint_t unsigned int\n;
print CC #define _GNU_SOURCE\n;
print CC #include stdint.h\n;
@@ -121,7 +139,6 @@
is($warnings, $exp);
 }
 
-
 sub test_errors($$)
 {
my ($exp, $code) = @_;

Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_align.pl
===
--- branches/SAMBA_4_0/source/pidl/tests/ndr_align.pl   2007-01-23 04:12:51 UTC 
(rev 20966)
+++ branches/SAMBA_4_0/source/pidl/tests/ndr_align.pl   2007-01-23 10:08:08 UTC 
(rev 20967)
@@ -16,7 +16,7 @@
} bla;
 ',
 '
-   struct ndr_push *ndr = ndr_push_init();
+   struct ndr_push *ndr = ndr_push_init_ctx(NULL);
struct bla r;
uint8_t expected[] = { 0x0D, 0x00, 0xef, 0xbe };
DATA_BLOB expected_blob = { expected, 4 };
@@ -41,7 +41,7 @@
} bla;
 ',
 '
-   struct ndr_push *ndr = ndr_push_init();
+   struct ndr_push *ndr = ndr_push_init_ctx(NULL);
struct bla r;
uint8_t expected[] = { 0x0D, 0x00, 0x00, 0x00, 0xef, 0xbe, 0xef, 0xbe };
DATA_BLOB expected_blob = { expected, 8 };
@@ -67,7 +67,7 @@
} bla;
 ',
 '
-   struct ndr_push *ndr = ndr_push_init();
+   struct ndr_push *ndr = ndr_push_init_ctx(NULL);
struct bla r;
uint8_t expected[] = { 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
   0xef, 0xbe, 0xef, 0xbe, 
0xef, 0xbe, 0xef, 0xbe };
@@ -93,7 +93,7 @@
} bla;
 ',
 '
-   struct ndr_push *ndr = ndr_push_init();
+   struct ndr_push *ndr = ndr_push_init_ctx(NULL);
struct bla r;
uint8_t expected[] = { 0x0D, 0xef, 0xbe };
DATA_BLOB expected_blob = { expected, 3 };
@@ -121,7 +121,7 @@
} blie;
 ',
 '
-   struct ndr_push *ndr = ndr_push_init();
+   struct ndr_push *ndr = ndr_push_init_ctx(NULL);
struct blie r;
uint8_t data[] = { 0x01, 0x02 };
uint8_t expected[] = { 0x0D, 0x00, 0x0E };

Modified: branches/SAMBA_4_0/source/pidl/tests/ndr_refptr.pl
===
--- branches/SAMBA_4_0/source/pidl/tests/ndr_refptr.pl  2007-01-23 04:12:51 UTC 
(rev 20966)
+++ branches/SAMBA_4_0/source/pidl/tests/ndr_refptr.pl  2007-01-23 10:08:08 UTC 
(rev 20967)
@@ -18,7 +18,7 @@
[public] uint16 echo_TestRef([in] xstruct foo);
 ',
 '
-   struct ndr_push *ndr = ndr_push_init

svn commit: samba r21017 - in branches/SAMBA_4_0: . source/script/tests testprogs/blackbox

[jelmer]

Author: jelmer
Date: 2007-01-25 12:39:13 + (Thu, 25 Jan 2007)
New Revision: 21017

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21017

Log:
Actually run tests during test phase rather than when generating the recipe.
Added:
   branches/SAMBA_4_0/testprogs/blackbox/test_ldb.sh
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/script/tests/test_ldap.sh
   branches/SAMBA_4_0/source/script/tests/test_local.sh
   branches/SAMBA_4_0/source/script/tests/tests_all.sh
   branches/SAMBA_4_0/testprogs/blackbox/test_cifsdd.sh


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/script/tests/test_ldap.sh
===
--- branches/SAMBA_4_0/source/script/tests/test_ldap.sh 2007-01-25 10:29:04 UTC 
(rev 21016)
+++ branches/SAMBA_4_0/source/script/tests/test_ldap.sh 2007-01-25 12:39:13 UTC 
(rev 21017)
@@ -23,62 +23,10 @@
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
+
 for p in $PROTOCOLS; do
  for options in  --option=socket:testnonblock=true -U$USERNAME%$PASSWORD 
--option=socket:testnonblock=true -U$USERNAME%$PASSWORD; do
-echo TESTING PROTOCOL $p with options $options
-
-testit RootDSE bin/ldbsearch $CONFIGURATION $options --basedn='' -H 
$p://$SERVER -s base DUMMY=x dnsHostName highestCommittedUSN || failed=`expr 
$failed + 1`
-
-echo Getting defaultNamingContext
-BASEDN=`bin/ldbsearch $CONFIGURATION $options --basedn='' -H $p://$SERVER 
-s base DUMMY=x defaultNamingContext | grep defaultNamingContext | awk '{print 
$2}'`
-echo BASEDN is $BASEDN
-
-testit Listing Users bin/ldbsearch $options $CONFIGURATION -H 
$p://$SERVER '(objectclass=user)' sAMAccountName || failed=`expr $failed + 1`
-
-testit Listing Groups bin/ldbsearch $options $CONFIGURATION -H 
$p://$SERVER '(objectclass=group)' sAMAccountName || failed=`expr $failed + 1`
-
-nentries=`bin/ldbsearch $options -H $p://$SERVER $CONFIGURATION 
'(|(|((!(groupType:1.2.840.113556.1.4.803:=1))(groupType:1.2.840.113556.1.4.803:=2147483648)(groupType:1.2.840.113556.1.4.804:=10))(samAccountType=805306368))(samAccountType=805306369))'
 sAMAccountName | grep sAMAccountName | wc -l`
-echo Found $nentries entries
-if [ $nentries -lt 10 ]; then
-   echo Should have found at least 10 entries
-   failed=`expr $failed + 1`
-fi
-
-echo Check rootDSE for Controls
-nentries=`bin/ldbsearch $options $CONFIGURATION -H $p://$SERVER -s base -b 
 '(objectclass=*)' | grep -i supportedControl | wc -l`
-if [ $nentries -lt 4 ]; then
-   echo Should have found at least 4 entries
-   failed=`expr $failed + 1`
-fi
-
-echo Test Paged Results Control
-nentries=`bin/ldbsearch $options $CONFIGURATION -H $p://$SERVER 
--controls=paged_results:1:5 '(objectclass=user)' | grep sAMAccountName | wc -l`
-if [ $nentries -lt 1 ]; then
-   echo Paged Results Control test returned 0 items
-   failed=`expr $failed + 1`
-fi
-
-echo Test Server Sort Control
-nentries=`bin/ldbsearch $options $CONFIGURATION -H $p://$SERVER 
--controls=server_sort:1:0:sAMAccountName '(objectclass=user)' | grep 
sAMAccountName | wc -l`
-if [ $nentries -lt 1 ]; then
-   echo Server Sort Control test returned 0 items
-   failed=`expr $failed + 1`
-fi
-
-echo Test Extended DN Control
-nentries=`bin/ldbsearch $options $CONFIGURATION -H $p://$SERVER 
--controls=extended_dn:1:0 '(objectclass=user)' | grep sAMAccountName | wc -l`
-if [ $nentries -lt 1 ]; then
-   echo Extended DN Control test returned 0 items
-   failed=`expr $failed + 1`
-fi
-
-echo Test Attribute Scope Query Control
-nentries=`bin/ldbsearch $options $CONFIGURATION -H $p://$SERVER 
--controls=asq:1:member -s base -b CN=Administrators,CN=Builtin,$BASEDN | 
grep sAMAccountName | wc -l`
-   if [ $nentries -lt 1 ]; then
-   echo Attribute Scope Query test returned 0 items

svn commit: samba r21028 - in branches/SAMBA_4_0: . source/script/tests source/torture

[jelmer]

Author: jelmer
Date: 2007-01-26 13:03:28 + (Fri, 26 Jan 2007)
New Revision: 21028

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21028

Log:
Generate list of tests rather than maintaining it manually.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/script/tests/test_posix.sh
   branches/SAMBA_4_0/source/torture/smbtorture.c


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/script/tests/test_posix.sh
===
--- branches/SAMBA_4_0/source/script/tests/test_posix.sh2007-01-26 
09:50:56 UTC (rev 21027)
+++ branches/SAMBA_4_0/source/script/tests/test_posix.sh2007-01-26 
13:03:28 UTC (rev 21028)
@@ -20,34 +20,9 @@
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
-#
-# please don't remove tests here, when you want them to be skipped!
-# just add them to the skipped line below
-# this should be the complete list smbtorture offers as BASE-* tests
-#
-base=BASE-ATTR BASE-CHARSET BASE-CHKPATH BASE-DEFER_OPEN BASE-DELAYWRITE 
BASE-DELETE
-base=$base BASE-DENY1 BASE-DENY2 BASE-DENY3 BASE-DENYDOS BASE-DIR1 BASE-DIR2
-base=$base BASE-DISCONNECT BASE-FDPASS BASE-LOCK 
-base=$base BASE-MANGLE BASE-NEGNOWAIT BASE-NTDENY1
-base=$base BASE-NTDENY2 BASE-OPEN BASE-OPENATTR BASE-PROPERTIES BASE-RENAME 
BASE-RW1
-base=$base BASE-SECLEAK BASE-TCON BASE-TCONDEV BASE-TRANS2 BASE-UNLINK 
BASE-VUID
-base=$base BASE-XCOPY
+tests=`bin/smbtorture --list | grep ^(BASE|RAW|SMB2)- | xargs`
 
 #
-# please don't remove tests here, when you want them to be skipped!
-# just add them to the skipped line below
-# this should be the complete list smbtorture offers as RAW-* tests
-#
-raw=RAW-CHKPATH RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS
-raw=$raw RAW-IOCTL RAW-LOCK RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN RAW-OPLOCK
-raw=$raw RAW-QFILEINFO RAW-QFSINFO RAW-READ RAW-RENAME RAW-SEARCH RAW-SEEK
-raw=$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE
-
-smb2=SMB2-CONNECT SMB2-GETINFO SMB2-SETINFO SMB2-FIND
-
-tests=$base $raw $smb2
-
-#
 # please add tests you want to be skipped here!
 #
 skipped=BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE RAW-COMPOSITE RAW-OPLOCK 
RAW-ACLS

Modified: branches/SAMBA_4_0/source/torture/smbtorture.c
===
--- branches/SAMBA_4_0/source/torture/smbtorture.c  2007-01-26 09:50:56 UTC 
(rev 21027)
+++ branches/SAMBA_4_0/source/torture/smbtorture.c  2007-01-26 13:03:28 UTC 
(rev 21028)
@@ -163,6 +163,23 @@
 
 }
 
+static void print_test_list(void)
+{
+   struct torture_suite *o;
+   struct torture_suite *s;
+   struct torture_tcase *t;
+
+   for (o = torture_root-children; o; o = o-next) {
+   for (s = o-children; s; s = s-next) {
+   printf(%s-%s\n, o-name, s-name);
+   }
+
+   for (t = o-testcases; t; t = t-next) {
+   printf(%s-%s\n, o-name, t-name);
+   }
+   }
+}
+
 static void usage(poptContext pc)
 {
struct torture_suite *o;
@@ -487,7 +504,8 @@
NTSTATUS status;
int shell = False;
static const char *ui_ops_name = simple;
-   enum {OPT_LOADFILE=1000,OPT_UNCLIST,OPT_TIMELIMIT,OPT_DNS,
+   static int list_tests = 0;
+   enum {OPT_LOADFILE=1000,OPT_UNCLIST,OPT_TIMELIMIT,OPT_DNS, OPT_LIST,
  OPT_DANGEROUS,OPT_SMB_PORTS,OPT_ASYNC,OPT_NUMPROGS, OPT_BASEDIR};

struct poptOption long_options[] = {
@@ -500,6 +518,7 @@
{num-ops,   0, POPT_ARG_INT,  torture_numops,0,  
num ops,  NULL},
{entries,   0, POPT_ARG_INT,  torture_entries,   0,  
entries,  NULL},
{loadfile,  0, POPT_ARG_STRING,   NULL,   OPT_LOADFILE,   
loadfile, NULL},
+   {list,  0, POPT_ARG_NONE, list_tests

svn commit: samba r21029 - in branches/SAMBA_4_0: . source/script/tests

[jelmer]

Author: jelmer
Date: 2007-01-26 13:33:06 + (Fri, 26 Jan 2007)
New Revision: 21029

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21029

Log:
- Remove now unused failure checking code
- Use --list option for smbtorture for local and nbt tests as well

Removed:
   branches/SAMBA_4_0/source/script/tests/tests_client.sh
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/script/tests/test_binding_string.sh
   branches/SAMBA_4_0/source/script/tests/test_echo.sh
   branches/SAMBA_4_0/source/script/tests/test_ejs.sh
   branches/SAMBA_4_0/source/script/tests/test_ldap.sh
   branches/SAMBA_4_0/source/script/tests/test_local.sh
   branches/SAMBA_4_0/source/script/tests/test_nbt.sh
   branches/SAMBA_4_0/source/script/tests/test_net.sh
   branches/SAMBA_4_0/source/script/tests/test_pidl.sh
   branches/SAMBA_4_0/source/script/tests/test_posix.sh
   branches/SAMBA_4_0/source/script/tests/test_quick.sh
   branches/SAMBA_4_0/source/script/tests/test_rpc.sh
   branches/SAMBA_4_0/source/script/tests/test_rpc_quick.sh
   branches/SAMBA_4_0/source/script/tests/test_session_key.sh
   branches/SAMBA_4_0/source/script/tests/test_simple.sh
   branches/SAMBA_4_0/source/script/tests/test_swig.sh
   branches/SAMBA_4_0/source/script/tests/test_w2k3.sh
   branches/SAMBA_4_0/source/script/tests/test_w2k3_file.sh
   branches/SAMBA_4_0/source/script/tests/tests_net.sh


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/script/tests/test_binding_string.sh
===
--- branches/SAMBA_4_0/source/script/tests/test_binding_string.sh   
2007-01-26 13:03:28 UTC (rev 21028)
+++ branches/SAMBA_4_0/source/script/tests/test_binding_string.sh   
2007-01-26 13:33:06 UTC (rev 21029)
@@ -28,7 +28,7 @@
 [EMAIL PROTECTED]:$server \
 [EMAIL PROTECTED]:$server 
 do
-   testit $I bin/smbtorture $TORTURE_OPTIONS $I 
-U$username%$password -W $domain --option=torture:quick=yes RPC-ECHO $* 
|| failed=`expr $failed + 1`
+   testit $I bin/smbtorture $TORTURE_OPTIONS $I 
-U$username%$password -W $domain --option=torture:quick=yes RPC-ECHO $*
 done
 
 testok $0 $failed

Modified: branches/SAMBA_4_0/source/script/tests/test_echo.sh
===
--- branches/SAMBA_4_0/source/script/tests/test_echo.sh 2007-01-26 13:03:28 UTC 
(rev 21028)
+++ branches/SAMBA_4_0/source/script/tests/test_echo.sh 2007-01-26 13:33:06 UTC 
(rev 21029)
@@ -30,7 +30,7 @@
   for ntlmoptions in \
 --option=socket:testnonblock=True --option=torture:quick=yes; do
name=RPC-ECHO on $transport with $bindoptions and $ntlmoptions
-   testit $name bin/smbtorture $TORTURE_OPTIONS 
$transport:$server[$bindoptions] $ntlmoptions -U$username%$password -W 
$domain RPC-ECHO $* || failed=`expr $failed + 1`
+   testit $name bin/smbtorture $TORTURE_OPTIONS 
$transport:$server[$bindoptions] $ntlmoptions -U$username%$password -W 
$domain RPC-ECHO $*
   done
  done
 done
@@ -49,12 +49,12 @@
 --option=clientntlmv2auth=yes  --option=ntlmssp_client:128bit=no 
--option=ntlmssp_client:keyexchange=no  --option=torture:quick=yes \
 ; do
name=RPC-ECHO on $transport with $bindoptions and $ntlmoptions
-   testit $name bin/smbtorture $TORTURE_OPTIONS 
$transport:$server[$bindoptions] $ntlmoptions -U$username%$password -W 
$domain RPC-ECHO $* || failed=`expr $failed + 1`
+   testit $name bin/smbtorture $TORTURE_OPTIONS 
$transport:$server[$bindoptions] $ntlmoptions -U$username%$password -W 
$domain RPC-ECHO $*
   done
  done
 done
 
 name=RPC-ECHO on ncacn_np over smb2
-testit $name bin/smbtorture $TORTURE_OPTIONS ncacn_np:$server[smb2] 
-U$username%$password -W $domain RPC-ECHO $* || failed=`expr $failed + 1`
+testit $name bin/smbtorture $TORTURE_OPTIONS ncacn_np:$server[smb2] 
-U$username

svn commit: samba r21030 - in branches/SAMBA_4_0: . source/script/tests

[jelmer]

Author: jelmer
Date: 2007-01-26 13:43:21 + (Fri, 26 Jan 2007)
New Revision: 21030

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21030

Log:
whoops, fix incorrect regex
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/script/tests/test_posix.sh
   branches/SAMBA_4_0/source/script/tests/tests_all.sh


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/script/tests/test_posix.sh
===
--- branches/SAMBA_4_0/source/script/tests/test_posix.sh2007-01-26 
13:33:06 UTC (rev 21029)
+++ branches/SAMBA_4_0/source/script/tests/test_posix.sh2007-01-26 
13:43:21 UTC (rev 21030)
@@ -20,7 +20,10 @@
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
-tests=`bin/smbtorture --list | grep ^(BASE|RAW|SMB2)- | xargs`
+smb2=`bin/smbtorture --list | grep ^SMB2- | xargs`
+raw=`bin/smbtorture --list | grep ^RAW- | xargs`
+base=`bin/smbtorture --list | grep ^BASE- | xargs`
+tests=$base $raw $smb2
 
 #
 # please add tests you want to be skipped here!

Modified: branches/SAMBA_4_0/source/script/tests/tests_all.sh
===
--- branches/SAMBA_4_0/source/script/tests/tests_all.sh 2007-01-26 13:33:06 UTC 
(rev 21029)
+++ branches/SAMBA_4_0/source/script/tests/tests_all.sh 2007-01-26 13:43:21 UTC 
(rev 21030)
@@ -2,7 +2,6 @@
  $SRCDIR/script/tests/test_ejs.sh $DOMAIN $USERNAME $PASSWORD
  $SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD
  $SRCDIR/script/tests/test_nbt.sh $SERVER
- $SRCDIR/script/tests/test_quick.sh //$SERVER/cifs $USERNAME $PASSWORD 
  $SRCDIR/script/tests/test_rpc.sh $SERVER $USERNAME $PASSWORD $DOMAIN
  $SRCDIR/script/tests/test_net.sh $SERVER $USERNAME $PASSWORD $DOMAIN
  $SRCDIR/script/tests/test_session_key.sh $SERVER $USERNAME $PASSWORD $DOMAIN 
$NETBIOSNAME

svn commit: samba r21031 - in branches/SAMBA_4_0: . source/script/tests

[jelmer]

Author: jelmer
Date: 2007-01-26 14:48:12 + (Fri, 26 Jan 2007)
New Revision: 21031

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21031

Log:
Skip some tests that were not listed previously.

Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/script/tests/test_posix.sh


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/script/tests/test_posix.sh
===
--- branches/SAMBA_4_0/source/script/tests/test_posix.sh2007-01-26 
13:43:21 UTC (rev 21030)
+++ branches/SAMBA_4_0/source/script/tests/test_posix.sh2007-01-26 
14:48:12 UTC (rev 21031)
@@ -28,7 +28,10 @@
 #
 # please add tests you want to be skipped here!
 #
-skipped=BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE RAW-COMPOSITE RAW-OPLOCK 
RAW-ACLS
+skipped=BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE RAW-COMPOSITE RAW-OPLOCK 
RAW-ACLS BASE-IOMETER
+skipped=$skipped BASE-SAMBA3ERROR BASE-CASETABLE BASE-NTTRANS 
BASE-BENCH-HOLDCON BASE-SCAN-MAXFID
+skipped=$skipped RAW-BENCH-OPLOCK RAW-SAMBA3HIDE RAW-SAMBA3CLOSEERR 
RAW-SAMBA3CHECKFSP RAW-SAMBA3BADPATH
+skipped=$skipped RAW-SCAN-EAMAX
 
 echo WARNING: Skipping tests $skipped
 

svn commit: samba r21032 - in branches/SAMBA_4_0: . source/script/tests

[jelmer]

Author: jelmer
Date: 2007-01-26 15:25:09 + (Fri, 26 Jan 2007)
New Revision: 21032

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21032

Log:
Skip two more tests
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/script/tests/test_posix.sh


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/script/tests/test_posix.sh
===
--- branches/SAMBA_4_0/source/script/tests/test_posix.sh2007-01-26 
14:48:12 UTC (rev 21031)
+++ branches/SAMBA_4_0/source/script/tests/test_posix.sh2007-01-26 
15:25:09 UTC (rev 21032)
@@ -31,7 +31,7 @@
 skipped=BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE RAW-COMPOSITE RAW-OPLOCK 
RAW-ACLS BASE-IOMETER
 skipped=$skipped BASE-SAMBA3ERROR BASE-CASETABLE BASE-NTTRANS 
BASE-BENCH-HOLDCON BASE-SCAN-MAXFID
 skipped=$skipped RAW-BENCH-OPLOCK RAW-SAMBA3HIDE RAW-SAMBA3CLOSEERR 
RAW-SAMBA3CHECKFSP RAW-SAMBA3BADPATH
-skipped=$skipped RAW-SCAN-EAMAX
+skipped=$skipped RAW-SCAN-EAMAX SMB2-LOCK SMB2-NOTIFY
 
 echo WARNING: Skipping tests $skipped
 

svn commit: samba r21037 - in branches: .

[jelmer]

Author: jelmer
Date: 2007-01-27 21:50:31 + (Sat, 27 Jan 2007)
New Revision: 21037

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21037

Log:
Remove tp2 release branch (has already been tagged).

Removed:
   branches/SAMBA_4_0_RELEASE_TP2/


Changeset:

svn commit: samba r21038 - in branches/SAMBA_4_0: . source source/script

[jelmer]

Author: jelmer
Date: 2007-01-28 01:05:47 + (Sun, 28 Jan 2007)
New Revision: 21038

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21038

Log:
Move commands to distclean target
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/main.mk
   branches/SAMBA_4_0/source/script/mkrelease.sh


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/main.mk
===
--- branches/SAMBA_4_0/source/main.mk   2007-01-27 21:50:31 UTC (rev 21037)
+++ branches/SAMBA_4_0/source/main.mk   2007-01-28 01:05:47 UTC (rev 21038)
@@ -273,6 +273,7 @@
-rm -f config.status
-rm -f config.log config.cache
-rm -f config.pm config.mk
+   -rm -rf webapps/qooxdoo-*-sdk/frontend/framework/.cache
-rm -f $(PC_FILES)
 
 removebackup:
@@ -284,6 +285,7 @@
-rm -f configure
-rm -f $(MANPAGES)
 
+check:: test
 test: $(DEFAULT_TEST_TARGET)
 
 SELFTEST = builddir=$(builddir) srcdir=$(srcdir) \

Modified: branches/SAMBA_4_0/source/script/mkrelease.sh
===
--- branches/SAMBA_4_0/source/script/mkrelease.sh   2007-01-27 21:50:31 UTC 
(rev 21037)
+++ branches/SAMBA_4_0/source/script/mkrelease.sh   2007-01-28 01:05:47 UTC 
(rev 21038)
@@ -1,13 +1,12 @@
 #!/bin/sh
 
-FROM=$1
-VERSION=$2
+VERSION=$1
 
-svn export $FROM samba-$VERSION
+svn export . samba-$VERSION || exit 1
 
-( cd samba-$VERSION || exit 1
-  (cd source  ./autogen.sh ) || exit 1
-  rm -rf webapps/qooxdoo-*-sdk/frontend/framework/.cache || exit 1
-) || exit 1
+cd samba-$VERSION/source
+./autogen.sh || exit 1
+./configure || exit 1
+make dist  || exit 1
 
 tar -zcf samba-$VERSION.tar.gz samba-$VERSION

svn commit: smb-build r70 - in trunk: .

[jelmer]

Author: jelmer
Date: 2007-01-28 01:20:48 + (Sun, 28 Jan 2007)
New Revision: 70

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=smb-buildrev=70

Log:
Try includes.
Added:
   trunk/Makefile
   trunk/flags.in
Removed:
   trunk/Makefile.in
Modified:
   trunk/configure.ac
   trunk/foo.c


Changeset:
Sorry, the patch is too large (649 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=smb-buildrev=70

svn commit: smb-build r71 - in trunk: .

[jelmer]

Author: jelmer
Date: 2007-01-28 01:26:59 + (Sun, 28 Jan 2007)
New Revision: 71

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=smb-buildrev=71

Log:
Remove makefile variables.
Modified:
   trunk/Makefile
   trunk/flags.in


Changeset:
Modified: trunk/Makefile
===
--- trunk/Makefile  2007-01-28 01:20:48 UTC (rev 70)
+++ trunk/Makefile  2007-01-28 01:26:59 UTC (rev 71)
@@ -15,15 +15,13 @@
 
 .c.o:
@echo Compiling $*.c
-   $(CC) $(TARGET_CFLAGS) `script/cflags.sh [EMAIL PROTECTED] $(CFLAGS) 
@PICFLAG@ -c $ -o $@
[EMAIL PROTECTED]@  -mv `echo $@ | sed 's%^.*/%%g'` $@
+   $(CC) $(TARGET_CFLAGS) `script/cflags.sh [EMAIL PROTECTED] $(CFLAGS) -c 
$ -o $@
 
 # Rule for precompiled headerfiles
 
 .h.h.gch:
@echo Precompiling $*.h
-   $(CC) $(TARGET_CFLAGS) `script/cflags.sh [EMAIL PROTECTED] $(CFLAGS) 
@PICFLAG@ -c $ -o $@
[EMAIL PROTECTED]@  -mv `echo $@ | sed 's%^.*/%%g'` $@
+   $(CC) $(TARGET_CFLAGS) `script/cflags.sh [EMAIL PROTECTED] $(CFLAGS) -c 
$ -o $@
 
 #  ALL_OBJS OBJ LIST
 _ALL_OBJS_OBJS =
@@ -36,10 +34,10 @@
 PROTO_PROTO_CFLAGS =
 
 idl_full: build/pidl/idl.pm
-   CPP=@CPP@ PERL=$(PERL) script/build_idl.sh FULL @PIDL_ARGS@
+   CPP=$(CPP) PERL=$(PERL) script/build_idl.sh FULL
 
 idl: build/pidl/idl.pm
-   @CPP=@CPP@ PERL=$(PERL) script/build_idl.sh PARTIAL @PIDL_ARGS@
+   @CPP=$(CPP) PERL=$(PERL) script/build_idl.sh PARTIAL
 
 build/pidl/idl.pm: build/pidl/idl.yp
-yapp -s build/pidl/idl.yp

Modified: trunk/flags.in
===
--- trunk/flags.in  2007-01-28 01:20:48 UTC (rev 70)
+++ trunk/flags.in  2007-01-28 01:26:59 UTC (rev 71)
@@ -57,6 +57,8 @@
 [EMAIL PROTECTED]@
 [EMAIL PROTECTED]@ @CFLAGS@ -Lbin
 
[EMAIL PROTECTED]@
+
 STLD=ar
 STLD_FLAGS=-rc
 

svn commit: samba r21040 - in branches/SAMBA_4_0: . source source/torture

[jelmer]

Author: jelmer
Date: 2007-01-28 13:14:52 + (Sun, 28 Jan 2007)
New Revision: 21040

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21040

Log:
Remove subunit runner (now written in perl in my perlselftest branch)
Removed:
   branches/SAMBA_4_0/source/torture/subunit.c
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/dynconfig.c
   branches/SAMBA_4_0/source/dynconfig.h
   branches/SAMBA_4_0/source/torture/config.mk
   branches/SAMBA_4_0/source/torture/smbtorture.c
   branches/SAMBA_4_0/source/torture/ui.c
   branches/SAMBA_4_0/source/torture/ui.h


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/dynconfig.c
===
--- branches/SAMBA_4_0/source/dynconfig.c   2007-01-28 07:58:39 UTC (rev 
21039)
+++ branches/SAMBA_4_0/source/dynconfig.c   2007-01-28 13:14:52 UTC (rev 
21040)
@@ -88,6 +88,3 @@
 
 /** Where to find the winbindd socket */
 _PUBLIC_ const char *dyn_WINBINDD_SOCKET_DIR = WINBINDD_SOCKET_DIR;
-
-/** Directory with subunit torture tests */
-_PUBLIC_ const char *dyn_TORTUREDIR = TORTUREDIR;

Modified: branches/SAMBA_4_0/source/dynconfig.h
===
--- branches/SAMBA_4_0/source/dynconfig.h   2007-01-28 07:58:39 UTC (rev 
21039)
+++ branches/SAMBA_4_0/source/dynconfig.h   2007-01-28 13:14:52 UTC (rev 
21040)
@@ -40,4 +40,3 @@
 extern const char *dyn_JSDIR;
 extern const char *dyn_SETUPDIR;
 extern const char *dyn_WINBINDD_SOCKET_DIR;
-extern const char *dyn_TORTUREDIR;

Modified: branches/SAMBA_4_0/source/torture/config.mk
===
--- branches/SAMBA_4_0/source/torture/config.mk 2007-01-28 07:58:39 UTC (rev 
21039)
+++ branches/SAMBA_4_0/source/torture/config.mk 2007-01-28 13:14:52 UTC (rev 
21040)
@@ -7,7 +7,6 @@
 PUBLIC_PROTO_HEADER = proto.h
 OBJ_FILES = \
torture.o \
-   subunit.o \
ui.o
 PUBLIC_DEPENDENCIES = \
LIBSAMBA-CONFIG \

Modified: branches/SAMBA_4_0/source/torture/smbtorture.c
===
--- branches/SAMBA_4_0/source/torture/smbtorture.c  2007-01-28 07:58:39 UTC 
(rev 21039)
+++ branches/SAMBA_4_0/source/torture/smbtorture.c  2007-01-28 13:14:52 UTC 
(rev 21040)
@@ -326,7 +326,7 @@
 static void subunit_suite_start(struct torture_context *ctx,
   struct torture_suite 
*suite)
 {
-   printf(testsuite: %s\n, suite-path);
+   printf(testsuite: %s\n, suite-name);
 }
 
 static void subunit_test_start (struct torture_context *ctx, 
@@ -499,7 +499,6 @@
char **argv_new;
poptContext pc;
static const char *target = other;
-   const char **subunit_dir;
struct dcerpc_binding *binding_struct;
NTSTATUS status;
int shell = False;
@@ -608,14 +607,6 @@
return 0;
}
 
-   subunit_dir = lp_parm_string_list(-1, torture, subunitdir, :);
-   if (subunit_dir == NULL) 
-   torture_subunit_load_testsuites(dyn_TORTUREDIR, true, NULL);
-   else {
-   for (i = 0; subunit_dir[i]; i++)
-   torture_subunit_load_testsuites(subunit_dir[i], true, 
NULL);
-   }
-
if (torture_seed == 0) {
torture_seed = time(NULL);
} 

Deleted: branches/SAMBA_4_0/source/torture/subunit.c
===
--- branches/SAMBA_4_0/source/torture/subunit.c 2007-01-28 07:58:39 UTC (rev 
21039)
+++ branches/SAMBA_4_0/source/torture

svn commit: samba r21055 - in branches/SAMBA_4_0: . source/script source/torture

[jelmer]

Author: jelmer
Date: 2007-01-30 12:10:42 + (Tue, 30 Jan 2007)
New Revision: 21055

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21055

Log:
Fix executable bit.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/script/buildtree.pl
   branches/SAMBA_4_0/source/script/installjsonrpc.sh
   branches/SAMBA_4_0/source/script/installwebapps.sh
   branches/SAMBA_4_0/source/torture/smbtorture.c
   branches/SAMBA_4_0/source/torture/torture.c
   branches/SAMBA_4_0/source/torture/ui.c
   branches/SAMBA_4_0/source/torture/ui.h


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/script/buildtree.pl
===


Property changes on: branches/SAMBA_4_0/source/script/buildtree.pl
___
Name: svn:executable
   + *

Modified: branches/SAMBA_4_0/source/script/installjsonrpc.sh
===


Property changes on: branches/SAMBA_4_0/source/script/installjsonrpc.sh
___
Name: svn:executable
   + *

Modified: branches/SAMBA_4_0/source/script/installwebapps.sh
===


Property changes on: branches/SAMBA_4_0/source/script/installwebapps.sh
___
Name: svn:executable
   + *

Modified: branches/SAMBA_4_0/source/torture/smbtorture.c
===
--- branches/SAMBA_4_0/source/torture/smbtorture.c  2007-01-30 02:27:29 UTC 
(rev 21054)
+++ branches/SAMBA_4_0/source/torture/smbtorture.c  2007-01-30 12:10:42 UTC 
(rev 21055)
@@ -670,57 +670,14 @@
} else if (shell) {
run_shell(torture);
} else {
-   int total;
-   double rate;
-   int unexpected_failures;
for (i=2;iargc_new;i++) {
if (!run_test(torture, argv_new[i])) {
correct = false;
}
}
-
-   unexpected_failures = 
str_list_length(torture-results.unexpected_failures);
-
-   total = 
torture-results.skipped+torture-results.success+torture-results.failed+torture-results.errors;
-   if (total == 0) {
-   printf(No tests run.\n);
-   } else {
-   rate = ((total - unexpected_failures - 
torture-results.errors) * (100.0 / total));
-   
-   printf(Tests: %d, Failures: %d, total, 
torture-results.failed);
-   if (torture-results.failed - unexpected_failures) {
-   printf( (%d expected), 
torture-results.failed - unexpected_failures);
-   }
-   printf(, Errors: %d, Skipped: %d. Success rate: 
%.2f%%\n,
-  torture-results.errors, torture-results.skipped, 
rate);
-   }
-
-   if (unexpected_failures) {
-   printf(The following tests failed:\n);
-   for (i = 0; torture-results.unexpected_failures[i]; 
i++) {
-   printf(  %s\n, 
torture-results.unexpected_failures[i]);
-   }
-   printf(\n);
-   }
-
-   if (str_list_length(torture-results.unexpected_errors)) {
-   printf(Errors occurred while running the following 
tests:\n

svn commit: samba r21066 - in branches/SAMBA_4_0: . source/script/tests source/torture

[jelmer]

Author: jelmer
Date: 2007-01-31 00:30:52 + (Wed, 31 Jan 2007)
New Revision: 21066

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21066

Log:
Fix the build (uninitialised variable).
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/script/tests/test_local.sh
   branches/SAMBA_4_0/source/torture/torture.c


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/script/tests/test_local.sh
===
--- branches/SAMBA_4_0/source/script/tests/test_local.sh2007-01-31 
00:04:42 UTC (rev 21065)
+++ branches/SAMBA_4_0/source/script/tests/test_local.sh2007-01-31 
00:30:52 UTC (rev 21066)
@@ -21,9 +21,23 @@
 # the local tests don't need smbd
 SMBD_TEST_FIFO=
 export SMBD_TEST_FIFO
+skipped=LOCAL-RESOLVE LOCAL-REGISTRY
 
+echo WARNING: Skipping $skipped
+
 failed=0
 for t in $local_tests; do
+skip=0
+for s in $skipped; do
+   if [ x$s = x$t ]; then
+   skip=1;
+   break;
+   fi
+done
+if [ $skip = 1 ]; then
+   continue;
+fi
+
name=$t
testit $name $VALGRIND bin/smbtorture $TORTURE_OPTIONS ncalrpc: $t 
$*
 done

Modified: branches/SAMBA_4_0/source/torture/torture.c
===
--- branches/SAMBA_4_0/source/torture/torture.c 2007-01-31 00:04:42 UTC (rev 
21065)
+++ branches/SAMBA_4_0/source/torture/torture.c 2007-01-31 00:30:52 UTC (rev 
21066)
@@ -48,6 +48,7 @@
struct torture_context *torture = talloc_zero(mem_ctx, 

  struct torture_context);
torture-ui_ops = ui_ops;
+   torture-returncode = true;
 
return torture;
 }

svn commit: samba r21075 - in branches/SAMBA_4_0: . source/pidl/lib/Parse/Pidl/Samba3

[jelmer]

Author: jelmer
Date: 2007-01-31 11:54:01 + (Wed, 31 Jan 2007)
New Revision: 21075

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21075

Log:
Generate parameters in structs for the server side Samba 3 code. The current 
code in Samba 3 is already generated using this pidl patch.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm   
2007-01-31 11:48:14 UTC (rev 21074)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm   
2007-01-31 11:54:01 UTC (rev 21075)
@@ -133,8 +133,8 @@
 
pidl ZERO_STRUCT(r.out); if ($hasout);
 
-   my $proto = _$fn-{NAME}(pipes_struct *p;
-   my $ret = _$fn-{NAME}(p;
+   my $proto = _$fn-{NAME}(pipes_struct *p, struct $fn-{NAME} *r;
+   my $ret = _$fn-{NAME}(p, r;
foreach (@{$fn-{ELEMENTS}}) {
my @dir = @{$_-{DIRECTION}};
if (grep(/in/, @dir) and grep(/out/, @dir)) {
@@ -143,10 +143,6 @@
 has_property($_, represent_as)) {
AllocOutVar($_, mem_ctx, r.out.$_-{NAME}, \%env);
}
-   if (grep(/in/, @dir)) { $ret .= , r.in.$_-{NAME}; }
-   else { $ret .= , r.out.$_-{NAME}; }
-
-   $proto .= ,  . DeclLong($_);
}
$ret .= );
$proto .= );;

svn commit: samba r21119 - in tags: .

[jelmer]

Author: jelmer
Date: 2007-02-02 10:54:58 + (Fri, 02 Feb 2007)
New Revision: 21119

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21119

Log:
Tag 4.0.0tp4

Added:
   tags/release-4-0-0tp4/


Changeset:
Copied: tags/release-4-0-0tp4 (from rev 21118, branches/SAMBA_4_0_RELEASE)

svn commit: samba r21138 - in tags: .

[jelmer]

Author: jelmer
Date: 2007-02-04 23:39:08 + (Sun, 04 Feb 2007)
New Revision: 21138

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21138

Log:
Tag Samba 4TP3 release.

Added:
   tags/release-4-0-0tp3/


Changeset:
Copied: tags/release-4-0-0tp3 (from rev 19335, branches/SAMBA_4_0_RELEASE)

svn commit: samba r21203 - in branches/SAMBA_3_0: . source/librpc/gen_ndr

[jelmer]

Author: jelmer
Date: 2007-02-06 23:02:27 + (Tue, 06 Feb 2007)
New Revision: 21203

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21203

Log:
Regenerate C files after pidl updates.
Modified:
   branches/SAMBA_3_0/
   branches/SAMBA_3_0/source/librpc/gen_ndr/echo.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/lsa.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/netlogon.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/srvsvc.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/svcctl.h
   branches/SAMBA_3_0/source/librpc/gen_ndr/winreg.h


Changeset:

Property changes on: branches/SAMBA_3_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/echo.h
===
--- branches/SAMBA_3_0/source/librpc/gen_ndr/echo.h 2007-02-06 22:38:31 UTC 
(rev 21202)
+++ branches/SAMBA_3_0/source/librpc/gen_ndr/echo.h 2007-02-06 23:02:27 UTC 
(rev 21203)
@@ -44,15 +44,27 @@
struct echo_info7 info7;/* [case(7)] */
 }/* [switch_type(uint16)] */;
 
+#ifndef USE_UINT_ENUMS
 enum echo_Enum1 {
ECHO_ENUM1=1,
ECHO_ENUM2=2
 };
+#else
+enum echo_Enum1 { __donnot_use_enum_echo_Enum1=0x7FFF};
+#define ECHO_ENUM1 ( 1 )
+#define ECHO_ENUM2 ( 2 )
+#endif
 
+#ifndef USE_UINT_ENUMS
 enum echo_Enum1_32 {
ECHO_ENUM1_32=1,
ECHO_ENUM2_32=2
 };
+#else
+enum echo_Enum1_32 { __donnot_use_enum_echo_Enum1_32=0x7FFF};
+#define ECHO_ENUM1_32 ( 1 )
+#define ECHO_ENUM2_32 ( 2 )
+#endif
 
 struct echo_Enum2 {
enum echo_Enum1 e1;

Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/lsa.h
===
--- branches/SAMBA_3_0/source/librpc/gen_ndr/lsa.h  2007-02-06 22:38:31 UTC 
(rev 21202)
+++ branches/SAMBA_3_0/source/librpc/gen_ndr/lsa.h  2007-02-06 23:02:27 UTC 
(rev 21203)
@@ -128,6 +128,7 @@
struct dom_sid2 *sid;/* [unique] */
 };
 
+#ifndef USE_UINT_ENUMS
 enum lsaPolicyInfo {
LSA_POLICY_INFO_AUDIT_LOG=1,
LSA_POLICY_INFO_AUDIT_EVENTS=2,
@@ -142,6 +143,21 @@
LSA_POLICY_INFO_AUDIT_FULL_QUERY=11,
LSA_POLICY_INFO_DNS=12
 };
+#else
+enum lsaPolicyInfo { __donnot_use_enum_lsaPolicyInfo=0x7FFF};
+#define LSA_POLICY_INFO_AUDIT_LOG ( 1 )
+#define LSA_POLICY_INFO_AUDIT_EVENTS ( 2 )
+#define LSA_POLICY_INFO_DOMAIN ( 3 )
+#define LSA_POLICY_INFO_PD ( 4 )
+#define LSA_POLICY_INFO_ACCOUNT_DOMAIN ( 5 )
+#define LSA_POLICY_INFO_ROLE ( 6 )
+#define LSA_POLICY_INFO_REPLICA ( 7 )
+#define LSA_POLICY_INFO_QUOTA ( 8 )
+#define LSA_POLICY_INFO_DB ( 9 )
+#define LSA_POLICY_INFO_AUDIT_FULL_SET ( 10 )
+#define LSA_POLICY_INFO_AUDIT_FULL_QUERY ( 11 )
+#define LSA_POLICY_INFO_DNS ( 12 )
+#endif
 
 union lsa_PolicyInformation {
struct lsa_AuditLogInfo audit_log;/* [case(LSA_POLICY_INFO_AUDIT_LOG)] 
*/
@@ -172,6 +188,7 @@
struct lsa_DomainInfo *domains;/* [unique,size_is(count)] */
 };
 
+#ifndef USE_UINT_ENUMS
 enum lsa_SidType {
SID_NAME_USE_NONE=0,
SID_NAME_USER=1,
@@ -184,6 +201,19 @@
SID_NAME_UNKNOWN=8,
SID_NAME_COMPUTER=9
 };
+#else
+enum lsa_SidType { __donnot_use_enum_lsa_SidType=0x7FFF};
+#define SID_NAME_USE_NONE ( 0 )
+#define SID_NAME_USER ( 1 )
+#define SID_NAME_DOM_GRP ( 2 )
+#define SID_NAME_DOMAIN ( 3 )
+#define SID_NAME_ALIAS ( 4 )
+#define SID_NAME_WKN_GRP ( 5 )
+#define SID_NAME_DELETED ( 6 )
+#define SID_NAME_INVALID ( 7 )
+#define SID_NAME_UNKNOWN ( 8 )
+#define SID_NAME_COMPUTER ( 9 )
+#endif
 
 struct lsa_TranslatedSid {
enum lsa_SidType sid_type;
@@ -235,6 +265,7 @@
uint8_t *data;/* [unique,size_is(size)] */
 }/* [flag(LIBNDR_PRINT_ARRAY_HEX)] */;
 
+#ifndef USE_UINT_ENUMS
 enum lsa_TrustDomInfoEnum {
LSA_TRUSTED_DOMAIN_INFO_NAME=1,
LSA_TRUSTED_DOMAIN_INFO_CONTROLLERS_INFO=2,
@@ -247,6 +278,19 @@
LSA_TRUSTED_DOMAIN_INFO_11=11,
LSA_TRUSTED_DOMAIN_INFO_INFO_ALL=12
 };
+#else
+enum lsa_TrustDomInfoEnum { __donnot_use_enum_lsa_TrustDomInfoEnum=0x7FFF};
+#define LSA_TRUSTED_DOMAIN_INFO_NAME ( 1 )
+#define LSA_TRUSTED_DOMAIN_INFO_CONTROLLERS_INFO ( 2 )
+#define LSA_TRUSTED_DOMAIN_INFO_POSIX_OFFSET ( 3 )
+#define LSA_TRUSTED_DOMAIN_INFO_PASSWORD ( 4 )
+#define LSA_TRUSTED_DOMAIN_INFO_BASIC ( 5 )
+#define LSA_TRUSTED_DOMAIN_INFO_INFO_EX ( 6 )
+#define LSA_TRUSTED_DOMAIN_INFO_AUTH_INFO ( 7 )
+#define LSA_TRUSTED_DOMAIN_INFO_FULL_INFO ( 8 )
+#define

svn commit: samba r21205 - in branches/SAMBA_4_0: . source/torture/rpc

[jelmer]

Author: jelmer
Date: 2007-02-07 00:16:21 + (Wed, 07 Feb 2007)
New Revision: 21205

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21205

Log:
Fix warning.

Trivial patch from Lunar Child [EMAIL PROTECTED]

Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/torture/rpc/rpc.c


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/torture/rpc/rpc.c
===
--- branches/SAMBA_4_0/source/torture/rpc/rpc.c 2007-02-06 23:25:02 UTC (rev 
21204)
+++ branches/SAMBA_4_0/source/torture/rpc/rpc.c 2007-02-07 00:16:21 UTC (rev 
21205)
@@ -117,7 +117,7 @@
 
tcase-setup = torture_rpc_setup;
tcase-teardown = torture_rpc_teardown;
-   tcase-data = table;
+   tcase-data = (void *)table;
 
return tcase;
 }

svn commit: samba r21222 - in branches/SAMBA_4_0: . source/pidl source/pidl/lib/Parse/Pidl source/pidl/lib/Parse/Pidl/Samba4/NDR source/pidl/tests source/torture

[jelmer]

Author: jelmer
Date: 2007-02-07 19:03:19 + (Wed, 07 Feb 2007)
New Revision: 21222

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21222

Log:
Merge a couple of pidl fixes:
 
* Pidl will now warn when trying to use pointers as integers in expressions.
* subcontext() is now marked as deprecated. The alternatives, 
  transmit_as() / represent_as() should be available soon.
* More tests.
* Remove some unused code in smbtorture.

Added:
   branches/SAMBA_4_0/source/pidl/tests/ndr_deprecations.pl
Removed:
   branches/SAMBA_4_0/source/pidl/ref_notes.txt
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/pidl/TODO
   branches/SAMBA_4_0/source/pidl/expr.yp
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Expr.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Util.pm
   branches/SAMBA_4_0/source/pidl/pidl
   branches/SAMBA_4_0/source/pidl/tests/ndr_represent.pl
   branches/SAMBA_4_0/source/pidl/tests/util.pl
   branches/SAMBA_4_0/source/torture/smbtorture.c
   branches/SAMBA_4_0/source/torture/torture.c


Changeset:
Sorry, the patch is too large (2685 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21222

svn commit: samba r21253 - in branches/SAMBA_4_0: . source/pidl source/pidl/lib/Parse/Pidl source/pidl/lib/Parse/Pidl/Samba4 source/pidl/lib/Parse/Pidl/Samba4/NDR source/pidl/lib/Parse/Pidl/Wireshark

[jelmer]

Author: jelmer
Date: 2007-02-08 23:54:31 + (Thu, 08 Feb 2007)
New Revision: 21253

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21253

Log:
Merge some pidl fixes:

 * Add tests for wireshark dissector generator
 * Add tests for the header code
 * Some cleanups
 * Fix handling of elements without [in] or [out]

Added:
   branches/SAMBA_4_0/source/pidl/tests/header.pl
   branches/SAMBA_4_0/source/pidl/tests/wireshark-conf.pl
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/pidl/TODO
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Util.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
   branches/SAMBA_4_0/source/pidl/tests/samba-ndr.pl


Changeset:
Sorry, the patch is too large (822 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21253

svn commit: samba r21254 - in branches/SAMBA_4_0: . source/pidl/tests

[jelmer]

Author: jelmer
Date: 2007-02-09 00:18:06 + (Fri, 09 Feb 2007)
New Revision: 21254

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21254

Log:
Fix running the testsuite outside pidl/

Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/pidl/tests/header.pl


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/pidl/tests/header.pl
===
--- branches/SAMBA_4_0/source/pidl/tests/header.pl  2007-02-08 23:54:31 UTC 
(rev 21253)
+++ branches/SAMBA_4_0/source/pidl/tests/header.pl  2007-02-09 00:18:06 UTC 
(rev 21254)
@@ -19,8 +19,8 @@
return Parse::Pidl::Samba4::Header::Parse($idl);
 }
 
-is(/* header auto-generated by pidl */\n\n#include core.h\n\n, 
parse_idl(), includes work);
-is(/* header auto-generated by pidl */\n\n#include core.h\n\n, 
parse_idl(interface x {}), simple empty interface doesn't cause overhead);
+like(parse_idl(), qr/\/\* header auto-generated by pidl \*\n\//sm, includes 
work);
+like(parse_idl(interface x {}), qr/\/\* header auto-generated by pidl 
\*\/\n/sm,  simple empty interface doesn't cause overhead);
 like(parse_idl(interface p { typedef struct { int y; } x; };),
  qr/.*#ifndef _HEADER_p\n#define _HEADER_p\n.+\n#endif \/\* _HEADER_p 
\*\/.*/ms, ifdefs are created);
 like(parse_idl(interface p { typedef struct { int y; } x; };),

svn commit: samba r21260 - in branches/SAMBA_4_0: . source/pidl/tests

[jelmer]

Author: jelmer
Date: 2007-02-09 09:44:11 + (Fri, 09 Feb 2007)
New Revision: 21260

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21260

Log:
Fix regex.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/pidl/tests/header.pl


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/pidl/tests/header.pl
===
--- branches/SAMBA_4_0/source/pidl/tests/header.pl  2007-02-09 05:16:25 UTC 
(rev 21259)
+++ branches/SAMBA_4_0/source/pidl/tests/header.pl  2007-02-09 09:44:11 UTC 
(rev 21260)
@@ -19,7 +19,7 @@
return Parse::Pidl::Samba4::Header::Parse($idl);
 }
 
-like(parse_idl(), qr/\/\* header auto-generated by pidl \*\n\//sm, includes 
work);
+like(parse_idl(), qr/\/\* header auto-generated by pidl \*\/\n/sm, includes 
work);
 like(parse_idl(interface x {}), qr/\/\* header auto-generated by pidl 
\*\/\n/sm,  simple empty interface doesn't cause overhead);
 like(parse_idl(interface p { typedef struct { int y; } x; };),
  qr/.*#ifndef _HEADER_p\n#define _HEADER_p\n.+\n#endif \/\* _HEADER_p 
\*\/.*/ms, ifdefs are created);

svn commit: smb-build r72 - in trunk: .

[jelmer]

Author: jelmer
Date: 2007-02-11 12:48:22 + (Sun, 11 Feb 2007)
New Revision: 72

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=smb-buildrev=72

Log:
Breka the build.
Modified:
   trunk/
   trunk/foo.c


Changeset:

Property changes on: trunk
___
Name: bzr:merge
   - revision-id2 revision-id3
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + revision-id2 revision-id3
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: trunk/foo.c
===
--- trunk/foo.c 2007-01-28 01:26:59 UTC (rev 71)
+++ trunk/foo.c 2007-02-11 12:48:22 UTC (rev 72)
@@ -1,3 +1,4 @@
+#error FOOBAR
 #include stdio.h
 
 #define eprintf(...) fprintf(stderr, __VA_ARGS__)

svn commit: samba r21297 - in branches/SAMBA_4_0: . source source/include source/lib/events source/lib/registry source/lib/talloc source/libcli/util source/librpc source/pidl/lib/Parse/Pidl/Samba4 web

[jelmer]

Author: jelmer
Date: 2007-02-12 12:12:12 + (Mon, 12 Feb 2007)
New Revision: 21297

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21297

Log:
Remove the GTK+ tools and library from the main repository. They are now 
maintained separately in bzr at http://people.samba.org/bzr/jelmer/samba-gtk

This also adds some more headers to the list that is installed and a couple of 
extra #include lines so these 
headers can be used externally without problems.

Removed:
   branches/SAMBA_4_0/source/gtk/
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/.bzrignore
   branches/SAMBA_4_0/source/configure.ac
   branches/SAMBA_4_0/source/headermap.txt
   branches/SAMBA_4_0/source/include/core.h
   branches/SAMBA_4_0/source/lib/events/config.mk
   branches/SAMBA_4_0/source/lib/events/events.h
   branches/SAMBA_4_0/source/lib/registry/config.mk
   branches/SAMBA_4_0/source/lib/registry/registry.h
   branches/SAMBA_4_0/source/lib/talloc/talloc.h
   branches/SAMBA_4_0/source/libcli/util/nt_status.h
   branches/SAMBA_4_0/source/librpc/config.mk
   branches/SAMBA_4_0/source/main.mk
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
   
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/translation/C.po


Changeset:
Sorry, the patch is too large (765 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21297

svn commit: samba r21299 - in branches/SAMBA_4_0: . source/lib/events source/lib/registry

[jelmer]

Author: jelmer
Date: 2007-02-12 13:04:09 + (Mon, 12 Feb 2007)
New Revision: 21299

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21299

Log:
Fix the build for those that don't have talloc.h installed.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/lib/events/events.h
   branches/SAMBA_4_0/source/lib/registry/registry.h


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/lib/events/events.h
===
--- branches/SAMBA_4_0/source/lib/events/events.h   2007-02-12 12:13:00 UTC 
(rev 21298)
+++ branches/SAMBA_4_0/source/lib/events/events.h   2007-02-12 13:04:09 UTC 
(rev 21299)
@@ -23,7 +23,7 @@
 #ifndef __EVENTS_H__
 #define __EVENTS_H__
 
-#include talloc.h
+#include talloc/talloc.h
 #include stdlib.h
 
 struct event_context;

Modified: branches/SAMBA_4_0/source/lib/registry/registry.h
===
--- branches/SAMBA_4_0/source/lib/registry/registry.h   2007-02-12 12:13:00 UTC 
(rev 21298)
+++ branches/SAMBA_4_0/source/lib/registry/registry.h   2007-02-12 13:04:09 UTC 
(rev 21299)
@@ -23,7 +23,7 @@
 #define _REGISTRY_H 
 
 #include core.h
-#include talloc.h
+#include talloc/talloc.h
 #include librpc/gen_ndr/security.h
 
 /* Handles for the predefined keys */

svn commit: samba r21302 - in branches/SAMBA_4_0: . source/lib/replace

[jelmer]

Author: jelmer
Date: 2007-02-12 17:36:00 + (Mon, 12 Feb 2007)
New Revision: 21302

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21302

Log:
Provide simple redirecting headers for standard headers.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/lib/replace/README
   branches/SAMBA_4_0/source/lib/replace/libreplace.m4
   branches/SAMBA_4_0/source/lib/replace/libreplace_macros.m4


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/lib/replace/README
===
--- branches/SAMBA_4_0/source/lib/replace/README2007-02-12 15:25:43 UTC 
(rev 21301)
+++ branches/SAMBA_4_0/source/lib/replace/README2007-02-12 17:36:00 UTC 
(rev 21302)
@@ -81,6 +81,10 @@
 MAX
 QSORT_CAST
 
+Headers:
+stdint.h
+stdbool.h
+
 Prerequisites:
 memset (for bzero)
 syslog (for vsyslog)

Modified: branches/SAMBA_4_0/source/lib/replace/libreplace.m4
===
--- branches/SAMBA_4_0/source/lib/replace/libreplace.m4 2007-02-12 15:25:43 UTC 
(rev 21301)
+++ branches/SAMBA_4_0/source/lib/replace/libreplace.m4 2007-02-12 17:36:00 UTC 
(rev 21302)
@@ -61,9 +61,12 @@
 
 AC_CHECK_FUNCS(pipe strftime srandom random srand rand usleep setbuffer lstat 
getpgrp)
 
-AC_CHECK_HEADERS(stdbool.h sys/select.h)
+AC_CHECK_HEADERS(stdbool.h stdint.h sys/select.h)
 AC_CHECK_HEADERS(setjmp.h)
 
+LIBREPLACE_PROVIDE_HEADER([stdint.h])
+LIBREPLACE_PROVIDE_HEADER([stdbool.h])
+
 AC_CHECK_TYPE(bool, 
 [AC_DEFINE(HAVE_BOOL, 1, [Whether the bool type is available])],,
 [

Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_macros.m4
===
--- branches/SAMBA_4_0/source/lib/replace/libreplace_macros.m4  2007-02-12 
15:25:43 UTC (rev 21301)
+++ branches/SAMBA_4_0/source/lib/replace/libreplace_macros.m4  2007-02-12 
17:36:00 UTC (rev 21302)
@@ -306,3 +306,12 @@
 )
 AS_IF([test $AS_TR_SH([ac_cv_c_prototype_$1]) = yes],[$3],[$4])
 ])
+
+AC_DEFUN(LIBREPLACE_PROVIDE_HEADER, 
+[AC_CHECK_HEADER([$1], 
+   [ AC_CONFIG_COMMANDS(rm-$1, [rm -f $libreplacedir/$1], 
[libreplacedir=$libreplacedir]) ],
+   [ AC_CONFIG_COMMANDS(mk-$1, [echo #include \replace.h\  
$libreplacedir/$1], [libreplacedir=$libreplacedir]) ]
+   )
+])
+
+

svn commit: samba r21332 - in branches/SAMBA_4_0: . source/pidl/lib/Parse/Pidl/Samba4/NDR source/pidl/tests

[jelmer]

Author: jelmer
Date: 2007-02-14 12:44:50 + (Wed, 14 Feb 2007)
New Revision: 21332

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21332

Log:
Fix bug in pidl that prevented value(0) from working. Bug reported by metze.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
   branches/SAMBA_4_0/source/pidl/tests/samba-ndr.pl


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm  
2007-02-14 12:21:16 UTC (rev 21331)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm  
2007-02-14 12:44:50 UTC (rev 21332)
@@ -10,7 +10,8 @@
 require Exporter;
 @ISA = qw(Exporter);
 @EXPORT = qw(is_charset_array);
[EMAIL PROTECTED] = qw(check_null_pointer GenerateFunctionInEnv 
GenerateFunctionOutEnv);
[EMAIL PROTECTED] = qw(check_null_pointer GenerateFunctionInEnv 
+   GenerateFunctionOutEnv EnvSubstituteValue GenerateStructEnv);
 
 use strict;
 use Parse::Pidl::Typelist qw(hasType getType mapType);
@@ -234,7 +235,7 @@
 
# Substitute the value() values in the env
foreach my $e (@{$s-{ELEMENTS}}) {
-   next unless (my $v = has_property($e, value));
+   next unless (defined(my $v = has_property($e, value)));

$env-{$e-{NAME}} = ParseExpr($v, $env, $e);
}
@@ -714,7 +715,7 @@
 
start_flags($e);
 
-   if (my $value = has_property($e, value)) {
+   if (defined(my $value = has_property($e, value))) {
$var_name = ParseExpr($value, $env, $e-{ORIGINAL});
}
 
@@ -765,7 +766,7 @@
 
$var_name = append_prefix($e, $var_name);
 
-   if (my $value = has_property($e, value)) {
+   if (defined(my $value = has_property($e, value))) {
$var_name = (ndr-flags  LIBNDR_PRINT_SET_VALUES)? . 
ParseExpr($value,$env, $e-{ORIGINAL}) . :$var_name;
}
 

Modified: branches/SAMBA_4_0/source/pidl/tests/samba-ndr.pl
===
--- branches/SAMBA_4_0/source/pidl/tests/samba-ndr.pl   2007-02-14 12:21:16 UTC 
(rev 21331)
+++ branches/SAMBA_4_0/source/pidl/tests/samba-ndr.pl   2007-02-14 12:44:50 UTC 
(rev 21332)
@@ -4,12 +4,12 @@
 use strict;
 use warnings;
 
-use Test::More tests = 16;
+use Test::More tests = 20;
 use FindBin qw($RealBin);
 use lib $RealBin;
 use Util;
 use Parse::Pidl::Util qw(MyDumper);
-use Parse::Pidl::Samba4::NDR::Parser qw(check_null_pointer 
GenerateFunctionInEnv GenerateFunctionOutEnv);
+use Parse::Pidl::Samba4::NDR::Parser qw(check_null_pointer 
GenerateFunctionInEnv GenerateFunctionOutEnv GenerateStructEnv 
EnvSubstituteValue); 
 
 my $output;
 sub print_fn($) { my $x = shift; $output.=$x; }
@@ -152,3 +152,23 @@
 
 $fn = { ELEMENTS = [ { DIRECTION = [out], NAME = foo } ] };
 is_deeply({ }, GenerateFunctionInEnv($fn));
+
+$fn = { ELEMENTS = [ { NAME = foo }, { NAME = bar } ] };
+is_deeply({ foo = r-foo, bar = r-bar, this = r }, 
GenerateStructEnv($fn));
+
+$fn = { ELEMENTS = [ { NAME = foo, PROPERTIES = { value = 3 }} ] };
+
+my $env

svn commit: samba r21338 - in branches/SAMBA_4_0: . source/pidl/lib/Parse/Pidl/Samba3 source/pidl/tests

[jelmer]

Author: jelmer
Date: 2007-02-14 14:23:59 + (Wed, 14 Feb 2007)
New Revision: 21338

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21338

Log:
Fix handling of top-level arrays for the Samba 3 client code. This doesn't 
fix the winreg code yet (as that's an array on top of a pointer), but at least 
it gets us closer.

Also added a couple of tests for the Samba 3 client code.

Added:
   branches/SAMBA_4_0/source/pidl/tests/samba3-cli.pl
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm   
2007-02-14 14:01:50 UTC (rev 21337)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm   
2007-02-14 14:23:59 UTC (rev 21338)
@@ -6,18 +6,22 @@
 
 package Parse::Pidl::Samba3::ClientNDR;
 
+use Exporter;
[EMAIL PROTECTED] = qw(Exporter);
[EMAIL PROTECTED] = qw(GenerateFunctionInEnv ParseFunction $res $res_hdr);
+
 use strict;
 use Parse::Pidl qw(fatal warning);
 use Parse::Pidl::Typelist qw(hasType getType mapType scalar_is_reference);
-use Parse::Pidl::Util qw(has_property is_constant);
+use Parse::Pidl::Util qw(has_property is_constant ParseExpr);
 use Parse::Pidl::NDR qw(GetPrevLevel GetNextLevel ContainsDeferred);
 use Parse::Pidl::Samba4 qw(DeclLong);
 
 use vars qw($VERSION);
 $VERSION = '0.01';
 
-my $res;
-my $res_hdr;
+our $res;
+our $res_hdr;
 my $tabs = ;
 sub indent() { $tabs.=\t; }
 sub deindent() { $tabs = substr($tabs, 1); }
@@ -25,13 +29,26 @@
 sub pidl_hdr($) { $res_hdr .= (shift).\n; }
 sub fn_declare($) { my ($n) = @_; pidl $n; pidl_hdr $n;; }
 
+sub GenerateFunctionInEnv($)
+{
+   my $fn = shift;
+   my %env;
+
+   foreach my $e (@{$fn-{ELEMENTS}}) {
+   if (grep (/in/, @{$e-{DIRECTION}})) {
+   $env{$e-{NAME}} = r.in.$e-{NAME};
+   }
+   }
+
+   return \%env;
+}
+
 sub ParseFunction($$)
 {
-   my ($if,$fn) = @_;
+   my ($uif, $fn) = @_;
 
my $inargs = ;
my $defargs = ;
-   my $uif = uc($if-{NAME});
my $ufn = DCERPC_.uc($fn-{NAME});
 
foreach (@{$fn-{ELEMENTS}}) {
@@ -58,7 +75,7 @@
pidl status = cli_do_rpc_ndr(cli, mem_ctx, PI_$uif, $ufn, r, 
(ndr_pull_flags_fn_t)ndr_pull_$fn-{NAME}, 
(ndr_push_flags_fn_t)ndr_push_$fn-{NAME});;
pidl ;
 
-   pidl if ( !NT_STATUS_IS_OK(status) ) {;
+   pidl if (!NT_STATUS_IS_OK(status)) {;
indent;
pidl return status;;
deindent;
@@ -78,16 +95,29 @@
 
fatal($e, [out] argument is not a pointer or array) if 
($e-{LEVELS}[0]-{TYPE} ne POINTER and $e-{LEVELS}[0]-{TYPE} ne ARRAY);
 
-   if ( ($e-{LEVELS}[0]-{TYPE} eq POINTER)  
($e-{LEVELS}[0]-{POINTER_TYPE} eq unique) ) {
+   if ( ($e-{LEVELS}[0]-{TYPE} eq POINTER) and
+($e-{LEVELS}[0]-{POINTER_TYPE} ne ref) ) {
pidl if ( $e-{NAME} ) {;
indent;
+   }
+
+   if ($e-{LEVELS}[0

svn commit: samba r21340 - in branches/SAMBA_4_0: . source/pidl/lib/Parse/Pidl/Wireshark

[jelmer]

Author: jelmer
Date: 2007-02-14 14:42:42 + (Wed, 14 Feb 2007)
New Revision: 21340

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21340

Log:
Fix warning undef
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm  
2007-02-14 14:25:56 UTC (rev 21339)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm  
2007-02-14 14:42:42 UTC (rev 21340)
@@ -17,7 +17,7 @@
 package Parse::Pidl::Wireshark::NDR;
 
 use strict;
-use Parse::Pidl qw(error);
+use Parse::Pidl qw(error warning);
 use Parse::Pidl::Typelist qw(getType);
 use Parse::Pidl::Util qw(has_property property_matches make_str);
 use Parse::Pidl::NDR qw(ContainsString GetNextLevel);

svn commit: samba r21341 - in branches/SAMBA_4_0: . source/librpc/idl

[jelmer]

Author: jelmer
Date: 2007-02-14 15:18:37 + (Wed, 14 Feb 2007)
New Revision: 21341

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21341

Log:
Improve QueryKeyInfo idl, pointed out by Ronnie Sahlberg.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/librpc/idl/winreg.idl


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/librpc/idl/winreg.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/winreg.idl 2007-02-14 14:42:42 UTC 
(rev 21340)
+++ branches/SAMBA_4_0/source/librpc/idl/winreg.idl 2007-02-14 15:18:37 UTC 
(rev 21341)
@@ -209,8 +209,7 @@
/* Function: 0x10 */
WERROR winreg_QueryInfoKey(
[in,ref] policy_handle *handle,
-   [in] winreg_String class_in,
-   [out,unique] winreg_String *class_out,
+   [in,out,ref] winreg_String *class,
[out,ref] uint32 *num_subkeys,
[out,ref] uint32 *max_subkeylen,
[out,ref] uint32 *max_subkeysize,

svn commit: samba r21343 - in branches/SAMBA_4_0: . source/librpc/idl

[jelmer]

Author: jelmer
Date: 2007-02-14 15:23:12 + (Wed, 14 Feb 2007)
New Revision: 21343

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21343

Log:
Add access masks, pointed out by Ronnie Sahlberg.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/librpc/idl/winreg.idl


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
   - [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]

   + [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]


Modified: branches/SAMBA_4_0/source/librpc/idl/winreg.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/winreg.idl 2007-02-14 15:21:41 UTC 
(rev 21342)
+++ branches/SAMBA_4_0/source/librpc/idl/winreg.idl 2007-02-14 15:23:12 UTC 
(rev 21343)
@@ -16,6 +16,14 @@
declare bitmap security_secinfo;
 
typedef [bitmap32bit] bitmap {
+   KEY_QUERY_VALUE = 0x1,
+   KEY_SET_VALUE   = 0x2,
+   KEY_CREATE_SUB_KEY  = 0x4,
+   KEY_ENUMERATE_SUB_KEYS  = 0x8,
+   KEY_NOTIFY  = 0x00010,
+   KEY_CREATE_LINK = 0x00020,
+   KEY_WOW64_64KEY = 0x00100,
+   KEY_WOW64_32KEY = 0x00200
} winreg_AccessMask;
 
typedef [v1_enum] enum {