date:20070418

Rev 152: validate dmaster on a client fetch request in http://samba.org/~tridge/ctdb

2007-04-18 Thread tridge


revno: 152
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Wed 2007-04-18 18:39:02 +1000
message:
  validate dmaster on a client fetch request
modified:
  common/ctdb_daemon.c   ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
  common/ctdb_util.c ctdb_util.c-20061128065342-to93h6eejj5kon81-3
  include/ctdb_private.h 
ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
=== modified file 'common/ctdb_daemon.c'
--- a/common/ctdb_daemon.c  2007-04-18 05:35:41 +
+++ b/common/ctdb_daemon.c  2007-04-18 08:39:02 +
@@ -244,6 +244,30 @@
_exit(0);
 }
 
+
+/*
+  send a fetch lock error reply to the client
+ */
+static void daemon_fetch_lock_error(struct ctdb_client *client,
+   struct ctdb_req_fetch_lock *f)
+{
+   struct ctdb_reply_fetch_lock r;
+
+   ZERO_STRUCT(r);
+   r.hdr.length   = sizeof(r);
+   r.hdr.ctdb_magic   = CTDB_MAGIC;
+   r.hdr.ctdb_version = CTDB_VERSION;
+   r.hdr.operation= CTDB_REPLY_FETCH_LOCK;
+   r.hdr.reqid= f-hdr.reqid;
+   r.state= -1;
+   
+   /*
+* Ignore the result, there's not much we can do anyway.
+*/
+   ctdb_queue_send(client-queue, (uint8_t *)r.hdr,
+   r.hdr.length);
+}
+
 /*
   called when the daemon gets a fetch lock request from a client
  */
@@ -257,21 +281,13 @@
 
ctdb_db = find_ctdb_db(client-ctdb, f-db_id);
if (ctdb_db == NULL) {
-   struct ctdb_reply_fetch_lock r;
-
-   ZERO_STRUCT(r);
-   r.hdr.length   = sizeof(r);
-   r.hdr.ctdb_magic   = CTDB_MAGIC;
-   r.hdr.ctdb_version = CTDB_VERSION;
-   r.hdr.operation= CTDB_REPLY_FETCH_LOCK;
-   r.hdr.reqid= f-hdr.reqid;
-   r.state= -1;
-
-   /*
-* Ignore the result, there's not much we can do anyway.
-*/
-   ctdb_queue_send(client-queue, (uint8_t *)r.hdr,
-   r.hdr.length);
+   daemon_fetch_lock_error(client, f);
+   return;
+   }
+
+   if (!ctdb_validate_vnn(client-ctdb, f-header.dmaster)) {
+   DEBUG(0,(__location__  Invalid dmaster %u\n, 
f-header.dmaster));
+   daemon_fetch_lock_error(client, f);
return;
}
 

=== modified file 'common/ctdb_util.c'
--- a/common/ctdb_util.c2007-04-17 12:13:06 +
+++ b/common/ctdb_util.c2007-04-18 08:39:02 +
@@ -102,3 +102,4 @@
 
return (1103515243 * value + 12345);  
 }
+

=== modified file 'include/ctdb_private.h'
--- a/include/ctdb_private.h2007-04-18 05:35:41 +
+++ b/include/ctdb_private.h2007-04-18 08:39:02 +
@@ -50,6 +50,11 @@
int port;
 };
 
+/*
+  check a vnn is valid
+ */
+#define ctdb_validate_vnn(ctdb, vnn) (((uint32_t)(vnn))  (ctdb)-num_nodes)
+
 
 /* called from the queue code when a packet comes in. Called with data==NULL
on error */

Rev 153: merged cleanup from ronnie in http://samba.org/~tridge/ctdb

2007-04-18 Thread tridge


revno: 153
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Wed 2007-04-18 18:43:34 +1000
message:
  merged cleanup from ronnie
modified:
  include/ctdb_private.h 
ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13

merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie sahlberg [EMAIL PROTECTED]
branch nick: ctdb
timestamp: Wed 2007-04-18 17:04:26 +1000
message:
  we dont need the structure ctdb_reply_shutdown since we dont implement 
that pdu any more

merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie sahlberg [EMAIL PROTECTED]
branch nick: ctdb
timestamp: Wed 2007-04-18 17:03:10 +1000
message:
  merge from tridge

merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie sahlberg [EMAIL PROTECTED]
branch nick: ctdb
timestamp: Wed 2007-04-18 14:45:08 +1000
message:
  merge from tridge
=== modified file 'include/ctdb_private.h'
--- a/include/ctdb_private.h2007-04-18 08:39:02 +
+++ b/include/ctdb_private.h2007-04-18 08:43:34 +
@@ -310,10 +310,6 @@
struct ctdb_req_header hdr;
 };
 
-struct ctdb_reply_shutdown {
-   struct ctdb_req_header hdr;
-};
-
 struct ctdb_req_connect_wait {
struct ctdb_req_header hdr;
 };

Rev 154: this fixes a timeout error spotted by volker in http://samba.org/~tridge/ctdb

2007-04-18 Thread tridge


revno: 154
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Wed 2007-04-18 19:12:29 +1000
message:
  this fixes a timeout error spotted by volker
  It ensures that when the client context goes away (such as when the client 
exits) 
  that any timed events and partially completed requests from that client also 
go away
modified:
  common/ctdb_daemon.c   ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
=== modified file 'common/ctdb_daemon.c'
--- a/common/ctdb_daemon.c  2007-04-18 08:39:02 +
+++ b/common/ctdb_daemon.c  2007-04-18 09:12:29 +
@@ -151,6 +151,7 @@
state = ctdb_daemon_call_send_remote(ctdb_db, call, header);
state-fetch_private = rec;
talloc_steal(state, rec);
+   talloc_steal(mem_ctx, state);
 
return state;
 }

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

2007-04-18 Thread metze

Author: metze
Date: 2007-04-18 11:08:16 + (Wed, 18 Apr 2007)
New Revision: 22329

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

Log:
abstract the output handling of run_test()
via function pointers

metze
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-04-18 01:17:30 UTC 
(rev 22328)
+++ branches/SAMBA_4_0/source/script/tests/selftest.pl  2007-04-18 11:08:16 UTC 
(rev 22329)
@@ -234,19 +234,64 @@
 }
 
 my $test_output = {};
-sub run_test_plain()
+
+sub plain_start_msg($)
 {
-   my ($name, $cmd, $i, $totalsuites) = @_;
-   my $err = ;
-   if ($#$suitesfailed+1  0) { $err = , .($#$suitesfailed+1). errors; 
}
-   print [$i/$totalsuites in  . (time() - $start).s$err] $name\n;
+   my ($state) = @_;
+   my $out = ;
+
+   $out .= [$state-{INDEX}/$state-{TOTAL} in  . ($state-{START} - 
$start) . s;
+   $out .= , .($#$suitesfailed+1). errors if ($#$suitesfailed+1  0);
+   $out .= ] $state-{NAME}\n;
+
+   $test_output-{$state-{NAME}} =  unless $opt_verbose;
+
+   print $out;
+}
+
+sub plain_output_msg($$)
+{
+   my ($state, $output) = @_;
+
+   if ($opt_verbose) {
+   print $output;
+   } else {
+   $test_output-{$state-{NAME}} .= $output;
+   }
+}
+
+sub plain_end_msg($$$)
+{
+   my ($state, $expected_ret, $ret) = @_;
+
+   if ($ret != $expected_ret and ($opt_immediate or $opt_one) and not 
$opt_verbose) {
+   print $test_output-{$state-{NAME}}.\n;
+   }
+}
+
+my $plain_msg_ops = {
+   start_msg   = \plain_start_msg,
+   output_msg  = \plain_output_msg,
+   end_msg = \plain_end_msg
+};
+
+sub run_test($)
+{
+   my ($name, $cmd, $i, $totalsuites, $msg_ops) = @_;
+   my $msg_state = {
+   NAME= $name,
+   CMD = $cmd,
+   INDEX   = $i,
+   TOTAL   = $totalsuites,
+   START   = time()
+   };
+   $msg_ops-{start_msg}($msg_state);
+   $msg_ops-{output_msg}($msg_state, COMMAND: $cmd\n);
open(RESULT, $cmd 21|);
my $expected_ret = 1;
my $open_tests = {};
-   $test_output-{$name} = ;
-   while (RESULT) { 
-   $test_output-{$name}.=$_;
-   print if ($opt_verbose);
+   while (RESULT) {
+   $msg_ops-{output_msg}($msg_state, $_);
if (/^test: (.+)\n/) {
$open_tests-{$1} = 1;
} elsif (/^(success|failure|skip|error): (.*?)( \[)?\n/) {
@@ -274,15 +319,12 @@
}
}
}
-   $test_output-{$name}.=COMMAND: $cmd\n;
foreach (keys %$open_tests) {
-   $test_output-{$name}.=$_ was started but never finished!\n;  

+   $msg_ops-{output_msg}($msg_state, $_ was started but never 
finished!\n);
$statistics-{TESTS_ERROR}++;
}
my $ret = close(RESULT);
-   if ($ret != $expected_ret and ($opt_immediate or $opt_one) and not 
$opt_verbose) {
-   print $test_output-{$name}\n;
-   }
+   $msg_ops-{end_msg}($msg_state, $expected_ret, $ret);
if ($ret != $expected_ret) {
push(@$suitesfailed, $name);
$statistics-{SUITES_FAIL}++;
@@ -647,7 +689,7 @@
if ($from_build_farm) {
$result = run_test_buildfarm($name, $cmd, $i, 
$suitestotal);
} else {
-   $result = run_test_plain($name, $cmd, $i, $suitestotal);
+   $result = run_test($name, $cmd, $i, $suitestotal, 
$plain_msg_ops);
}
 
if ($opt_socket_wrapper_pcap and $result and

svn commit: samba r22330 - in branches/SAMBA_3_0: .

2007-04-18 Thread obnox

Author: obnox
Date: 2007-04-18 11:12:31 + (Wed, 18 Apr 2007)
New Revision: 22330

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

Log:
For my own convenience (changes discussed some weeks ago with
Jerry, who basically didn't care - now I can commit them myself;-):

- Add a call to mkversion.sh to ensure sane version number even
  from a plain checkout.
- Add a nodocs switch to allow for calling make-tarball.sh without
  the need of having samba-docs and using-samba around.


Modified:
   branches/SAMBA_3_0/make-tarball.sh


Changeset:
Modified: branches/SAMBA_3_0/make-tarball.sh
===
--- branches/SAMBA_3_0/make-tarball.sh  2007-04-18 11:08:16 UTC (rev 22329)
+++ branches/SAMBA_3_0/make-tarball.sh  2007-04-18 11:12:31 UTC (rev 22330)
@@ -4,35 +4,43 @@
 ## You either need to include the using_samba cvs module in the
 ## parent directory or tell the script where to find it 
 ##
-## Usgae:  ./make-tarball.sh
+## Usgae:  ./make-tarball.sh [nodocs]
 
+NODOCS=0
+if [ x$1 = xnodocs ] ; then
+   NODOCS=1
+   echo Not including docs.
+fi
+
 DOCSDIR=../samba-docs/
 USING_SAMBA=../using_samba/
 SRCDIR=`pwd`
 
-if [ ! -d $USING_SAMBA ]; then
-
-   echo Cannot find Using Samba directory \(assuming $USING_SAMBA\).  
-   echo Please set the USING_SAMBA variable in this script to the correct
-   echo location.  The html files are available in the using_samba CVS 
-   echo module on cvs.samba.org.  See http://cvs/samba.org/ for details 
-   echo about anonymous CVS access.  Exiting now
-
-   exit 1
-
+if [ $NODOCS -eq 0 ]; then
+   if [ ! -d $USING_SAMBA ]; then
+   
+   echo Cannot find Using Samba directory \(assuming 
$USING_SAMBA\).  
+   echo Please set the USING_SAMBA variable in this script to the 
correct
+   echo location.  The html files are available in the using_samba 
CVS 
+   echo module on cvs.samba.org.  See http://cvs.samba.org/ for 
details 
+   echo about anonymous CVS access.  Exiting now
+   
+   exit 1
+   
+   fi
+   
+   if [ ! -d $DOCSDIR ]; then
+   
+   echo Cannot find samba-docs \(assuming $DOCSDIR\).
+   echo Please set the DOCSDIR variable in this script 
+   echo to the correct path.
+   
+   exit 1
+   
+   fi
 fi
 
-if [ ! -d $DOCSDIR ]; then
-
-   echo Cannot find samba-docs \(assuming $DOCSDIR\).
-   echo Please set the DOCSDIR variable in this script 
-   echo to the correct path.
-
-   exit 1
-
-fi
-
-
+( cd source ; sh script/mkversion.sh )
 VERSION=`grep SAMBA_VERSION_OFFICIAL_STRING source/include/version.h | cut 
-d\ -f2 | sed 's/ /_/g'`
 TARBALLDIR=/tmp/samba-$VERSION
 
@@ -44,8 +52,10 @@
 mkdir $TARBALLDIR
 rsync -aC ./ $TARBALLDIR
 /bin/rm -rf $TARBALLDIR/docs/*
-rsync -aC $DOCSDIR/ $TARBALLDIR/docs/ 
-rsync -aC $USING_SAMBA $TARBALLDIR/docs/htmldocs/
+if [ $NODOCS -eq 0 ]; then
+   rsync -aC $DOCSDIR/ $TARBALLDIR/docs/ 
+   rsync -aC $USING_SAMBA $TARBALLDIR/docs/htmldocs/
+fi
 
 echo Creating packaging scripts...
 ( cd $TARBALLDIR/packaging; sh bin/update-pkginfo $VERSION 1 )

Rev 5367: Try bzr and, if this is a brz checkout, use bzr branch nick and in http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/

2007-04-18 Thread Michael Adam

At http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/


revno: 5367
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Michael Adam [EMAIL PROTECTED]
branch nick: SAMBA_3_0-registry.bzr
timestamp: Wed 2007-04-18 13:17:37 +0200
message:
  Try bzr and, if this is a brz checkout, use bzr branch nick and
  revision number for the version string if svn info and svk info fail.
modified:
  source/script/mkversion.sh mkversion.sh-20060530022627-7fabc53ed219204b
=== modified file 'source/script/mkversion.sh'
--- a/source/script/mkversion.sh2006-05-30 08:59:01 +
+++ b/source/script/mkversion.sh2007-04-18 11:17:37 +
@@ -82,6 +82,13 @@
else
TMP_SVK_REVISION_STR=[EMAIL PROTECTED]
fi
+   if test x${HAVESVK} = xno;then
+   HAVEBZR=no
+   bzr revno  /dev/null 21  HAVEBZR=yes
+   TMP_BZR_REVNO=`bzr revno 2 /dev/null`
+   TMP_BZR_NICK=`bzr nick 2 /dev/null`
+   TMP_BZR_REVISION_STR=${TMP_BZR_NICK}-${TMP_BZR_REVNO}
+   fi
 fi
 
 if test x${HAVESVN} = xyes;then
@@ -89,6 +96,8 @@
echo #define SAMBA_VERSION_SVN_REVISION ${TMP_REVISION}  
$OUTPUT_FILE
 elif test x${HAVESVK} = xyes;then

SAMBA_VERSION_STRING=${SAMBA_VERSION_STRING}-SVK-build-${TMP_SVK_REVISION_STR}
+elif test x${HAVEBZR} = xyes;then
+   
SAMBA_VERSION_STRING=${SAMBA_VERSION_STRING}-BZR-build-${TMP_BZR_REVISION_STR}
 else
SAMBA_VERSION_STRING=${SAMBA_VERSION_STRING}-SVN-build-UNKNOWN
 fi

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

2007-04-18 Thread metze

Author: metze
Date: 2007-04-18 11:31:55 + (Wed, 18 Apr 2007)
New Revision: 22331

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

Log:
remove run_test_buildfarm() function
and pass buildfarm specific msg_ops to run_test()
instead

metze
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-04-18 11:12:31 UTC 
(rev 22330)
+++ branches/SAMBA_4_0/source/script/tests/selftest.pl  2007-04-18 11:31:55 UTC 
(rev 22331)
@@ -174,66 +174,43 @@
return 0;
 }
 
-sub run_test_buildfarm()
+my $test_output = {};
+
+sub buildfarm_start_msg($)
 {
-   my ($name, $cmd, $i, $suitestotal) = @_;
+   my ($state) = @_;
+
print --==--==--==--==--==--==--==--==--==--==--\n;
-   print Running test $name (level 0 stdout)\n;
+   print Running test $state-{NAME} (level 0 stdout)\n;
print --==--==--==--==--==--==--==--==--==--==--\n;
system(date);
+}
 
-   my $expected_ret = 1;
-   my $open_tests = {};
-   open(RESULT, $cmd 21|);
-   while (RESULT) { 
-   print;
-   if (/^test: (.+)\n/) {
-   $open_tests-{$1} = 1;
-   } elsif (/^(success|failure|skip|error): (.*?)( \[)?\n/) {
-   my $result = $1;
-   if ($1 eq success) {
-   delete $open_tests-{$2};
-   if (expecting_failure($name/$2)) {
-   $statistics-{TESTS_UNEXPECTED_OK}++;
-   } else {
-   $statistics-{TESTS_EXPECTED_OK}++;
-   }
-   } elsif ($1 eq failure) {
-   delete $open_tests-{$2};
-   if (expecting_failure($name/$2)) {
-   $statistics-{TESTS_EXPECTED_FAIL}++;
-   $expected_ret = 0;
-   } else {
-   $statistics-{TESTS_UNEXPECTED_FAIL}++;
-   }
-   } elsif ($1 eq skip) {
-   delete $open_tests-{$2};
-   } elsif ($1 eq error) {
-   $statistics-{TESTS_ERROR}++;
-   delete $open_tests-{$2};
-   }
-   }
-   }
-   print COMMAND: $cmd\n;
-   foreach (keys %$open_tests) {
-   print $_ was started but never finished!\n;   
-   $statistics-{TESTS_ERROR}++;
-   }
-   my $ret = close(RESULT);
+sub buildfarm_output_msg($$)
+{
+   my ($state, $output) = @_;
 
+   print $output;
+}
+
+sub buildfarm_end_msg($$$)
+{
+   my ($state, $expected_ret, $ret) = @_;
+
print ==\n;
if ($ret == $expected_ret) {
-   print TEST PASSED: $name\n;
+   print TEST PASSED: $state-{NAME}\n;
} else {
-   push(@$suitesfailed, $name);
-   print TEST FAILED: $name (status $ret)\n;
+   print TEST FAILED: $state-{NAME} (status $ret)\n;
}
print ==\n;
-
-   return ($ret == $expected_ret);
 }
 
-my $test_output = {};
+my $buildfarm_msg_ops = {
+   start_msg   = \buildfarm_start_msg,
+   output_msg  = \buildfarm_output_msg,
+   end_msg = \buildfarm_end_msg
+};
 
 sub plain_start_msg($)
 {
@@ -687,7 +664,7 @@
SocketWrapper::setup_pcap($pcap_file) if 
($opt_socket_wrapper_pcap);
my $result;
if ($from_build_farm) {
-   $result = run_test_buildfarm($name, $cmd, $i, 
$suitestotal);
+   $result = run_test($name, $cmd, $i, $suitestotal, 
$buildfarm_msg_ops);
} else {
$result = run_test($name, $cmd, $i, $suitestotal, 
$plain_msg_ops);
}

Rev 5368: merge from upstream in http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/

2007-04-18 Thread Michael Adam

At http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/


revno: 5368
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Michael Adam [EMAIL PROTECTED]
branch nick: SAMBA_3_0-registry.bzr
timestamp: Wed 2007-04-18 13:38:12 +0200
message:
  merge from upstream
modified:
  REVISION   REVISION-20060530022625-68239662668b41c3
  source/Makefile.in Makefile.in-20060530022626-b16dac2328ebe703
  source/lib/fault.c fault.c-20060530022627-d2883d4c08c20703
  source/lib/tdb/common/freelist.c freelist.c-2007041647-cebijg5x16vcb45j-16
  source/lib/tdb/common/freelistcheck.c 
freelistcheck.c-2007041647-cebijg5x16vcb45j-17
  source/lib/tdb/common/tdb_private.h 
tdb_private.h-2007041647-cebijg5x16vcb45j-22
  source/lib/tdb/common/transaction.c 
transaction.c-2007041647-cebijg5x16vcb45j-24
  source/libsmb/clifsinfo.c  clifsinfo.c-20060530022627-9360212d14f20006
  source/libsmb/errormap.c   errormap.c-20060530022627-f469e8a07ae28ddc
  source/smbd/seal.c seal.c-20070320050326-brtwj05flzzelvyk-1

merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: [EMAIL PROTECTED]
branch nick: SAMBA_3_0.bzr
timestamp: Wed 2007-04-18 00:01:55 -0500
message:
  [EMAIL PROTECTED] (r22327)  2007-04-17 19:34:10 -0500 (Tue, 17 Apr 2007)
  
  Finish the gss-spnego part of the seal code. Now
  for testing
  Jeremy.
  

merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: [EMAIL PROTECTED]
branch nick: SAMBA_3_0.bzr
timestamp: Tue 2007-04-17 18:10:55 -0500
message:
  [EMAIL PROTECTED] (r22321)  2007-04-17 16:32:59 -0500 (Tue, 17 Apr 2007)
  
  BUG 4509: Makefile fix linking the sfu.so and rfc2307.so 
  plugins in $libdir/nss_info to idmap/ad.so
  
  

merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: [EMAIL PROTECTED]
branch nick: SAMBA_3_0.bzr
timestamp: Tue 2007-04-17 18:08:34 -0500
message:
  [EMAIL PROTECTED] (r22320)  2007-04-17 13:35:10 -0500 (Tue, 17 Apr 2007)
  
  Be more careful and check for the euid instead of the uid.
  
  Thx for the hint James!
  

merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: [EMAIL PROTECTED]
branch nick: SAMBA_3_0.bzr
timestamp: Tue 2007-04-17 18:06:10 -0500
message:
  [EMAIL PROTECTED] (r22318)  2007-04-17 12:17:19 -0500 (Tue, 17 Apr 2007)
  
  If we're running as non root we might not be able to dump the core 
file
  to the corepath.
  
  Even the chdir() will fail if the LOGFILEBASE path is set 0700.
  
  If the currrent user doesn't have the permission to create the core 
file
  we end with:
  unable to change to LOGFILEBASE
  refusing to dump core
  
  The alternative would be to change the permissions of the directory.
  But taht would not ensure core dumps are working out of the box.
  

merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: [EMAIL PROTECTED]
branch nick: SAMBA_3_0.bzr
timestamp: Tue 2007-04-17 18:04:18 -0500
message:
  [EMAIL PROTECTED] (r22317)  2007-04-17 12:07:14 -0500 (Tue, 17 Apr 2007)
  
  add tdb_ prefix to non static function
  
  metze

merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: [EMAIL PROTECTED]
branch nick: SAMBA_3_0.bzr
timestamp: Tue 2007-04-17 18:02:06 -0500
message:
  [EMAIL PROTECTED] (r22316)  2007-04-17 12:03:38 -0500 (Tue, 17 Apr 2007)
  
  merge from samba4:
  
  this function should be static
  
  metze
=== modified file 'REVISION'
--- a/REVISION  2007-04-17 17:07:17 +
+++ b/REVISION  2007-04-18 05:01:55 +
@@ -2,9 +2,9 @@
 URL: svn+ssh://svn.samba.org/home/svn/samba/branches/SAMBA_3_0
 Repository Root: svn+ssh://svn.samba.org/home/svn/samba
 Repository UUID: 0c0555d6-39d7-0310-84fc-f1cc0bd64818
-Revision: 22315
+Revision: 22327
 Node Kind: directory
-Last Changed Author: metze
-Last Changed Rev: 22315
-Last Changed Date: 2007-04-17 11:53:06 -0500 (Tue, 17 Apr 2007)
+Last Changed Author: jra
+Last Changed Rev: 22327
+Last Changed Date: 2007-04-17 19:34:10 -0500 (Tue, 17 Apr 2007)
 

=== modified file 'source/Makefile.in'
--- a/source/Makefile.in

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

2007-04-18 Thread metze

Author: metze
Date: 2007-04-18 11:55:03 + (Wed, 18 Apr 2007)
New Revision: 22332

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

Log:
escape bad chars with '_' to form a nice filename

metze
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-04-18 11:31:55 UTC 
(rev 22331)
+++ branches/SAMBA_4_0/source/script/tests/selftest.pl  2007-04-18 11:55:03 UTC 
(rev 22332)
@@ -659,7 +659,9 @@
 
setup_env($envname);
 
-   my $pcap_file = $pcap_dir/$name.cap;
+   my $shname = $name;
+   $shname =~ 
s%[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\-]%_%g;
+   my $pcap_file = $pcap_dir/$shname.cap;
 
SocketWrapper::setup_pcap($pcap_file) if 
($opt_socket_wrapper_pcap);
my $result;

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

2007-04-18 Thread abartlet

Author: abartlet
Date: 2007-04-18 12:17:53 + (Wed, 18 Apr 2007)
New Revision: 22333

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

Log:
Use kerberos and the ntvfs/cifs backend for just one test, in the
quicktest.

Andrew Bartlett

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


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/test_quick.sh
===
--- branches/SAMBA_4_0/source/script/tests/test_quick.sh2007-04-18 
11:55:03 UTC (rev 22332)
+++ branches/SAMBA_4_0/source/script/tests/test_quick.sh2007-04-18 
12:17:53 UTC (rev 22333)
@@ -15,5 +15,8 @@
 
 for t in $tests; do
 name=$t
-plantest $name dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS 
//\$SERVER/cifs -U\$USERNAME%\$PASSWORD $t
+plantest $name dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS 
//\$SERVER/tmp -U\$USERNAME%\$PASSWORD $t
 done
+
+name=BASE-OPEN
+plantest ntvfs/cifs $name dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS 
$ADDARGS //\$NETBIOSNAME/cifs -U\$USERNAME%\$PASSWORD $name

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

2007-04-18 Thread metze

Author: metze
Date: 2007-04-18 12:49:05 + (Wed, 18 Apr 2007)
New Revision: 22334

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

Log:
don't print the test output if the test passed
(in build-farm mode)

use scalar(localtime()) instead of system(date)

metze
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-04-18 12:17:53 UTC 
(rev 22333)
+++ branches/SAMBA_4_0/source/script/tests/selftest.pl  2007-04-18 12:49:05 UTC 
(rev 22334)
@@ -179,31 +179,48 @@
 sub buildfarm_start_msg($)
 {
my ($state) = @_;
+   my $out = ;
 
-   print --==--==--==--==--==--==--==--==--==--==--\n;
-   print Running test $state-{NAME} (level 0 stdout)\n;
-   print --==--==--==--==--==--==--==--==--==--==--\n;
-   system(date);
+   $out .= --==--==--==--==--==--==--==--==--==--==--\n;
+   $out .= Running test $state-{NAME} (level 0 stdout)\n;
+   $out .= --==--==--==--==--==--==--==--==--==--==--\n;
+   $out .= scalar(localtime()).\n;
+   $out .= NAME: $state-{NAME}\n;
+   $out .= CMD: $state-{CMD}\n;
+
+   $test_output-{$state-{NAME}} = ;
+
+   print $out;
 }
 
 sub buildfarm_output_msg($$)
 {
my ($state, $output) = @_;
 
-   print $output;
+   $test_output-{$state-{NAME}} .= $output;
 }
 
 sub buildfarm_end_msg($$$)
 {
my ($state, $expected_ret, $ret) = @_;
+   my $out = ;
 
-   print ==\n;
if ($ret == $expected_ret) {
-   print TEST PASSED: $state-{NAME}\n;
+   $out .= ALL OK\n;
} else {
-   print TEST FAILED: $state-{NAME} (status $ret)\n;
+   $out .= ERROR: $ret;
+   $out .= $test_output-{$state-{NAME}};
}
-   print ==\n;
+
+   $out .= ==\n;
+   if ($ret == $expected_ret) {
+   $out .= TEST PASSED: $state-{NAME}\n;
+   } else {
+   $out .= TEST FAILED: $state-{NAME} (status $ret)\n;
+   }
+   $out .= ==\n;
+
+   print $out;
 }
 
 my $buildfarm_msg_ops = {
@@ -212,6 +229,8 @@
end_msg = \buildfarm_end_msg
 };
 
+sub plain_output_msg($$);
+
 sub plain_start_msg($)
 {
my ($state) = @_;
@@ -223,6 +242,8 @@
 
$test_output-{$state-{NAME}} =  unless $opt_verbose;
 
+   plain_output_msg($state, CMD: $state-{CMD}\n);
+
print $out;
 }
 
@@ -263,7 +284,6 @@
START   = time()
};
$msg_ops-{start_msg}($msg_state);
-   $msg_ops-{output_msg}($msg_state, COMMAND: $cmd\n);
open(RESULT, $cmd 21|);
my $expected_ret = 1;
my $open_tests = {};

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

2007-04-18 Thread metze

Author: metze
Date: 2007-04-18 12:50:55 + (Wed, 18 Apr 2007)
New Revision: 22335

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

Log:
output the error code

metze
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-04-18 12:49:05 UTC 
(rev 22334)
+++ branches/SAMBA_4_0/source/script/tests/selftest.pl  2007-04-18 12:50:55 UTC 
(rev 22335)
@@ -262,6 +262,10 @@
 {
my ($state, $expected_ret, $ret) = @_;
 
+   if ($ret != $expected_ret) {
+   plain_output_msg($state, ERROR: $ret\n);
+   }
+
if ($ret != $expected_ret and ($opt_immediate or $opt_one) and not 
$opt_verbose) {
print $test_output-{$state-{NAME}}.\n;
}

Rev 11915: Add some more share tests. in file:///home/jelmer/bzr.samba/SAMBA_4_0/

2007-04-18 Thread Jelmer Vernooij

At file:///home/jelmer/bzr.samba/SAMBA_4_0/


revno: 11915
revision-id: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: SAMBA_4_0
timestamp: Wed 2007-04-18 16:27:30 +0200
message:
  Add some more share tests.
modified:
  source/param/share_ldb.c   svn-v2:[EMAIL PROTECTED]
  source/torture/local/share.c   svn-v2:[EMAIL PROTECTED]
=== modified file 'source/param/share_ldb.c'
--- a/source/param/share_ldb.c  2006-12-05 04:25:27 +
+++ b/source/param/share_ldb.c  2007-04-18 14:27:30 +
@@ -289,7 +289,7 @@
NTSTATUS ret;
int err, i, j;
 
-   for (i = 0, j = 0; i  count || j != 0x03; i++) {
+   for (i = 0, j = 0; i  count  j != 0x03; i++) {
if (strcasecmp(info[i].name, SHARE_TYPE) == 0) j |= 0x02;
if (strcasecmp(info[i].name, SHARE_PATH) == 0) j |= 0x01;
if (strcasecmp(info[i].name, SHARE_NAME) == 0) {

=== modified file 'source/torture/local/share.c'
--- a/source/torture/local/share.c  2007-04-18 01:17:30 +
+++ b/source/torture/local/share.c  2007-04-18 14:27:30 +
@@ -25,15 +25,147 @@
 #include torture/torture.h
 
 static bool test_list_empty(struct torture_context *tctx, 
-   void *tcase_data, 
-   void *test_data)
-{
-   struct share_context *ctx = tcase_data;
-   int count;
-   const char **names;
-
-   torture_assert_ntstatus_ok(tctx, share_list_all(tctx, ctx, count, 
names),
-  share_list_all 
failed);
+   const void *tcase_data, 
+   const void *test_data)
+{
+   struct share_context *ctx = discard_const(tcase_data);
+   int count;
+   const char **names;
+
+   torture_assert_ntstatus_ok(tctx, share_list_all(tctx, ctx, count, 
names),
+  share_list_all 
failed);
+
+   return true;
+}
+
+static bool test_create(struct torture_context *tctx, 
+   const void *tcase_data, 
+   const void *test_data)
+{
+   struct share_context *ctx = discard_const(tcase_data);
+   int count;
+   const char **names;
+   int i;
+   bool found = false;
+   struct share_info inf[] = { 
+   { SHARE_INFO_STRING, SHARE_TYPE, discard_const_p(void *, 
IPC$) },
+   { SHARE_INFO_STRING, SHARE_PATH, discard_const_p(void *, 
/tmp/bla) }
+   };
+   NTSTATUS status;
+
+   status = share_create(ctx, bloe, inf, 2);
+
+   if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED))
+   torture_skip(tctx, Not supported by backend);
+
+   torture_assert_ntstatus_ok(tctx, status, create_share failed);
+
+   torture_assert_ntstatus_ok(tctx, share_list_all(tctx, ctx, count, 
names),
+  share_list_all 
failed);
+
+   torture_assert(tctx, count = 1, creating share failed);
+
+
+   for (i = 0; i  count; i++) {
+   found |= strcmp(names[i], bloe) == 0;
+   }
+
+   torture_assert(tctx, found, created share found);
+
+   return true;
+}
+
+
+static bool test_create_invalid(struct torture_context *tctx, 
+   const void *tcase_data, 
+   const void *test_data)
+{
+   struct share_context *ctx = discard_const(tcase_data);
+   NTSTATUS status;
+
+   status = share_create(ctx, bla, NULL, 0);
+
+   if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED))
+   torture_skip(tctx, Not supported by backend);
+
+   torture_assert_ntstatus_equal(tctx, NT_STATUS_INVALID_PARAMETER, 
+ status,
+  create_share 
failed);
+
+   torture_assert_ntstatus_equal(tctx, NT_STATUS_INVALID_PARAMETER, 
+ 
share_create(ctx, NULL, NULL, 0),
+  create_share 
failed);
+
+   return true;
+}
+
+static bool test_share_remove_invalid(struct torture_context *tctx, 
+   const void *tcase_data, 
+   const void *test_data)
+{
+   struct share_context *ctx = discard_const(tcase_data);
+   NTSTATUS status;
+
+   status = share_remove(ctx, nonexistant);
+
+   if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED))
+   torture_skip(tctx, Not supported by backend);

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

2007-04-18 Thread jelmer

Author: jelmer
Date: 2007-04-18 13:28:04 + (Wed, 18 Apr 2007)
New Revision: 22336

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

Log:
Add some more share tests.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/param/share_ldb.c
   branches/SAMBA_4_0/source/torture/local/share.c


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
...skipped...

Modified: branches/SAMBA_4_0/source/param/share_ldb.c
===
--- branches/SAMBA_4_0/source/param/share_ldb.c 2007-04-18 12:50:55 UTC (rev 
22335)
+++ branches/SAMBA_4_0/source/param/share_ldb.c 2007-04-18 13:28:04 UTC (rev 
22336)
@@ -289,7 +289,7 @@
NTSTATUS ret;
int err, i, j;
 
-   for (i = 0, j = 0; i  count || j != 0x03; i++) {
+   for (i = 0, j = 0; i  count  j != 0x03; i++) {
if (strcasecmp(info[i].name, SHARE_TYPE) == 0) j |= 0x02;
if (strcasecmp(info[i].name, SHARE_PATH) == 0) j |= 0x01;
if (strcasecmp(info[i].name, SHARE_NAME) == 0) {

Modified: branches/SAMBA_4_0/source/torture/local/share.c
===
--- branches/SAMBA_4_0/source/torture/local/share.c 2007-04-18 12:50:55 UTC 
(rev 22335)
+++ branches/SAMBA_4_0/source/torture/local/share.c 2007-04-18 13:28:04 UTC 
(rev 22336)
@@ -25,10 +25,10 @@
 #include torture/torture.h
 
 static bool test_list_empty(struct torture_context *tctx, 
-   void *tcase_data, 
-   void *test_data)
+   const void *tcase_data, 
+   const void *test_data)
 {
-   struct share_context *ctx = tcase_data;
+   struct share_context *ctx = discard_const(tcase_data);
int count;
const char **names;
 
@@ -38,19 +38,157 @@
return true;
 }
 
+static bool test_create(struct torture_context *tctx, 
+   const void *tcase_data, 
+   const void *test_data)
+{
+   struct share_context *ctx = discard_const(tcase_data);
+   int count;
+   const char **names;
+   int i;
+   bool found = false;
+   struct share_info inf[] = { 
+   { SHARE_INFO_STRING, SHARE_TYPE, discard_const_p(void *, 
IPC$) },
+   { SHARE_INFO_STRING, SHARE_PATH, discard_const_p(void *, 
/tmp/bla) }
+   };
+   NTSTATUS status;
+
+   status = share_create(ctx, bloe, inf, 2);
+
+   if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED))
+   torture_skip(tctx, Not supported by backend);
+
+   torture_assert_ntstatus_ok(tctx, status, create_share failed);
+
+   torture_assert_ntstatus_ok(tctx, share_list_all(tctx, ctx, count, 
names),
+  share_list_all 
failed);
+
+   torture_assert(tctx, count = 1, creating share failed);
+
+
+   for (i = 0; i  count; i++) {
+   found |= strcmp(names[i], bloe) == 0;
+   }
+
+   torture_assert(tctx, found, created share found);
+
+   return true;
+}
+
+
+static bool test_create_invalid(struct torture_context *tctx, 
+   const void *tcase_data, 
+   const void *test_data)
+{
+   struct share_context *ctx = discard_const(tcase_data);
+   NTSTATUS status;
+
+   status = share_create(ctx, bla, NULL, 0);
+
+   if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED))
+   torture_skip(tctx, Not supported by backend);
+
+   torture_assert_ntstatus_equal(tctx, NT_STATUS_INVALID_PARAMETER, 
+ status,
+  create_share 
failed);
+
+   torture_assert_ntstatus_equal(tctx, NT_STATUS_INVALID_PARAMETER, 
+ 
share_create(ctx, NULL, NULL, 0),
+  create_share 
failed);
+
+   return true;
+}
+
+static bool test_share_remove_invalid(struct torture_context *tctx, 
+   const void *tcase_data, 
+   const void *test_data)
+{
+   struct share_context *ctx = discard_const(tcase_data);
+   NTSTATUS status;
+
+   status = share_remove(ctx, nonexistant);
+
+   if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED))
+   torture_skip(tctx, Not supported by backend);
+
+   torture_assert_ntstatus_equal(ctx, status, NT_STATUS_UNSUCCESSFUL,

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

2007-04-18 Thread metze

Author: metze
Date: 2007-04-18 14:02:26 + (Wed, 18 Apr 2007)
New Revision: 22337

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

Log:
print out the smbd log output after each test

metze
Modified:
   branches/SAMBA_4_0/source/script/tests/Samba3.pm
   branches/SAMBA_4_0/source/script/tests/Samba4.pm
   branches/SAMBA_4_0/source/script/tests/selftest.pl


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/Samba3.pm
===
--- branches/SAMBA_4_0/source/script/tests/Samba3.pm2007-04-18 13:28:04 UTC 
(rev 22336)
+++ branches/SAMBA_4_0/source/script/tests/Samba3.pm2007-04-18 14:02:26 UTC 
(rev 22337)
@@ -39,6 +39,14 @@
return 0;
 }
 
+sub getlog_env($$)
+{
+   my ($self, $envvars) = @_;
+
+   # TODO...
+   return ;
+}
+
 sub setup_env($$$)
 {
my ($self, $envname, $path) = @_;
@@ -292,6 +300,8 @@
print wait for smbd\n;
system($self-binpath(smbclient) . $envvars-{CONFIGURATION} -L 
$envvars-{SERVER_IP} -U% -p 139 | head -2);
system($self-binpath(smbclient) . $envvars-{CONFIGURATION} -L 
$envvars-{SERVER_IP} -U% -p 139 | head -2);
+
+   print $self-getlog_env($envvars);
 }
 
 1;

Modified: branches/SAMBA_4_0/source/script/tests/Samba4.pm
===
--- branches/SAMBA_4_0/source/script/tests/Samba4.pm2007-04-18 13:28:04 UTC 
(rev 22336)
+++ branches/SAMBA_4_0/source/script/tests/Samba4.pm2007-04-18 14:02:26 UTC 
(rev 22337)
@@ -141,6 +141,8 @@
system(bin/nmblookup $testenv_vars-{CONFIGURATION} -U 
$testenv_vars-{SERVER} $testenv_vars-{NETBIOSNAME});
system(bin/nmblookup $testenv_vars-{CONFIGURATION} 
$testenv_vars-{NETBIOSNAME});
system(bin/nmblookup $testenv_vars-{CONFIGURATION} -U 
$testenv_vars-{SERVER} $testenv_vars-{NETBIOSNAME});
+
+   print $self-getlog_env($testenv_vars);
 }
 
 sub write_ldb_file($$$)
@@ -596,6 +598,7 @@
 
$ret-{SMBD_TEST_FIFO} = $prefix/smbd_test.fifo;
$ret-{SMBD_TEST_LOG} = $prefix/smbd_test.log;
+   $ret-{SMBD_TEST_LOG_POS} = 0;
return $ret;
 }
 
@@ -612,6 +615,7 @@
 
$ret-{SMBD_TEST_FIFO} = $prefix/smbd_test.fifo;
$ret-{SMBD_TEST_LOG} = $prefix/smbd_test.log;
+   $ret-{SMBD_TEST_LOG_POS} = 0;
return $ret;
 }
 
@@ -651,10 +655,30 @@
return $failed;
 }
 
+sub getlog_env($$)
+{
+   my ($self, $envvars) = @_;
+   my $title = SMBD LOG of: $envvars-{NETBIOSNAME}\n;
+   my $out = $title;
+
+   open(LOG, $envvars-{SMBD_TEST_LOG});
+
+   seek(LOG, $envvars-{SMBD_TEST_LOG_POS}, SEEK_SET);
+   while (LOG) {
+   $out .= $_;
+   }
+   $envvars-{SMBD_TEST_LOG_POS} = tell(LOG);
+   close(LOG);
+
+   return  if $out eq $title;
+ 
+   return $out;
+}
+
 sub setup_env($$$)
 {
my ($self, $envname, $path) = @_;
-   
+
if ($envname eq dc) {
return $self-setup_dc($path/dc);
} elsif ($envname eq member) {

Modified: branches/SAMBA_4_0/source/script/tests/selftest.pl
===
--- branches/SAMBA_4_0/source/script/tests/selftest.pl  2007-04-18 13:28:04 UTC 
(rev 22336)
+++ branches/SAMBA_4_0/source/script/tests/selftest.pl  2007-04-18 14:02:26 UTC 
(rev 22337)
@@ -174,6 +174,8 @@
return 0;
 }
 
+sub getlog_env($);
+
 my $test_output = {};
 
 sub buildfarm_start_msg($)
@@ -212,6 +214,8 @@
$out .= $test_output-{$state-{NAME}};
}
 
+   $out .= getlog_env($state-{ENVNAME});
+
$out .= ==\n;
if ($ret == $expected_ret) {
$out .= TEST PASSED: $state-{NAME}\n;
@@ -269,6 +273,8 @@
if ($ret != $expected_ret and ($opt_immediate or $opt_one) and not 
$opt_verbose) {
print $test_output-{$state-{NAME}}.\n;
}
+
+   print getlog_env($state-{ENVNAME});
 }
 
 my $plain_msg_ops = {
@@ -277,10 +283,11 @@
end_msg = \plain_end_msg
 };
 
-sub run_test($)
+sub run_test($$)
 {
-   my ($name, $cmd, $i, $totalsuites, $msg_ops) = @_;
+   my ($envname, $name, $cmd, $i, $totalsuites, $msg_ops) = @_;
my $msg_state = {
+   ENVNAME = $envname,
NAME= $name,
CMD = $cmd,
INDEX   = $i,
@@ -644,6 +651,13 @@
return $testenv_vars;
 }
 
+sub getlog_env($)
+{
+   my ($envname) = @_;
+   return  if ($envname eq none);
+   return $target-getlog_env($running_envs{$envname});
+}
+
 sub teardown_env($)
 {
my ($envname) = @_;
@@ -690,9 +704,9 @@
SocketWrapper::setup_pcap($pcap_file) if 
($opt_socket_wrapper_pcap);
my $result;
if ($from_build_farm) {
-   $result = run_test($name, $cmd, $i, $suitestotal, 
$buildfarm_msg_ops);
+

Rev 11917: Allow regexes in known-failures file in file:///home/jelmer/bzr.samba/SAMBA_4_0/

2007-04-18 Thread Jelmer Vernooij

At file:///home/jelmer/bzr.samba/SAMBA_4_0/


revno: 11917
revision-id: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: SAMBA_4_0
timestamp: Wed 2007-04-18 17:18:01 +0200
message:
  Allow regexes in known-failures file
modified:
  source/script/tests/selftest.pl svn-v2:[EMAIL PROTECTED]
=== modified file 'source/script/tests/selftest.pl'
--- a/source/script/tests/selftest.pl   2007-04-18 14:02:26 +
+++ b/source/script/tests/selftest.pl   2007-04-18 15:18:01 +
@@ -161,7 +161,9 @@
 {
my $fullname = shift;
 
-   return 1 if (grep(/^$fullname$/, @expected_failures));
+   foreach (@expected_failures) {
+   return 1 if ($fullname =~ /$_/);
+   }
 
return 0;
 }
@@ -317,6 +319,7 @@
$statistics-{TESTS_EXPECTED_FAIL}++;
$expected_ret = 0;
} else {
+   print n:$name/$2l\n;
$statistics-{TESTS_UNEXPECTED_FAIL}++;
}
} elsif ($1 eq skip) {

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

2007-04-18 Thread jelmer

Author: jelmer
Date: 2007-04-18 14:18:33 + (Wed, 18 Apr 2007)
New Revision: 22338

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

Log:
Allow regexes in known-failures file
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/script/tests/selftest.pl


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
...skipped...

Modified: branches/SAMBA_4_0/source/script/tests/selftest.pl
===
--- branches/SAMBA_4_0/source/script/tests/selftest.pl  2007-04-18 14:02:26 UTC 
(rev 22337)
+++ branches/SAMBA_4_0/source/script/tests/selftest.pl  2007-04-18 14:18:33 UTC 
(rev 22338)
@@ -161,7 +161,9 @@
 {
my $fullname = shift;
 
-   return 1 if (grep(/^$fullname$/, @expected_failures));
+   foreach (@expected_failures) {
+   return 1 if ($fullname =~ /$_/);
+   }
 
return 0;
 }
@@ -317,6 +319,7 @@
$statistics-{TESTS_EXPECTED_FAIL}++;
$expected_ret = 0;
} else {
+   print n:$name/$2l\n;
$statistics-{TESTS_UNEXPECTED_FAIL}++;
}
} elsif ($1 eq skip) {

Rev 11918: Run some more tests. in file:///home/jelmer/bzr.samba/SAMBA_4_0/

2007-04-18 Thread Jelmer Vernooij

At file:///home/jelmer/bzr.samba/SAMBA_4_0/


revno: 11918
revision-id: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: SAMBA_4_0
timestamp: Wed 2007-04-18 17:42:40 +0200
message:
  Run some more tests.
modified:
  source/librpc/idl/wkssvc.idl   svn-v2:[EMAIL PROTECTED]
  source/samba4-knownfailsvn-v2:[EMAIL PROTECTED]
  source/samba4-skip svn-v2:[EMAIL PROTECTED]
  source/script/tests/Samba3.pm  svn-v2:[EMAIL PROTECTED]
  source/script/tests/selftest.pl svn-v2:[EMAIL PROTECTED]
  source/script/tests/test_rpc.sh svn-v2:[EMAIL PROTECTED]
  source/torture/rpc/winreg.csvn-v2:[EMAIL PROTECTED]
  source/torture/rpc/wkssvc.csvn-v2:[EMAIL PROTECTED]
=== modified file 'source/librpc/idl/wkssvc.idl'
--- a/source/librpc/idl/wkssvc.idl  2006-11-06 22:54:49 +
+++ b/source/librpc/idl/wkssvc.idl  2007-04-18 15:42:40 +
@@ -8,7 +8,8 @@
   version(1.0),
   pointer_default(unique),
   pointer_default_top(unique),
-  helpstring(Workstation Service)
+  helpstring(Workstation Service),
+  endpoint(ncacn_np:[\\pipe\\wkssvc],ncacn_ip_tcp:,ncalrpc:)
 ] interface wkssvc
 {
declare [v1_enum] enum srvsvc_PlatformId;

=== modified file 'source/samba4-knownfail'
--- a/source/samba4-knownfail   2007-03-05 21:28:55 +
+++ b/source/samba4-knownfail   2007-04-18 15:42:40 +
@@ -3,3 +3,6 @@
 LOCAL-ICONV/next_codepoint()
 BASE-DELAYWRITE/finfo update on close
 RAW-OPLOCK/OPLOCK
+RPC-WINREG
+RPC-WKSSVC.*NetWkstaGetInfo
+RPC-WKSSVC.*NetWkstaTransportEnum

=== modified file 'source/samba4-skip'
--- a/source/samba4-skip2007-04-12 02:27:25 +
+++ b/source/samba4-skip2007-04-18 15:42:40 +
@@ -37,3 +37,9 @@
 ntvfs/cifs RAW-SAMBA3BADPATH
 ntvfs/cifs RAW-SCAN-EAMAX
 ntvfs/cifs RAW-CONTEXT
+RPC-SVCCTL
+RPC-DSSYNC
+RPC-EPMAPPER
+RPC-INITSHUTDOWN
+RPC-WINREG
+RPC-SAMSYNC

=== modified file 'source/script/tests/Samba3.pm'
--- a/source/script/tests/Samba3.pm 2007-04-18 14:02:26 +
+++ b/source/script/tests/Samba3.pm 2007-04-18 15:42:40 +
@@ -115,7 +115,7 @@
 
unlink($env_vars-{SMBD_TEST_LOG});
print STARTING SMBD...;
-   my $pid = fork();
+   $pid = fork();
if ($pid == 0) {
open STDOUT, $env_vars-{SMBD_TEST_LOG};
open STDERR, 'STDOUT';

=== modified file 'source/script/tests/selftest.pl'
--- a/source/script/tests/selftest.pl   2007-04-18 14:18:33 +
+++ b/source/script/tests/selftest.pl   2007-04-18 15:42:40 +
@@ -172,7 +172,10 @@
 {
my $fullname = shift;
 
-   return 1 if (grep(/^$fullname$/, @skips));
+   foreach (@skips) {
+   return 1 if ($fullname =~ /$_/);
+   }
+
return 0;
 }
 

=== modified file 'source/script/tests/test_rpc.sh'
--- a/source/script/tests/test_rpc.sh   2007-04-11 11:17:09 +
+++ b/source/script/tests/test_rpc.sh   2007-04-18 15:42:40 +
@@ -2,9 +2,9 @@
 
 # add tests to this list as they start passing, so we test
 # that they stay passing
-ncacn_np_tests=RPC-SPOOLSS RPC-SRVSVC RPC-UNIXINFO RPC-SCHANNEL RPC-JOIN 
RPC-LSA RPC-ECHO RPC-DSSETUP RPC-ALTERCONTEXT RPC-MULTIBIND RPC-NETLOGON 
RPC-MGMT RPC-HANDLES
-ncalrpc_tests=RPC-MGMT RPC-UNIXINFO RPC-SCHANNEL RPC-JOIN RPC-LSA RPC-ECHO 
RPC-DSSETUP RPC-ALTERCONTEXT RPC-MULTIBIND RPC-NETLOGON
-ncacn_ip_tcp_tests=RPC-UNIXINFO RPC-SCHANNEL RPC-JOIN RPC-LSA RPC-ECHO 
RPC-DSSETUP RPC-ALTERCONTEXT RPC-MULTIBIND RPC-NETLOGON RPC-MGMT RPC-HANDLES
+ncacn_np_tests=RPC-SPOOLSS RPC-SRVSVC RPC-UNIXINFO RPC-SCHANNEL RPC-JOIN 
RPC-LSA RPC-ECHO RPC-DSSETUP RPC-ALTERCONTEXT RPC-MULTIBIND RPC-NETLOGON 
RPC-MGMT RPC-HANDLES RPC-WINREG RPC-WKSSVC RPC-SVCCTL RPC-EPMAPPER 
RPC-INITSHUTDOWN RPC-EVENTLOG RPC-ATSVC RPC-SAMSYNC
+ncalrpc_tests=RPC-MGMT RPC-UNIXINFO RPC-SCHANNEL RPC-JOIN RPC-LSA RPC-ECHO 
RPC-DSSETUP RPC-ALTERCONTEXT RPC-MULTIBIND RPC-NETLOGON RPC-WINREG RPC-WKSSVC 
RPC-SVCCTL RPC-EPMAPPER RPC-EVENTLOG RPC-ATSVC RPC-INITSHUTDOWN
+ncacn_ip_tcp_tests=RPC-UNIXINFO RPC-SCHANNEL RPC-JOIN RPC-LSA RPC-ECHO 
RPC-DSSETUP RPC-ALTERCONTEXT RPC-MULTIBIND RPC-NETLOGON RPC-MGMT RPC-HANDLES 
RPC-WINREG RPC-WKSSVC RPC-SVCCTL RPC-EPMAPPER RPC-ATSVC RPC-EVENTLOG RPC-DSSYNC
 slow_ncacn_np_tests=RPC-SAMLOGON RPC-SAMR RPC-SAMR-USERS RPC-SAMR-PASSWORDS 
RPC-COUNTCALLS
 slow_ncalrpc_tests=RPC-SAMR RPC-SAMR-PASSWORDS RPC-COUNTCALLS RPC-CRACKNAMES
 slow_ncacn_ip_tcp_tests=RPC-SAMR RPC-SAMR-PASSWORDS RPC-COUNTCALLS 
RPC-CRACKNAMES

=== modified file 'source/torture/rpc/winreg.c'
--- a/source/torture/rpc/winreg.c   2007-03-05 01:50:33 +
+++ b/source/torture/rpc/winreg.c   2007-04-18 15:42:40 +
@@ -49,7 +49,7 @@
}
 }
 
-static BOOL test_GetVersion(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
+static bool test_GetVersion(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
struct policy_handle *handle)
 {
NTSTATUS status;
@@ -65,18 +65,18 @@

svn commit: samba r22339 - in branches/SAMBA_4_0: . source source/librpc/idl source/script/tests source/torture/rpc

2007-04-18 Thread jelmer

Author: jelmer
Date: 2007-04-18 14:43:05 + (Wed, 18 Apr 2007)
New Revision: 22339

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

Log:
Run some more tests.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/librpc/idl/wkssvc.idl
   branches/SAMBA_4_0/source/samba4-knownfail
   branches/SAMBA_4_0/source/samba4-skip
   branches/SAMBA_4_0/source/script/tests/Samba3.pm
   branches/SAMBA_4_0/source/script/tests/selftest.pl
   branches/SAMBA_4_0/source/script/tests/test_rpc.sh
   branches/SAMBA_4_0/source/torture/rpc/winreg.c
   branches/SAMBA_4_0/source/torture/rpc/wkssvc.c


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

Rev 5369: Fix some build targets: the missing libs only showed up in an in http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/

2007-04-18 Thread Michael Adam

At http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/


revno: 5369
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Michael Adam [EMAIL PROTECTED]
branch nick: SAMBA_3_0-registry.bzr
timestamp: Wed 2007-04-18 17:45:32 +0200
message:
  Fix some build targets: the missing libs only showed up in an
  environment where nscd_flush_cache() is available.
  (SLES10 in my case.)
modified:
  source/Makefile.in Makefile.in-20060530022626-b16dac2328ebe703
=== modified file 'source/Makefile.in'
--- a/source/Makefile.in2007-04-18 11:38:12 +
+++ b/source/Makefile.in2007-04-18 15:45:32 +
@@ -720,7 +720,8 @@
  $(REG_API_ADD_OBJ)
 
 MOUNT_OBJ = client/smbmount.o \
- $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) 
$(SECRETS_OBJ)
+ $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) 
$(SECRETS_OBJ) \
+$(REG_API_ADD_OBJ)
 
 MNT_OBJ = client/smbmnt.o $(VERSION_OBJ) $(LIBREPLACE_OBJ) 
$(SOCKET_WRAPPER_OBJ)
 
@@ -1148,7 +1149,7 @@
 
 bin/[EMAIL PROTECTED]@: proto_exists $(NMBD_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-   @$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) 
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
+   @$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) 
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(SWAT_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@@ -1175,15 +1176,15 @@
 
 bin/[EMAIL PROTECTED]@: proto_exists $(PROFILES_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-   @$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) 
$(LDAP_LIBS) @POPTLIBS@
+   @$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) 
$(LDAP_LIBS) @POPTLIBS@ $(NSCD_LIBS)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(CUPS_OBJ) bin/.dummy
@echo Linking $@
-   @$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) 
$(KRB5LIBS) $(LDAP_LIBS)
+   @$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) 
$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(MOUNT_OBJ) bin/.dummy
@echo Linking $@
-   @$(CC) $(FLAGS) -o $@ $(MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) 
$(KRB5LIBS) $(LDAP_LIBS)
+   @$(CC) $(FLAGS) -o $@ $(MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) 
$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(MNT_OBJ) bin/.dummy
@echo Linking $@
@@ -1203,18 +1204,18 @@
 
 bin/[EMAIL PROTECTED]@: proto_exists $(TESTPARM_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-   @$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) 
$(LDAP_LIBS) @POPTLIBS@
+   @$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) 
$(LDAP_LIBS) @POPTLIBS@ $(NSCD_LIBS)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(STATUS_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) 
$(LDAP_LIBS) \
-   @POPTLIBS@
+   @POPTLIBS@ $(NSCD_LIBS)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(SMBCONTROL_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@$(CC) -DUSING_SMBCONTROL $(FLAGS) -o $@ \
$(SMBCONTROL_OBJ) $(DYNEXP) $(LDFLAGS) \
-   $(LIBS) $(LDAP_LIBS) @LIBUNWIND_PTRACE@ @POPTLIBS@
+   $(LIBS) $(LDAP_LIBS) @LIBUNWIND_PTRACE@ @POPTLIBS@ $(NSCD_LIBS)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(SMBTREE_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@@ -1239,7 +1240,7 @@
 
 bin/[EMAIL PROTECTED]@: proto_exists $(NMBLOOKUP_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-   @$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) 
@POPTLIBS@ $(LDAP_LIBS)
+   @$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) 
@POPTLIBS@ $(LDAP_LIBS) $(NSCD_LIBS)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(SMBTORTURE_OBJ) bin/.dummy
@echo Linking $@
@@ -1275,7 +1276,7 @@
 
 bin/[EMAIL PROTECTED]@: proto_exists $(EVTLOGADM_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-   @$(CC) $(FLAGS) -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) 
$(LDAP_LIBS) @POPTLIBS@
+   @$(CC) $(FLAGS) -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) 
$(LDAP_LIBS) @POPTLIBS@ $(NSCD_LIBS)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(SHARESEC_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@@ -1725,7 +1726,7 @@
 
 bin/[EMAIL PROTECTED]@: proto_exists $(WBINFO_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-   @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) $(LIBS) 
$(LDAP_LIBS) @POPTLIBS@
+   @$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) $(LIBS) 
$(LDAP_LIBS) @POPTLIBS@ $(NSCD_LIBS)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(NTLM_AUTH_OBJ) $(LIB_NONSMBD_OBJ) \
@BUILD_POPT@ bin/.dummy

Rev 5370: Fix more linker dependencies. in http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/

2007-04-18 Thread Michael Adam

At http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/


revno: 5370
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Michael Adam [EMAIL PROTECTED]
branch nick: SAMBA_3_0-registry.bzr
timestamp: Wed 2007-04-18 18:28:12 +0200
message:
  Fix more linker dependencies.
modified:
  source/Makefile.in Makefile.in-20060530022626-b16dac2328ebe703
=== modified file 'source/Makefile.in'
--- a/source/Makefile.in2007-04-18 15:45:32 +
+++ b/source/Makefile.in2007-04-18 16:28:12 +
@@ -1244,12 +1244,12 @@
 
 bin/[EMAIL PROTECTED]@: proto_exists $(SMBTORTURE_OBJ) bin/.dummy
@echo Linking $@
-   @$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) 
$(KRB5LIBS) $(LDAP_LIBS)
+   @$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) 
$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(TALLOCTORT_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(TALLOCTORT_OBJ) $(LDFLAGS) \
-   $(DYNEXP) $(LIBS) $(LDAP_LIBS)
+   $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
 
 bin/[EMAIL PROTECTED]@: $(REPLACETORT_OBJ) bin/.dummy
@echo Linking $@
@@ -1258,11 +1258,11 @@
 
 bin/[EMAIL PROTECTED]@: proto_exists $(MASKTEST_OBJ) bin/.dummy
@echo Linking $@
-   @$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) 
$(KRB5LIBS) $(LDAP_LIBS)
+   @$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) 
$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(MSGTEST_OBJ) bin/.dummy
@echo Linking $@
-   @$(CC) $(FLAGS) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) 
$(KRB5LIBS) $(LDAP_LIBS)
+   @$(CC) $(FLAGS) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) 
$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(SMBCACLS_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@@ -1280,15 +1280,15 @@
 
 bin/[EMAIL PROTECTED]@: proto_exists $(SHARESEC_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-   @$(CC) $(FLAGS) -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) 
$(LDAP_LIBS) @POPTLIBS@
+   @$(CC) $(FLAGS) -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) 
$(LDAP_LIBS) @POPTLIBS@ $(NSCD_LIBS)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(LOCKTEST_OBJ) bin/.dummy
@echo Linking $@
-   @$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) 
$(KRB5LIBS) $(LDAP_LIBS)
+   @$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) 
$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(NSSTEST_OBJ) bin/.dummy
@echo Linking $@
-   @$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) 
$(KRB5LIBS)  $(LDAP_LIBS)
+   @$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) 
$(KRB5LIBS)  $(LDAP_LIBS) $(NSCD_LIBS)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(PDBTEST_OBJ) bin/.dummy
@echo Linking $@
@@ -1308,7 +1308,7 @@
 
 bin/[EMAIL PROTECTED]@: proto_exists $(LOCKTEST2_OBJ) bin/.dummy
@echo Linking $@
-   @$(CC) $(FLAGS) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) 
$(KRB5LIBS) $(LDAP_LIBS)
+   @$(CC) $(FLAGS) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) 
$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS)
 
 bin/[EMAIL PROTECTED]@: $(RPCTORTURE_OBJ) bin/.dummy
@echo Linking $@
@@ -1317,7 +1317,7 @@
 bin/[EMAIL PROTECTED]@: $(NDRDUMP_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(NDRDUMP_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
-   @POPTLIBS@ @LDAP_LIBS@
+   @POPTLIBS@ @LDAP_LIBS@ $(NSCD_LIBS)
 
 bin/[EMAIL PROTECTED]@: proto_exists $(DEBUG2HTML_OBJ) bin/.dummy
@echo Linking $@
@@ -1325,7 +1325,7 @@
 
 bin/[EMAIL PROTECTED]@: proto_exists $(SMBFILTER_OBJ) bin/.dummy
@echo Linking $@
-   @$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS) $(KRB5LIBS) 
$(LDAP_LIBS)
+   @$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS) $(KRB5LIBS) 
$(LDAP_LIBS) $(NSCD_LIBS)
 
 
 bin/ldbedit: proto_exists $(LDBEDIT_OBJ) @BUILD_POPT@ bin/.dummy

svn commit: samba r22340 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch

2007-04-18 Thread jerry

Author: jerry
Date: 2007-04-18 16:45:00 + (Wed, 18 Apr 2007)
New Revision: 22340

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

Log:
Fix another segfault in idmap_ldap.c caused by setting the iterator
LDAPMessage * to NULL on each loop rotation.


Modified:
   branches/SAMBA_3_0/source/nsswitch/idmap_ldap.c
   branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/idmap_ldap.c
===
--- branches/SAMBA_3_0/source/nsswitch/idmap_ldap.c 2007-04-18 14:43:05 UTC 
(rev 22339)
+++ branches/SAMBA_3_0/source/nsswitch/idmap_ldap.c 2007-04-18 16:45:00 UTC 
(rev 22340)
@@ -1028,6 +1028,7 @@
 
 static NTSTATUS idmap_ldap_sids_to_unixids(struct idmap_domain *dom, struct 
id_map **ids)
 {
+   LDAPMessage *entry = NULL;
NTSTATUS ret;
TALLOC_CTX *memctx;
struct idmap_ldap_context *ctx;
@@ -1108,7 +1109,6 @@
}
 
for (i = 0; i  count; i++) {
-   LDAPMessage *entry = NULL;
char *sidstr = NULL;
char *tmp = NULL;
enum id_type type;

Modified: branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c  2007-04-18 14:43:05 UTC 
(rev 22339)
+++ branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c  2007-04-18 16:45:00 UTC 
(rev 22340)
@@ -1025,6 +1025,7 @@
 
 static NTSTATUS idmap_ldap_sids_to_unixids(struct idmap_domain *dom, struct 
id_map **ids)
 {
+   LDAPMessage *entry = NULL;
NTSTATUS ret;
TALLOC_CTX *memctx;
struct idmap_ldap_context *ctx;
@@ -1105,7 +1106,6 @@
}
 
for (i = 0; i  count; i++) {
-   LDAPMessage *entry = NULL;
char *sidstr = NULL;
char *tmp = NULL;
enum id_type type;

Rev 5371: adapt build of examples/VFS to new place of tdb in http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/

2007-04-18 Thread Michael Adam

At http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/


revno: 5371
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Michael Adam [EMAIL PROTECTED]
branch nick: SAMBA_3_0-registry.bzr
timestamp: Wed 2007-04-18 22:16:24 +0200
message:
  adapt build of examples/VFS to new place of tdb
modified:
  examples/VFS/Makefile.in   Makefile.in-20060530022627-e1acae646c53aa13
=== modified file 'examples/VFS/Makefile.in'
--- a/examples/VFS/Makefile.in  2007-03-08 18:01:53 +
+++ b/examples/VFS/Makefile.in  2007-04-18 20:16:24 +
@@ -12,7 +12,7 @@
-I$(SAMBA_SOURCE)/popt  \
-I$(SAMBA_SOURCE)/lib/replace  \
-I$(SAMBA_SOURCE)/lib/talloc  \
-   -I$(SAMBA_SOURCE)/tdb/include  \
+   -I$(SAMBA_SOURCE)/lib/tdb/include  \
-I$(SAMBA_SOURCE)/smbwrapper \
-I$(SAMBA_SOURCE)/librpc \
-I$(SAMBA_SOURCE) -I.

svn commit: samba r22341 - in branches/SAMBA_3_0/examples/VFS: .

2007-04-18 Thread obnox

Author: obnox
Date: 2007-04-18 20:18:43 + (Wed, 18 Apr 2007)
New Revision: 22341

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

Log:

Fix build of examples/VFS: adapt include for new place of tdb...


Modified:
   branches/SAMBA_3_0/examples/VFS/Makefile.in


Changeset:
Modified: branches/SAMBA_3_0/examples/VFS/Makefile.in
===
--- branches/SAMBA_3_0/examples/VFS/Makefile.in 2007-04-18 16:45:00 UTC (rev 
22340)
+++ branches/SAMBA_3_0/examples/VFS/Makefile.in 2007-04-18 20:18:43 UTC (rev 
22341)
@@ -12,7 +12,7 @@
-I$(SAMBA_SOURCE)/popt  \
-I$(SAMBA_SOURCE)/lib/replace  \
-I$(SAMBA_SOURCE)/lib/talloc  \
-   -I$(SAMBA_SOURCE)/tdb/include  \
+   -I$(SAMBA_SOURCE)/lib/tdb/include  \
-I$(SAMBA_SOURCE)/smbwrapper \
-I$(SAMBA_SOURCE)/librpc \
-I$(SAMBA_SOURCE) -I.

Rev 5372: merge from upstream in http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/

2007-04-18 Thread Michael Adam

At http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/


revno: 5372
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Michael Adam [EMAIL PROTECTED]
branch nick: SAMBA_3_0-registry.bzr
timestamp: Wed 2007-04-18 22:21:37 +0200
message:
  merge from upstream
modified:
  REVISION   REVISION-20060530022625-68239662668b41c3
  make-tarball.shmaketarball.sh-20060530022625-59649e9787ac3704
  source/nsswitch/idmap_ldap.c   idmap_ldap.c-20061212152804-ho38ifnk7se3gdfx-1

merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: [EMAIL PROTECTED]
branch nick: SAMBA_3_0.bzr
timestamp: Wed 2007-04-18 12:03:36 -0500
message:
  [EMAIL PROTECTED] (r22340)  2007-04-18 11:45:00 -0500 (Wed, 18 Apr 2007)
  
  Fix another segfault in idmap_ldap.c caused by setting the iterator
  LDAPMessage * to NULL on each loop rotation.
  
  

merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: [EMAIL PROTECTED]
branch nick: SAMBA_3_0.bzr
timestamp: Wed 2007-04-18 12:01:55 -0500
message:
  [EMAIL PROTECTED] (r22330)  2007-04-18 06:12:31 -0500 (Wed, 18 Apr 2007)
  
  For my own convenience (changes discussed some weeks ago with
  Jerry, who basically didn't care - now I can commit them myself;-):
  
  - Add a call to mkversion.sh to ensure sane version number even
  from a plain checkout.
  - Add a nodocs switch to allow for calling make-tarball.sh without
  the need of having samba-docs and using-samba around.
  
  
=== modified file 'REVISION'
--- a/REVISION  2007-04-18 05:01:55 +
+++ b/REVISION  2007-04-18 17:03:36 +
@@ -2,9 +2,9 @@
 URL: svn+ssh://svn.samba.org/home/svn/samba/branches/SAMBA_3_0
 Repository Root: svn+ssh://svn.samba.org/home/svn/samba
 Repository UUID: 0c0555d6-39d7-0310-84fc-f1cc0bd64818
-Revision: 22327
+Revision: 22340
 Node Kind: directory
-Last Changed Author: jra
-Last Changed Rev: 22327
-Last Changed Date: 2007-04-17 19:34:10 -0500 (Tue, 17 Apr 2007)
+Last Changed Author: jerry
+Last Changed Rev: 22340
+Last Changed Date: 2007-04-18 11:45:00 -0500 (Wed, 18 Apr 2007)
 

=== modified file 'make-tarball.sh'
--- a/make-tarball.sh   2006-05-30 02:26:57 +
+++ b/make-tarball.sh   2007-04-18 17:01:55 +
@@ -4,35 +4,43 @@
 ## You either need to include the using_samba cvs module in the
 ## parent directory or tell the script where to find it 
 ##
-## Usgae:  ./make-tarball.sh
+## Usgae:  ./make-tarball.sh [nodocs]
+
+NODOCS=0
+if [ x$1 = xnodocs ] ; then
+   NODOCS=1
+   echo Not including docs.
+fi
 
 DOCSDIR=../samba-docs/
 USING_SAMBA=../using_samba/
 SRCDIR=`pwd`
 
-if [ ! -d $USING_SAMBA ]; then
-
-   echo Cannot find Using Samba directory \(assuming $USING_SAMBA\).  
-   echo Please set the USING_SAMBA variable in this script to the correct
-   echo location.  The html files are available in the using_samba CVS 
-   echo module on cvs.samba.org.  See http://cvs/samba.org/ for details 
-   echo about anonymous CVS access.  Exiting now
-
-   exit 1
-
-fi
-
-if [ ! -d $DOCSDIR ]; then
-
-   echo Cannot find samba-docs \(assuming $DOCSDIR\).
-   echo Please set the DOCSDIR variable in this script 
-   echo to the correct path.
-
-   exit 1
-
-fi
-
-
+if [ $NODOCS -eq 0 ]; then
+   if [ ! -d $USING_SAMBA ]; then
+   
+   echo Cannot find Using Samba directory \(assuming 
$USING_SAMBA\).  
+   echo Please set the USING_SAMBA variable in this script to the 
correct
+   echo location.  The html files are available in the using_samba 
CVS 
+   echo module on cvs.samba.org.  See http://cvs.samba.org/ for 
details 
+   echo about anonymous CVS access.  Exiting now
+   
+   exit 1
+   
+   fi
+   
+   if [ ! -d $DOCSDIR ]; then
+   
+   echo Cannot find samba-docs \(assuming $DOCSDIR\).
+   echo Please set the DOCSDIR variable in this script 
+   echo to the correct path.
+   
+   exit 1
+   
+   fi
+fi
+
+( cd source ; sh script/mkversion.sh )
 VERSION=`grep SAMBA_VERSION_OFFICIAL_STRING source/include/version.h | cut 
-d\ -f2 | sed 's/ /_/g'`
 TARBALLDIR=/tmp/samba-$VERSION
 
@@ -44,8 +52,10 @@
 mkdir $TARBALLDIR
 rsync -aC ./ $TARBALLDIR
 /bin/rm -rf $TARBALLDIR/docs/*
-rsync -aC $DOCSDIR/ $TARBALLDIR/docs/ 
-rsync -aC $USING_SAMBA $TARBALLDIR/docs/htmldocs/
+if [ $NODOCS -eq 0 ]; then
+   rsync -aC $DOCSDIR/ $TARBALLDIR/docs/ 
+   rsync -aC $USING_SAMBA $TARBALLDIR/docs/htmldocs/
+fi
 
 echo Creating packaging scripts...
 ( cd

Rev 5373: Changes have been committed to make-tarball.sh, in http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/

2007-04-18 Thread Michael Adam

At http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/


revno: 5373
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Michael Adam [EMAIL PROTECTED]
branch nick: SAMBA_3_0-registry.bzr
timestamp: Wed 2007-04-18 22:25:13 +0200
message:
  Changes have been committed to make-tarball.sh,
  rendering this parallel version unnecessary.
removed:
  make-tarball.obnox.sh  
maketarball.obnox.sh-2007030459-zmpi8w2w3yl1snl5-1
=== removed file 'make-tarball.obnox.sh'
--- a/make-tarball.obnox.sh 2007-03-01 15:16:27 +
+++ b/make-tarball.obnox.sh 1970-01-01 00:00:00 +
@@ -1,67 +0,0 @@
-#!/bin/sh
-
-## A simple script to build a tarball of the current CVS tree.
-## You either need to include the using_samba cvs module in the
-## parent directory or tell the script where to find it 
-##
-## Usgae:  ./make-tarball.sh
-
-NODOCS=0
-if [ x$1 = xnodocs ] ; then
-   NODOCS=1
-   echo Not including docs.
-fi
-
-DOCSDIR=../samba-docs/
-USING_SAMBA=../using_samba/
-SRCDIR=`pwd`
-
-if [ $NODOCS -eq 0 ]; then
-   if [ ! -d $USING_SAMBA ]; then
-   
-   echo Cannot find Using Samba directory \(assuming 
$USING_SAMBA\).  
-   echo Please set the USING_SAMBA variable in this script to the 
correct
-   echo location.  The html files are available in the using_samba 
CVS 
-   echo module on cvs.samba.org.  See http://cvs.samba.org/ for 
details 
-   echo about anonymous CVS access.  Exiting now
-   
-   exit 1
-   
-   fi
-   
-   if [ ! -d $DOCSDIR ]; then
-   
-   echo Cannot find samba-docs \(assuming $DOCSDIR\).
-   echo Please set the DOCSDIR variable in this script 
-   echo to the correct path.
-   
-   exit 1
-   
-   fi
-fi
-
-( cd source ; sh script/mkversion.sh )
-VERSION=`grep SAMBA_VERSION_OFFICIAL_STRING source/include/version.h | cut 
-d\ -f2 | sed 's/ /_/g'`
-TARBALLDIR=/tmp/samba-$VERSION
-
-echo Creating the tarball source directory in $TARBALLDIR
-
-/bin/rm -rf $TARBALLDIR
-/bin/rm -f samba-$VERSION.tar
-
-mkdir $TARBALLDIR
-rsync -aC ./ $TARBALLDIR
-/bin/rm -rf $TARBALLDIR/docs/*
-if [ $NODOCS -eq 0 ]; then
-   rsync -aC $DOCSDIR/ $TARBALLDIR/docs/ 
-   rsync -aC $USING_SAMBA $TARBALLDIR/docs/htmldocs/
-fi
-
-echo Creating packaging scripts...
-( cd $TARBALLDIR/packaging; sh bin/update-pkginfo $VERSION 1 )
-
-echo Creating source/configure...
-( cd $TARBALLDIR/source; ./autogen.sh )
-
-echo Making tarball samba-$VERSION.tar in current directory...
-( cd `dirname $TARBALLDIR`; tar cf $SRCDIR/samba-$VERSION.tar samba-$VERSION )

svn commit: samba r22342 - in branches/SAMBA_3_0_25/source: include nsswitch

2007-04-18 Thread idra

Author: idra
Date: 2007-04-18 20:49:59 + (Wed, 18 Apr 2007)
New Revision: 22342

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

Log:

This patch tries to fix a number of problems with the offline code.
So far I have tested it only with idmap_tdb, idmap_ad testing is next.

Fixes:
- The code returned an error on any idmap call if winbindd
was put offline before the idmap code was initialized.
- The code denied consulting any backend, even local ones
like idmap_tdb when offline, correct the situation by
handling offline decisions in the backends

Simo.


Modified:
   branches/SAMBA_3_0_25/source/include/idmap.h
   branches/SAMBA_3_0_25/source/include/smb.h
   branches/SAMBA_3_0_25/source/nsswitch/idmap.c
   branches/SAMBA_3_0_25/source/nsswitch/idmap_ad.c
   branches/SAMBA_3_0_25/source/nsswitch/idmap_cache.c
   branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c
   branches/SAMBA_3_0_25/source/nsswitch/idmap_nss.c
   branches/SAMBA_3_0_25/source/nsswitch/idmap_passdb.c
   branches/SAMBA_3_0_25/source/nsswitch/idmap_tdb.c


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

svn commit: samba r22343 - in branches/SAMBA_3_0/source: include nsswitch

2007-04-18 Thread idra

Author: idra
Date: 2007-04-18 21:10:37 + (Wed, 18 Apr 2007)
New Revision: 22343

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

Log:

Commit to 3_0 as well after adapting the patch.
(tdb_delete_bystring instead of tdb_delete is used here)


Modified:
   branches/SAMBA_3_0/source/include/idmap.h
   branches/SAMBA_3_0/source/include/smb.h
   branches/SAMBA_3_0/source/nsswitch/idmap.c
   branches/SAMBA_3_0/source/nsswitch/idmap_ad.c
   branches/SAMBA_3_0/source/nsswitch/idmap_cache.c
   branches/SAMBA_3_0/source/nsswitch/idmap_ldap.c
   branches/SAMBA_3_0/source/nsswitch/idmap_nss.c
   branches/SAMBA_3_0/source/nsswitch/idmap_passdb.c
   branches/SAMBA_3_0/source/nsswitch/idmap_tdb.c


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

svn commit: samba r22344 - in branches/SAMBA_3_0/source/libsmb: .

2007-04-18 Thread jra

Author: jra
Date: 2007-04-18 21:56:18 + (Wed, 18 Apr 2007)
New Revision: 22344

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

Log:
Correctly create sub-struct for GSS encryption.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/libsmb/clifsinfo.c


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/clifsinfo.c
===
--- branches/SAMBA_3_0/source/libsmb/clifsinfo.c2007-04-18 21:10:37 UTC 
(rev 22343)
+++ branches/SAMBA_3_0/source/libsmb/clifsinfo.c2007-04-18 21:56:18 UTC 
(rev 22344)
@@ -368,6 +368,21 @@
}
ZERO_STRUCTP(es);
es-smb_enc_type = smb_enc_type;
+
+   if (smb_enc_type == SMB_TRANS_ENC_GSS) {
+#if defined(HAVE_GSSAPI)  defined(HAVE_KRB5)
+   es-s.gss_state = SMB_MALLOC_P(struct smb_tran_enc_state_gss);
+   if (!es-s.gss_state) {
+   SAFE_FREE(es);
+   return NULL;
+   }
+   ZERO_STRUCTP(es-s.gss_state);
+#else
+   DEBUG(0,(make_cli_enc_state: no krb5 compiled.\n);
+   SAFE_FREE(es);
+   return NULL;
+#endif
+   }
return es;
 }

svn commit: samba r22345 - in branches/SAMBA_3_0/source/libsmb: .

2007-04-18 Thread jra

Author: jra
Date: 2007-04-18 22:02:30 + (Wed, 18 Apr 2007)
New Revision: 22345

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

Log:
Only use new krb5 OID.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/libsmb/clifsinfo.c


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/clifsinfo.c
===
--- branches/SAMBA_3_0/source/libsmb/clifsinfo.c2007-04-18 21:56:18 UTC 
(rev 22344)
+++ branches/SAMBA_3_0/source/libsmb/clifsinfo.c2007-04-18 22:02:30 UTC 
(rev 22345)
@@ -470,7 +470,7 @@
DATA_BLOB spnego_blob_in,
DATA_BLOB *p_blob_out)
 {
-   const char *krb_mechs[] = {OID_KERBEROS5_OLD, OID_KERBEROS5, NULL};
+   const char *krb_mechs[] = {OID_KERBEROS5, NULL};
OM_uint32 ret;
OM_uint32 min;
gss_name_t srv_name;

svn commit: samba r22346 - in branches/SAMBA_4_0/webapps/swat/source/class/swat/module/netmgr: .

2007-04-18 Thread mimir

Author: mimir
Date: 2007-04-18 22:16:34 + (Wed, 18 Apr 2007)
New Revision: 22346

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

Log:
Fix small mistake - after sending rpc request we should go to await
rpc result state instead of idle.


rafal


Modified:
   branches/SAMBA_4_0/webapps/swat/source/class/swat/module/netmgr/Fsm.js


Changeset:
Modified: branches/SAMBA_4_0/webapps/swat/source/class/swat/module/netmgr/Fsm.js
===
--- branches/SAMBA_4_0/webapps/swat/source/class/swat/module/netmgr/Fsm.js  
2007-04-18 22:02:30 UTC (rev 22345)
+++ branches/SAMBA_4_0/webapps/swat/source/class/swat/module/netmgr/Fsm.js  
2007-04-18 22:16:34 UTC (rev 22346)
@@ -120,7 +120,7 @@
   var trans = new qx.util.fsm.Transition(
 Transition_Idle_to_Idle_via_tree_selection_changed,
 {
-  nextState : State_Idle,
+  nextState : State_AwaitRpcResult,
 
   ontransition : function(fsm, event)
   {

svn commit: samba r22347 - in branches/SAMBA_3_0_25/source/nsswitch: .

2007-04-18 Thread idra

Author: idra
Date: 2007-04-18 22:20:13 + (Wed, 18 Apr 2007)
New Revision: 22347

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

Log:

Better message.
This string is displayed both at login and when unlocking the screen.


Modified:
   branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c


Changeset:
Modified: branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c 2007-04-18 22:16:34 UTC 
(rev 22346)
+++ branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c 2007-04-18 22:20:13 UTC 
(rev 22347)
@@ -921,9 +921,9 @@
} else if (PAM_WB_CACHED_LOGON(info3_user_flgs)) {
 
_make_remark(pamh, ctrl, PAM_ERROR_MSG, 
-   Logging on using cached account. Network resources can 
be unavailable);
+   Domain Controller unreachable, using cached 
credentials. Network resources may be unavailable);
_pam_log_debug(pamh, ctrl, LOG_DEBUG,
-   User %s logged on using cached account\n, username);
+   User %s logged on using cached credentials\n, 
username);
}
 }

svn commit: samba r22348 - in branches/SAMBA_3_0/source/nsswitch: .

2007-04-18 Thread idra

Author: idra
Date: 2007-04-18 22:25:17 + (Wed, 18 Apr 2007)
New Revision: 22348

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

Log:

3_0 as well


Modified:
   branches/SAMBA_3_0/source/nsswitch/pam_winbind.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
===
--- branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2007-04-18 22:20:13 UTC 
(rev 22347)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2007-04-18 22:25:17 UTC 
(rev 22348)
@@ -921,7 +921,7 @@
} else if (PAM_WB_CACHED_LOGON(info3_user_flgs)) {
 
_make_remark(pamh, ctrl, PAM_ERROR_MSG, 
-   Logging on using cached account. Network resources can 
be unavailable);
+   Domain Controller unreachable, using cached 
credentials. Network resources may be unavailable);
_pam_log_debug(pamh, ctrl, LOG_DEBUG,
User %s logged on using cached account\n, username);
}

svn commit: samba r22349 - in branches/SAMBA_3_0/source/libsmb: .

2007-04-18 Thread jra

Author: jra
Date: 2007-04-18 22:34:23 + (Wed, 18 Apr 2007)
New Revision: 22349

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

Log:
Fix missing ) in #else path.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/libsmb/clifsinfo.c


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/clifsinfo.c
===
--- branches/SAMBA_3_0/source/libsmb/clifsinfo.c2007-04-18 22:25:17 UTC 
(rev 22348)
+++ branches/SAMBA_3_0/source/libsmb/clifsinfo.c2007-04-18 22:34:23 UTC 
(rev 22349)
@@ -378,7 +378,7 @@
}
ZERO_STRUCTP(es-s.gss_state);
 #else
-   DEBUG(0,(make_cli_enc_state: no krb5 compiled.\n);
+   DEBUG(0,(make_cli_enc_state: no krb5 compiled.\n));
SAFE_FREE(es);
return NULL;
 #endif

Rev 155: merged the db_dir changes from volker. Changed them slightly, in http://samba.org/~tridge/ctdb

2007-04-18 Thread tridge


revno: 155
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Thu 2007-04-19 09:14:25 +1000
message:
  merged the db_dir changes from volker. Changed them slightly,
  to make the --dbdir option available to all ctdb tools, not just
  the daemon
modified:
  common/cmdline.c   cmdline.c-20070416041216-w1zvz91bkdsgjckw-1
  common/ctdb.c  ctdb.c-20061127094323-t50f58d65iaao5of-2
  common/ctdb_ltdb.c ctdb_ltdb.c-20061128065342-to93h6eejj5kon81-2
  include/ctdb.h ctdb.h-20061117234101-o3qt14umlg9en8z0-11
  include/ctdb_private.h 
ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13

merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Volker Lendecke [EMAIL PROTECTED]
branch nick: vl-ctdb
timestamp: Wed 2007-04-18 16:36:22 +0200
message:
  Add --dbdir to ctdbd. Necessary for shared operation between ctdbd and 
smbd.
=== modified file 'common/cmdline.c'
--- a/common/cmdline.c  2007-04-17 12:16:50 +
+++ b/common/cmdline.c  2007-04-18 23:14:25 +
@@ -31,11 +31,13 @@
const char *transport;
const char *myaddress;
int self_connect;
+   const char *db_dir;
 } ctdb_cmdline = {
.nlist = NULL,
.transport = tcp,
.myaddress = NULL,
.self_connect = 0,
+   .db_dir = .
 };
 
 
@@ -45,6 +47,7 @@
{ transport, 0, POPT_ARG_STRING, ctdb_cmdline.transport, 0, 
protocol transport, NULL },
{ self-connect, 0, POPT_ARG_NONE, ctdb_cmdline.self_connect, 0, 
enable self connect, boolean },
{ debug, 'd', POPT_ARG_INT, LogLevel, 0, debug level},
+   { dbdir, 0, POPT_ARG_STRING, ctdb_cmdline.db_dir, 0, directory for 
the tdb files, NULL },
{ NULL }
 };
 
@@ -93,5 +96,11 @@
exit(1);
}
 
+   ret = ctdb_set_tdb_dir(ctdb, ctdb_cmdline.db_dir);
+   if (ret == -1) {
+   printf(ctdb_set_tdb_dir failed - %s\n, ctdb_errstr(ctdb));
+   exit(1);
+   }
+
return ctdb;
 }

=== modified file 'common/ctdb.c'
--- a/common/ctdb.c 2007-04-18 02:39:03 +
+++ b/common/ctdb.c 2007-04-18 23:14:25 +
@@ -74,6 +74,18 @@
 }
 
 /*
+  set the directory for the local databases
+*/
+int ctdb_set_tdb_dir(struct ctdb_context *ctdb, const char *dir)
+{
+   ctdb-db_directory = talloc_strdup(ctdb, dir);
+   if (ctdb-db_directory == NULL) {
+   return -1;
+   }
+   return 0;
+}
+
+/*
   add a node to the list of active nodes
 */
 static int ctdb_add_node(struct ctdb_context *ctdb, char *nstr)

=== modified file 'common/ctdb_ltdb.c'
--- a/common/ctdb_ltdb.c2007-04-18 05:27:26 +
+++ b/common/ctdb_ltdb.c2007-04-18 14:36:22 +
@@ -84,7 +84,7 @@
 
/* add the node id to the database name, so when we run on loopback
   we don't conflict in the local filesystem */
-   name = talloc_asprintf(ctdb_db, %s.%u, name, ctdb_get_vnn(ctdb));
+   name = talloc_asprintf(ctdb_db, %s/%s, ctdb-db_directory, name);
 
/* when we have a separate daemon this will need to be a real
   file, not a TDB_INTERNAL, so the parent can access it to

=== modified file 'include/ctdb.h'
--- a/include/ctdb.h2007-04-18 02:39:03 +
+++ b/include/ctdb.h2007-04-18 23:14:25 +
@@ -72,6 +72,11 @@
 int ctdb_set_transport(struct ctdb_context *ctdb, const char *transport);
 
 /*
+  set the directory for the local databases
+*/
+int ctdb_set_tdb_dir(struct ctdb_context *ctdb, const char *dir);
+
+/*
   set some flags
 */
 void ctdb_set_flags(struct ctdb_context *ctdb, unsigned flags);

=== modified file 'include/ctdb_private.h'
--- a/include/ctdb_private.h2007-04-18 08:43:34 +
+++ b/include/ctdb_private.h2007-04-18 23:14:25 +
@@ -119,6 +119,7 @@
struct event_context *ev;
struct ctdb_address address;
const char *name;
+   const char *db_directory;
uint32_t vnn; /* our own vnn */
uint32_t num_nodes;
uint32_t num_connected;
@@ -460,4 +461,6 @@
 struct ctdb_call *call, 
 struct ctdb_ltdb_header 
*header);
 
+void ctdb_request_finished(struct ctdb_context *ctdb, struct ctdb_req_header 
*hdr);
+
 #endif

Rev 11920: Simple refactoring. in file:///home/jelmer/bzr.samba/SAMBA_4_0/

2007-04-18 Thread Jelmer Vernooij

At file:///home/jelmer/bzr.samba/SAMBA_4_0/


revno: 11920
revision-id: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: SAMBA_4_0
timestamp: Thu 2007-04-19 02:52:19 +0200
message:
  Simple refactoring.
modified:
  source/script/tests/selftest.pl svn-v2:[EMAIL PROTECTED]
=== modified file 'source/script/tests/selftest.pl'
--- a/source/script/tests/selftest.pl   2007-04-18 14:43:05 +
+++ b/source/script/tests/selftest.pl   2007-04-19 00:52:19 +
@@ -672,6 +672,12 @@
delete $running_envs{$envname};
 }
 
+my $msg_ops;
+if ($from_build_farm) {
+   $msg_ops = $buildfarm_msg_ops;
+} else {
+   $msg_ops = $plain_msg_ops;
+}
 
 if ($opt_testenv) {
my $testenv_vars = setup_env(dc);
@@ -708,12 +714,8 @@
my $pcap_file = $pcap_dir/$shname.cap;
 
SocketWrapper::setup_pcap($pcap_file) if 
($opt_socket_wrapper_pcap);
-   my $result;
-   if ($from_build_farm) {
-   $result = run_test($envname, $name, $cmd, $i, 
$suitestotal, $buildfarm_msg_ops);
-   } else {
-   $result = run_test($envname, $name, $cmd, $i, 
$suitestotal, $plain_msg_ops);
-   }
+   my $result = run_test($envname, $name, $cmd, $i, $suitestotal, 
+ $msg_ops);
 
if ($opt_socket_wrapper_pcap and $result and 
not $opt_socket_wrapper_keep_pcap) {
@@ -738,7 +740,8 @@
 my $duration = ($end-$start);
 my $numfailed = $#$suitesfailed+1;
 if ($numfailed == 0) {
-   my $ok = $statistics-{TESTS_EXPECTED_OK} + 
$statistics-{TESTS_EXPECTED_FAIL};
+   my $ok = $statistics-{TESTS_EXPECTED_OK} + 
+$statistics-{TESTS_EXPECTED_FAIL};
print ALL OK ($ok tests in $statistics-{SUITES_OK} testsuites)\n;
 } else {
unless ($from_build_farm) {

Rev 156: in http://samba.org/~tridge/ctdb

2007-04-18 Thread tridge


revno: 156
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Thu 2007-04-19 09:58:23 +1000
message:
  
  - use separate directories for the tdb files by default
  - use TDB_CLEAR_IF_FIRST to ensure we don't use an old tdb
modified:
  common/cmdline.c   cmdline.c-20070416041216-w1zvz91bkdsgjckw-1
  common/ctdb_ltdb.c ctdb_ltdb.c-20061128065342-to93h6eejj5kon81-2
=== modified file 'common/cmdline.c'
--- a/common/cmdline.c  2007-04-18 23:14:25 +
+++ b/common/cmdline.c  2007-04-18 23:58:23 +
@@ -37,7 +37,7 @@
.transport = tcp,
.myaddress = NULL,
.self_connect = 0,
-   .db_dir = .
+   .db_dir = NULL
 };
 
 

=== modified file 'common/ctdb_ltdb.c'
--- a/common/ctdb_ltdb.c2007-04-18 14:36:22 +
+++ b/common/ctdb_ltdb.c2007-04-18 23:58:23 +
@@ -82,6 +82,13 @@
}
}
 
+   if (mkdir(ctdb-db_directory, 0700) == -1  errno != EEXIST) {
+   DEBUG(0,(__location__  Unable to create ctdb directory 
'%s'\n, 
+ctdb-db_directory));
+   talloc_free(ctdb_db);
+   return NULL;
+   }
+
/* add the node id to the database name, so when we run on loopback
   we don't conflict in the local filesystem */
name = talloc_asprintf(ctdb_db, %s/%s, ctdb-db_directory, name);
@@ -89,7 +96,7 @@
/* when we have a separate daemon this will need to be a real
   file, not a TDB_INTERNAL, so the parent can access it to
   for ltdb bypass */
-   ctdb_db-ltdb = tdb_wrap_open(ctdb, name, 0, TDB_DEFAULT, open_flags, 
mode);
+   ctdb_db-ltdb = tdb_wrap_open(ctdb, name, 0, TDB_CLEAR_IF_FIRST, 
open_flags, mode);
if (ctdb_db-ltdb == NULL) {
ctdb_set_error(ctdb, Failed to open tdb %s\n, name);
talloc_free(ctdb_db);

Build status as of Thu Apr 19 00:00:02 2007

2007-04-18 Thread build

URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2007-04-18 
00:00:19.0 +
+++ /home/build/master/cache/broken_results.txt 2007-04-19 00:00:59.0 
+
@@ -1,4 +1,4 @@
-Build status as of Wed Apr 18 00:00:02 2007
+Build status as of Thu Apr 19 00:00:02 2007
 
 Build counts:
 Tree Total  Broken Panic 
@@ -9,15 +9,15 @@
 distcc   3  0  0 
 ldb  35 5  0 
 libreplace   33 6  0 
-lorikeet-heimdal 31 14 0 
-pidl 22 1  0 
-ppp  16 0  0 
+lorikeet-heimdal 27 13 0 
+pidl 22 6  0 
+ppp  17 0  0 
 rsync37 12 0 
 samba0  0  0 
 samba-docs   0  0  0 
 samba-gtk4  4  0 
-samba4   39 21 0 
-samba_3_042 19 2 
+samba4   30 27 2 
+samba_3_034 23 2 
 smb-build33 32 0 
 talloc   37 0  0 
 tdb  35 2  0

Rev 157: avoid a deadlock the fetch_lock code. The deadlock could happen when in http://samba.org/~tridge/ctdb

2007-04-18 Thread tridge


revno: 157
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Thu 2007-04-19 10:03:20 +1000
message:
  avoid a deadlock the fetch_lock code. The deadlock could happen when
  a client held the chainlock, and the daemon received a dmaster reply
  at the same time. The daemon would not be able to process the dmaster
  reply, due to the lock, but the fetch lock cannot make progres until
  the dmaster reply is processed.
  
  The solution is to not hold the lock in the client while talking to
  the daemon. The client has to retry the lock after the record has
  migrated. This means that forward progress is not guaranteed. We'll
  have to see if that matters in practice.
modified:
  .bzrignore bzrignore-20061117235536-slq8jlz2b5161dfm-1
  common/ctdb.c  ctdb.c-20061127094323-t50f58d65iaao5of-2
  common/ctdb_call.c ctdb_call.c-20061128065342-to93h6eejj5kon81-1
  common/ctdb_client.c   ctdb_client.c-20070411010216-3kd8v37k61steeya-1
  common/ctdb_daemon.c   ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
  include/ctdb_private.h 
ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13

Diff too large for email (376, the limit is 200).

svn commit: samba r22350 - in branches/SAMBA_3_0/source/smbd: .

2007-04-18 Thread jra

Author: jra
Date: 2007-04-19 00:35:18 + (Thu, 19 Apr 2007)
New Revision: 22350

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

Log:
Add some helpful debug messages.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/smbd/seal.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/seal.c
===
--- branches/SAMBA_3_0/source/smbd/seal.c   2007-04-18 22:34:23 UTC (rev 
22349)
+++ branches/SAMBA_3_0/source/smbd/seal.c   2007-04-19 00:35:18 UTC (rev 
22350)
@@ -119,13 +119,16 @@
nt_hostbased_service,
srv_name);
 
+   DEBUG(10,(get_srv_gss_creds: imported name %s\n,
+   host_princ_s ));
+
if (ret != GSS_S_COMPLETE) {
SAFE_FREE(host_princ_s);
return map_nt_error_from_gss(ret, min);
}
 
ret = gss_acquire_cred(min,
-   srv_name,
+   srv_name,
GSS_C_INDEFINITE,
GSS_C_NULL_OID_SET,
cred_type,
@@ -134,6 +137,9 @@
NULL);
 
if (ret != GSS_S_COMPLETE) {
+   ADS_STATUS adss = ADS_ERROR_GSS(ret, min);
+   DEBUG(10,(get_srv_gss_creds: gss_acquire_cred failed with 
%s\n,
+   ads_errstr(adss)));
status = map_nt_error_from_gss(ret, min);
}

Rev 158: - make he packet allocation routines take a mem_ctx, which allows in http://samba.org/~tridge/ctdb

2007-04-18 Thread tridge


revno: 158
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Thu 2007-04-19 10:37:44 +1000
message:
  - make he packet allocation routines take a mem_ctx, which allows
us to put memory directly in the right context, avoiding quite a few
talloc_steal calls, and simplifying the code
  
  - make the fetch lock code in the daemon fully async
modified:
  common/ctdb_call.c ctdb_call.c-20061128065342-to93h6eejj5kon81-1
  common/ctdb_client.c   ctdb_client.c-20070411010216-3kd8v37k61steeya-1
  common/ctdb_daemon.c   ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
  ib/ibw_ctdb_init.c 
ibw_ctdb_init.c-20070102171305-cn2z4k7ibx8141d5-1
  include/ctdb_private.h 
ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
  tcp/tcp_init.c tcp_init.c-20061128004937-x70q1cu5xzg5g2tm-2

Diff too large for email (334, the limit is 200).

svn commit: samba r22351 - in branches/SAMBA_3_0/source/smbd: .

2007-04-18 Thread jra

Author: jra
Date: 2007-04-19 00:40:08 + (Thu, 19 Apr 2007)
New Revision: 22351

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

Log:
Making progress in tests...
Jeremy.

Modified:
   branches/SAMBA_3_0/source/smbd/seal.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/seal.c
===
--- branches/SAMBA_3_0/source/smbd/seal.c   2007-04-19 00:35:18 UTC (rev 
22350)
+++ branches/SAMBA_3_0/source/smbd/seal.c   2007-04-19 00:40:08 UTC (rev 
22351)
@@ -127,6 +127,12 @@
return map_nt_error_from_gss(ret, min);
}
 
+   /*
+* We're accessing the krb5.keytab file here.
+* ensure we have permissions to do so.
+*/
+   become_root();
+
ret = gss_acquire_cred(min,
srv_name,
GSS_C_INDEFINITE,
@@ -135,6 +141,7 @@
p_srv_cred,
NULL,
NULL);
+   unbecome_root();
 
if (ret != GSS_S_COMPLETE) {
ADS_STATUS adss = ADS_ERROR_GSS(ret, min);

svn commit: samba r22352 - in branches/SAMBA_3_0/source/smbd: .

2007-04-18 Thread jra

Author: jra
Date: 2007-04-19 00:44:39 + (Thu, 19 Apr 2007)
New Revision: 22352

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

Log:
Wow - working gss SMB sealing !
Jeremy.

Modified:
   branches/SAMBA_3_0/source/smbd/seal.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/seal.c
===
--- branches/SAMBA_3_0/source/smbd/seal.c   2007-04-19 00:40:08 UTC (rev 
22351)
+++ branches/SAMBA_3_0/source/smbd/seal.c   2007-04-19 00:44:39 UTC (rev 
22352)
@@ -365,6 +365,8 @@
out_buf.value = NULL;
out_buf.length = 0;
 
+   become_root();
+
ret = gss_accept_sec_context(min,
gss_state-gss_ctx,
gss_state-creds,
@@ -376,6 +378,7 @@
flags,
NULL,   /* Ingore time. */
NULL);  /* Ignore delegated creds. */
+   unbecome_root();
 
status = gss_err_to_ntstatus(ret, min);
if (ret != GSS_S_COMPLETE  ret != GSS_S_CONTINUE_NEEDED) {

svn commit: samba r22353 - in branches/SAMBA_3_0/source/libsmb: .

2007-04-18 Thread jra

Author: jra
Date: 2007-04-19 00:45:01 + (Thu, 19 Apr 2007)
New Revision: 22353

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

Log:
Fix bad #ifdefs.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/libsmb/errormap.c


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/errormap.c
===
--- branches/SAMBA_3_0/source/libsmb/errormap.c 2007-04-19 00:44:39 UTC (rev 
22352)
+++ branches/SAMBA_3_0/source/libsmb/errormap.c 2007-04-19 00:45:01 UTC (rev 
22353)
@@ -1631,10 +1631,10 @@
 #if defined(GSS_S_UNAVAILABLE)
{GSS_S_UNAVAILABLE, NT_STATUS_UNSUCCESSFUL},
 #endif
-#if defined(GSS_S_BAD_NAMETYPE)
+#if defined(GSS_S_DUPLICATE_ELEMENT)
{GSS_S_DUPLICATE_ELEMENT, NT_STATUS_INVALID_PARAMETER},
 #endif
-#if defined(GSS_S_BAD_NAMETYPE)
+#if defined(GSS_S_NAME_NOT_MN)
{GSS_S_NAME_NOT_MN, NT_STATUS_INVALID_PARAMETER},
 #endif
{ 0, NT_STATUS_OK }

svn commit: samba r22354 - in branches/SAMBA_3_0/source: client libsmb

2007-04-18 Thread jra

Author: jra
Date: 2007-04-19 00:51:18 + (Thu, 19 Apr 2007)
New Revision: 22354

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

Log:
Make client select krb5 encrpyt if krb5 already on.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/client/client.c
   branches/SAMBA_3_0/source/libsmb/clifsinfo.c


Changeset:
Modified: branches/SAMBA_3_0/source/client/client.c
===
--- branches/SAMBA_3_0/source/client/client.c   2007-04-19 00:45:01 UTC (rev 
22353)
+++ branches/SAMBA_3_0/source/client/client.c   2007-04-19 00:51:18 UTC (rev 
22354)
@@ -1789,34 +1789,39 @@
 
 static int cmd_posix_encrypt(void)
 {
-   fstring buf;
-   fstring domain;
-   fstring user;
-   fstring password;
NTSTATUS status;
 
-   if (!next_token_nr(NULL,buf,NULL,sizeof(buf))) {
-   d_printf(posix_encrypt domain user password\n);
-   return 1;
-   }
-   fstrcpy(domain,buf);
+   if (cli-use_kerberos) {
+   status = cli_gss_smb_encryption_start(cli);
+   } else {
+   fstring buf;
+   fstring domain;
+   fstring user;
+   fstring password;
 
-   if (!next_token_nr(NULL,buf,NULL,sizeof(buf))) {
-   d_printf(posix_encrypt domain user password\n);
-   return 1;
-   }
-   fstrcpy(user,buf);
+   if (!next_token_nr(NULL,buf,NULL,sizeof(buf))) {
+   d_printf(posix_encrypt domain user password\n);
+   return 1;
+   }
+   fstrcpy(domain,buf);
 
-   if (!next_token_nr(NULL,buf,NULL,sizeof(buf))) {
-   d_printf(posix_encrypt domain user password\n);
-   return 1;
+   if (!next_token_nr(NULL,buf,NULL,sizeof(buf))) {
+   d_printf(posix_encrypt domain user password\n);
+   return 1;
+   }
+   fstrcpy(user,buf);
+
+   if (!next_token_nr(NULL,buf,NULL,sizeof(buf))) {
+   d_printf(posix_encrypt domain user password\n);
+   return 1;
+   }
+   fstrcpy(password,buf);
+
+   status = cli_raw_ntlm_smb_encryption_start(cli,
+   user,
+   password,
+   domain);
}
-   fstrcpy(password,buf);
-
-   status = cli_raw_ntlm_smb_encryption_start(cli,
-   user,
-   password,
-   domain);

if (!NT_STATUS_IS_OK(status)) {
d_printf(posix_encrypt failed with error %s\n, 
nt_errstr(status));

Modified: branches/SAMBA_3_0/source/libsmb/clifsinfo.c
===
--- branches/SAMBA_3_0/source/libsmb/clifsinfo.c2007-04-19 00:45:01 UTC 
(rev 22353)
+++ branches/SAMBA_3_0/source/libsmb/clifsinfo.c2007-04-19 00:51:18 UTC 
(rev 22354)
@@ -614,4 +614,9 @@
common_free_encryption_state(es);
return status;
 }
+#else
+NTSTATUS cli_gss_smb_encryption_start(struct cli_state *cli)
+{
+   return NT_STATUS_NOT_SUPPORTED;
+}
 #endif

Rev 11921: Don't use 'our' in file:///home/jelmer/bzr.samba/SAMBA_4_0/

2007-04-18 Thread Jelmer Vernooij

At file:///home/jelmer/bzr.samba/SAMBA_4_0/


revno: 11921
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: SAMBA_4_0
timestamp: Thu 2007-04-19 03:54:45 +0200
message:
  Don't use 'our'
modified:
  source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm svn-v2:[EMAIL PROTECTED]
  source/pidl/lib/Parse/Pidl/Samba4/EJS.pm svn-v2:[EMAIL PROTECTED]
  source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm svn-v2:[EMAIL PROTECTED]
  source/pidl/lib/Parse/Pidl/Samba4/TDR.pm svn-v2:[EMAIL PROTECTED]
  source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm svn-v2:[EMAIL PROTECTED]
  source/pidl/tests/wireshark-ndr.pl svn-v2:[EMAIL PROTECTED]
=== modified file 'source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm'
--- a/source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm2007-02-18 18:44:56 
+
+++ b/source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm2007-04-19 01:54:45 
+
@@ -20,8 +20,8 @@
 use vars qw($VERSION);
 $VERSION = '0.01';
 
-our $res;
-our $res_hdr;
+my $res;
+my $res_hdr;
 my $tabs = ;
 sub indent() { $tabs.=\t; }
 sub deindent() { $tabs = substr($tabs, 1); }

=== modified file 'source/pidl/lib/Parse/Pidl/Samba4/EJS.pm'
--- a/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm  2007-02-28 13:25:53 +
+++ b/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm  2007-04-19 01:54:45 +
@@ -21,8 +21,8 @@
 use vars qw($VERSION);
 $VERSION = '0.01';
 
-our $res;
-our $res_hdr;
+my $res;
+my $res_hdr;
 
 my %constants;
 

=== modified file 'source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm'
--- a/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm   2007-03-02 14:53:09 
+
+++ b/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm   2007-04-19 01:54:45 
+
@@ -9,10 +9,7 @@
 
 require Exporter;
 @ISA = qw(Exporter);
[EMAIL PROTECTED] = qw(is_charset_array);
[EMAIL PROTECTED] = qw(check_null_pointer GenerateFunctionInEnv 
-   GenerateFunctionOutEnv EnvSubstituteValue GenerateStructEnv NeededFunction
-   NeededElement NeededType $res NeededInterface TypeFunctionName 
ParseElementPrint);
[EMAIL PROTECTED] = qw(check_null_pointer GenerateFunctionInEnv 
GenerateFunctionOutEnv EnvSubstituteValue GenerateStructEnv NeededFunction 
NeededElement NeededType $res NeededInterface TypeFunctionName 
ParseElementPrint);
 
 use strict;
 use Parse::Pidl::Typelist qw(hasType getType mapTypeName);
@@ -110,7 +107,7 @@
}
 }
 
-our $res;
+my $res;
 my $deferred = [];
 my $tabs = ;
 

=== modified file 'source/pidl/lib/Parse/Pidl/Samba4/TDR.pm'
--- a/source/pidl/lib/Parse/Pidl/Samba4/TDR.pm  2007-02-18 18:44:56 +
+++ b/source/pidl/lib/Parse/Pidl/Samba4/TDR.pm  2007-04-19 01:54:45 +
@@ -17,8 +17,8 @@
 
 use strict;
 
-our $ret;
-our $ret_hdr;
+my $ret;
+my $ret_hdr;
 my $tabs = ;
 
 sub indent() { $tabs.=\t; }

=== modified file 'source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm'
--- a/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm   2007-03-28 22:52:37 
+
+++ b/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm   2007-04-19 01:54:45 
+
@@ -32,13 +32,13 @@
 use vars qw($VERSION);
 $VERSION = '0.01';
 
-our @ett;
+my @ett;
 
-our %hf_used = ();
+my %hf_used = ();
 my %return_types = ();
 my %dissector_used = ();
 
-our $conformance = undef;
+my $conformance = undef;
 
 my %ptrtype_mappings = (
unique = NDR_POINTER_UNIQUE,
@@ -70,7 +70,7 @@
 return $field;
 }
 
-our %res = ();
+my %res = ();
 my $tabs = ;
 my $cur_fn = undef;
 sub pidl_fn_start($)

=== modified file 'source/pidl/tests/wireshark-ndr.pl'
--- a/source/pidl/tests/wireshark-ndr.pl2007-02-27 21:37:31 +
+++ b/source/pidl/tests/wireshark-ndr.pl2007-04-19 01:54:45 +
@@ -234,7 +234,7 @@
 
 is(DumpHfDeclaration(), 
 /* Header field declarations */
-static gint hf_bla = -1;
+static gint hf_bla_idx = -1;
 
 );

svn commit: samba r22355 - in branches/SAMBA_3_0/source/libsmb: .

2007-04-18 Thread jra

Author: jra
Date: 2007-04-19 01:20:37 + (Thu, 19 Apr 2007)
New Revision: 22355

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

Log:
Ensure we get good debug messages from gss_XX calls.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/libsmb/clifsinfo.c


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/clifsinfo.c
===
--- branches/SAMBA_3_0/source/libsmb/clifsinfo.c2007-04-19 00:51:18 UTC 
(rev 22354)
+++ branches/SAMBA_3_0/source/libsmb/clifsinfo.c2007-04-19 01:20:37 UTC 
(rev 22355)
@@ -533,6 +533,9 @@
 
status = map_nt_error_from_gss(ret, min);
if (!NT_STATUS_IS_OK(status)  
!NT_STATUS_EQUAL(status,NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+   ADS_STATUS adss = ADS_ERROR_GSS(ret, min);
+   DEBUG(10,(make_cli_gss_blob: gss_init_sec_context failed with 
%s\n,
+   ads_errstr(adss)));
goto fail;
}

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

2007-04-18 Thread jelmer

Author: jelmer
Date: 2007-04-19 01:23:09 + (Thu, 19 Apr 2007)
New Revision: 22356

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

Log:
Simple refactoring.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/script/tests/selftest.pl


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
...skipped...

Modified: branches/SAMBA_4_0/source/script/tests/selftest.pl
===
--- branches/SAMBA_4_0/source/script/tests/selftest.pl  2007-04-19 01:20:37 UTC 
(rev 22355)
+++ branches/SAMBA_4_0/source/script/tests/selftest.pl  2007-04-19 01:23:09 UTC 
(rev 22356)
@@ -672,6 +672,12 @@
delete $running_envs{$envname};
 }
 
+my $msg_ops;
+if ($from_build_farm) {
+   $msg_ops = $buildfarm_msg_ops;
+} else {
+   $msg_ops = $plain_msg_ops;
+}
 
 if ($opt_testenv) {
my $testenv_vars = setup_env(dc);
@@ -708,12 +714,8 @@
my $pcap_file = $pcap_dir/$shname.cap;
 
SocketWrapper::setup_pcap($pcap_file) if 
($opt_socket_wrapper_pcap);
-   my $result;
-   if ($from_build_farm) {
-   $result = run_test($envname, $name, $cmd, $i, 
$suitestotal, $buildfarm_msg_ops);
-   } else {
-   $result = run_test($envname, $name, $cmd, $i, 
$suitestotal, $plain_msg_ops);
-   }
+   my $result = run_test($envname, $name, $cmd, $i, $suitestotal, 
+ $msg_ops);
 
if ($opt_socket_wrapper_pcap and $result and 
not $opt_socket_wrapper_keep_pcap) {
@@ -738,7 +740,8 @@
 my $duration = ($end-$start);
 my $numfailed = $#$suitesfailed+1;
 if ($numfailed == 0) {
-   my $ok = $statistics-{TESTS_EXPECTED_OK} + 
$statistics-{TESTS_EXPECTED_FAIL};
+   my $ok = $statistics-{TESTS_EXPECTED_OK} + 
+$statistics-{TESTS_EXPECTED_FAIL};
print ALL OK ($ok tests in $statistics-{SUITES_OK} testsuites)\n;
 } else {
unless ($from_build_farm) {

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

2007-04-18 Thread jelmer

Author: jelmer
Date: 2007-04-19 01:26:15 + (Thu, 19 Apr 2007)
New Revision: 22357

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

Log:
Don't use 'our'

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/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/Wireshark/NDR.pm
   branches/SAMBA_4_0/source/pidl/tests/wireshark-ndr.pl


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
...skipped...

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-04-19 01:23:09 UTC (rev 22356)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm   
2007-04-19 01:26:15 UTC (rev 22357)
@@ -20,8 +20,8 @@
 use vars qw($VERSION);
 $VERSION = '0.01';
 
-our $res;
-our $res_hdr;
+my $res;
+my $res_hdr;
 my $tabs = ;
 sub indent() { $tabs.=\t; }
 sub deindent() { $tabs = substr($tabs, 1); }

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm 2007-04-19 
01:23:09 UTC (rev 22356)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm 2007-04-19 
01:26:15 UTC (rev 22357)
@@ -21,8 +21,8 @@
 use vars qw($VERSION);
 $VERSION = '0.01';
 
-our $res;
-our $res_hdr;
+my $res;
+my $res_hdr;
 
 my %constants;
 

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-04-19 01:23:09 UTC (rev 22356)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm  
2007-04-19 01:26:15 UTC (rev 22357)
@@ -9,10 +9,7 @@
 
 require Exporter;
 @ISA = qw(Exporter);
[EMAIL PROTECTED] = qw(is_charset_array);
[EMAIL PROTECTED] = qw(check_null_pointer GenerateFunctionInEnv 
-   GenerateFunctionOutEnv EnvSubstituteValue GenerateStructEnv NeededFunction
-   NeededElement NeededType $res NeededInterface TypeFunctionName 
ParseElementPrint);
[EMAIL PROTECTED] = qw(check_null_pointer GenerateFunctionInEnv 
GenerateFunctionOutEnv EnvSubstituteValue GenerateStructEnv NeededFunction 
NeededElement NeededType $res NeededInterface TypeFunctionName 
ParseElementPrint);
 
 use strict;
 use Parse::Pidl::Typelist qw(hasType getType mapTypeName);
@@ -110,7 +107,7 @@
}
 }
 
-our $res;
+my $res;
 my $deferred = [];
 my $tabs = ;
 

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/TDR.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/TDR.pm 2007-04-19 
01:23:09 UTC (rev 22356)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/TDR.pm 2007-04-19 
01:26:15 UTC (rev 22357)
@@ -17,8 +17,8 @@
 
 use strict;
 
-our $ret;
-our $ret_hdr;
+my $ret;
+my $ret_hdr;
 my $tabs = ;
 
 sub indent() { $tabs.=\t; }

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-04-19 01:23:09 UTC (rev 22356)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm  
2007-04-19 01:26:15 UTC (rev 22357)
@@ -32,13 +32,13 @@
 use vars qw($VERSION);
 $VERSION = '0.01';
 
-our @ett;
+my @ett;
 
-our %hf_used = ();
+my %hf_used = ();
 my %return_types = ();
 my %dissector_used = ();
 
-our $conformance = undef;
+my $conformance = undef;
 
 my %ptrtype_mappings = (
unique = NDR_POINTER_UNIQUE,
@@ -70,7 +70,7 @@
 return $field;
 }
 
-our %res = ();
+my %res = ();
 my $tabs = ;
 my $cur_fn = undef;
 sub pidl_fn_start($)

Modified: branches/SAMBA_4_0/source/pidl/tests/wireshark-ndr.pl
===
--- branches/SAMBA_4_0/source/pidl/tests/wireshark-ndr.pl   2007-04-19 
01:23:09 UTC (rev 22356)
+++ branches/SAMBA_4_0/source/pidl/tests/wireshark-ndr.pl   2007-04-19 
01:26:15 UTC (rev 22357)
@@ -234,7 +234,7 @@
 
 is(DumpHfDeclaration(), 
 /* Header field declarations */
-static gint hf_bla = -1;
+static gint hf_bla_idx = -1;
 
 );

svn commit: samba r22358 - in branches/SAMBA_3_0/source/libsmb: .

2007-04-18 Thread jra

Author: jra
Date: 2007-04-19 01:26:38 + (Thu, 19 Apr 2007)
New Revision: 22358

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

Log:
Use gss error to NTSTATUS mapping function for errors.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/libsmb/smb_seal.c


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/smb_seal.c
===
--- branches/SAMBA_3_0/source/libsmb/smb_seal.c 2007-04-19 01:26:15 UTC (rev 
22357)
+++ branches/SAMBA_3_0/source/libsmb/smb_seal.c 2007-04-19 01:26:38 UTC (rev 
22358)
@@ -191,8 +191,7 @@
ADS_STATUS adss = ADS_ERROR_GSS(ret, minor);
DEBUG(0,(common_gss_encrypt_buffer: gss_unwrap failed. Error 
%s\n,
ads_errstr(adss) ));
-   /* Um - no mapping for gss-errs to NTSTATUS yet. */
-   return ads_ntstatus(adss);
+   return map_nt_error_from_gss(ret, minor);
}
 
if (out_buf.length  in_buf.length) {
@@ -248,8 +247,7 @@
ADS_STATUS adss = ADS_ERROR_GSS(ret, minor);
DEBUG(0,(common_gss_encrypt_buffer: gss_wrap failed. Error 
%s\n,
ads_errstr(adss) ));
-   /* Um - no mapping for gss-errs to NTSTATUS yet. */
-   return ads_ntstatus(adss);
+   return map_nt_error_from_gss(ret, minor);
}
 
if (!flags_got) {

Rev 159: - fully separate the client version of ctdb_call from the daemon in http://samba.org/~tridge/ctdb

2007-04-18 Thread tridge


revno: 159
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Thu 2007-04-19 11:28:01 +1000
message:
  - fully separate the client version of ctdb_call from the daemon
version. The client version is different enough that this is
worthwhile
  
  - enable local shortcut for client version of ctdb_call
  
  - add idr_find_type(), with better error reporting in case of type
mismatch
modified:
  common/ctdb_call.c ctdb_call.c-20061128065342-to93h6eejj5kon81-1
  common/ctdb_client.c   ctdb_client.c-20070411010216-3kd8v37k61steeya-1
  common/ctdb_util.c ctdb_util.c-20061128065342-to93h6eejj5kon81-3
  include/ctdb.h ctdb.h-20061117234101-o3qt14umlg9en8z0-11
  include/ctdb_private.h 
ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
  tests/bench.sh bench.sh-20070209014602-vdolpr6esqsa58s7-1

Diff too large for email (449, the limit is 200).

Rev 160: much simpler fetch code! in http://samba.org/~tridge/ctdb

2007-04-18 Thread tridge


revno: 160
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Thu 2007-04-19 11:56:37 +1000
message:
  much simpler fetch code!
  fetch is now confined to the client code, no spcial code at
  all in the daemon. 
modified:
  common/ctdb_call.c ctdb_call.c-20061128065342-to93h6eejj5kon81-1
  common/ctdb_client.c   ctdb_client.c-20070411010216-3kd8v37k61steeya-1
  common/ctdb_daemon.c   ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
  common/ctdb_ltdb.c ctdb_ltdb.c-20061128065342-to93h6eejj5kon81-2
  include/ctdb_private.h 
ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13

Diff too large for email (438, the limit is 200).

Rev 161: don't need these structures any more in http://samba.org/~tridge/ctdb

2007-04-18 Thread tridge


revno: 161
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Thu 2007-04-19 12:34:24 +1000
message:
  don't need these structures any more
modified:
  include/ctdb_private.h 
ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
=== modified file 'include/ctdb_private.h'
--- a/include/ctdb_private.h2007-04-19 01:56:37 +
+++ b/include/ctdb_private.h2007-04-19 02:34:24 +
@@ -318,18 +318,6 @@
uint32_t num_connected;
 };
 
-struct ctdb_req_fetch_lock {
-   struct ctdb_req_header hdr;
-   uint32_t db_id;
-   uint32_t keylen;
-   uint8_t key[1]; /* key[] */
-};
-
-struct ctdb_reply_fetch_lock {
-   struct ctdb_req_header hdr;
-   uint32_t state;
-};
-
 /* internal prototypes */
 void ctdb_set_error(struct ctdb_context *ctdb, const char *fmt, ...) 
PRINTF_ATTRIBUTE(2,3);
 void ctdb_fatal(struct ctdb_context *ctdb, const char *msg);

Rev 162: merge from ronnie in http://samba.org/~tridge/ctdb

2007-04-18 Thread tridge


revno: 162
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Thu 2007-04-19 12:43:19 +1000
message:
  merge from ronnie
  remove unused bench_incr function in ctdb_bench.c
modified:
  common/ctdb_daemon.c   ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
  direct/ctdbd.shctdbd.sh-20070411085038-phusiewluwzyqjpc-2
  direct/ctdbd_test.cctdbd_test.c-20070411085057-17kgjzfktsh28g99-1
  tests/ctdb_bench.c ctdb_bench.c-20061219052637-2liagoglohxb6p7s-1

merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie sahlberg [EMAIL PROTECTED]
branch nick: ctdb
timestamp: Thu 2007-04-19 12:34:39 +1000
message:
  remove a comment that is no longer valid

merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie sahlberg [EMAIL PROTECTED]
branch nick: ctdb
timestamp: Thu 2007-04-19 12:33:13 +1000
message:
  add some tests in the daemon that a REQ_CALL that a client sent us has 
valid srcnode and destnode
  
  update ctdbd_test.c to show how to force a migration onto the local node

merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie sahlberg [EMAIL PROTECTED]
branch nick: ctdb
timestamp: Thu 2007-04-19 12:00:29 +1000
message:
  merge from tridge

merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie sahlberg [EMAIL PROTECTED]
branch nick: ctdb
timestamp: Thu 2007-04-19 11:58:34 +1000
message:
  merge from tridge

merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie sahlberg [EMAIL PROTECTED]
branch nick: ctdb
timestamp: Thu 2007-04-19 10:24:11 +1000
message:
  ctdbd does no longer take a --daemon parameter since we no longer do 
non-daemon mode
  remove the parameter from the ctdbd script
  
  remove the store_unlock from ctdbd_test since there is no and will be no 
pdu for this
  CTDB_REPLY_FETCH_LOCK no longer return the data for the record since the 
client is assumed to read this itself from the local tdb. remove some variables 
that no longer exists.

merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie sahlberg [EMAIL PROTECTED]
branch nick: ctdb
timestamp: Thu 2007-04-19 10:07:07 +1000
message:
  merge from tridge

merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie sahlberg [EMAIL PROTECTED]
branch nick: ctdb
timestamp: Thu 2007-04-19 08:18:38 +1000
message:
  merge from tridge

Diff too large for email (206, the limit is 200).

Rev 163: merge from ronnie in http://samba.org/~tridge/ctdb

2007-04-18 Thread tridge


revno: 163
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Thu 2007-04-19 12:54:51 +1000
message:
  merge from ronnie
modified:
  common/ctdb_daemon.c   ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
  direct/ctdbd_test.cctdbd_test.c-20070411085057-17kgjzfktsh28g99-1

merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie sahlberg [EMAIL PROTECTED]
branch nick: ctdb
timestamp: Thu 2007-04-19 12:48:19 +1000
message:
   the checks for srcnode and destnode from the client are redundant since 
the daemon will sort these out itself before it sends the call of to either the 
local handler or a remote daemon
=== modified file 'common/ctdb_daemon.c'
--- a/common/ctdb_daemon.c  2007-04-19 02:33:13 +
+++ b/common/ctdb_daemon.c  2007-04-19 02:48:19 +
@@ -306,18 +306,6 @@
struct daemon_call_state *dstate;
struct ctdb_call *call;
 
-   /* check that the client filled in the correct vnn for the local node */
-   if (ctdb_get_vnn(client-ctdb) != c-hdr.srcnode) {
-   DEBUG(0, (__location__ Wrong srcnode in CTDB_REQ_CALL from 
client  was:%d should be :%d\n, c-hdr.srcnode, ctdb_get_vnn(client-ctdb)));
-   return;
-   }
-
-   /* verify that the destnode makes sense */
-   if (c-hdr.destnode = client-ctdb-num_nodes) {
-   DEBUG(0, (__location__ Wrong dstnode in CTDB_REQ_CALL from 
client  was:%d but there are only %d nodes in the cluster\n, c-hdr.destnode, 
client-ctdb-num_nodes));
-   return;
-   }
-
ctdb_db = find_ctdb_db(client-ctdb, c-db_id);
if (!ctdb_db) {
DEBUG(0, (__location__  Unknown database in request. 
db_id==0x%08x,

=== modified file 'direct/ctdbd_test.c'
--- a/direct/ctdbd_test.c   2007-04-19 02:34:39 +
+++ b/direct/ctdbd_test.c   2007-04-19 02:48:19 +
@@ -188,7 +188,7 @@
 
when the daemon has responded   this node should be the dmaster (unless it 
has migrated off again)
  */
-void fetch_record(int fd, uint32_t db_id, TDB_DATA key, int thisnode, int 
destnode)
+void fetch_record(int fd, uint32_t db_id, TDB_DATA key)
 {
struct ctdb_req_call *req;
struct ctdb_reply_call *rep;
@@ -202,8 +202,6 @@
req-hdr.ctdb_magic  = CTDB_MAGIC;
req-hdr.ctdb_version = CTDB_VERSION;
req-hdr.operation   = CTDB_REQ_CALL;
-   req-hdr.destnode= destnode;
-   req-hdr.srcnode = thisnode;
req-hdr.reqid   = 1;
 
req-flags   = CTDB_IMMEDIATE_MIGRATION;
@@ -298,7 +296,7 @@
key.dsize=strlen((const char *)(key.dptr));
printf(fetch the test key:[%s]\n,key.dptr);
 
-   fetch_record(fd, db_id, key, 0, 1);
+   fetch_record(fd, db_id, key);
printf(\n);

55 matches

Mail list logo