svn commit: samba r26686 - in branches/SAMBA_4_0/source/setup: .

[abartlet]

Author: abartlet
Date: 2008-01-07 05:50:04 + (Mon, 07 Jan 2008)
New Revision: 26686

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26686

Log:
Fix bug 5143 by Jason Tarbet.  This prevented an easy cut-and-paste of
the provision options used.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/setup/provision


Changeset:
Modified: branches/SAMBA_4_0/source/setup/provision
===
--- branches/SAMBA_4_0/source/setup/provision   2008-01-07 05:41:16 UTC (rev 
26685)
+++ branches/SAMBA_4_0/source/setup/provision   2008-01-07 05:50:04 UTC (rev 
26686)
@@ -182,7 +182,7 @@
message("--invocationid='%s' \\\n", subobj.INVOCATIONID);
message("--adminpass='%s' --krbtgtpass='%s' \\\n", subobj.ADMINPASS, 
subobj.KRBTGTPASS);
message("--machinepass='%s' --dnspass='%s' \\\n", subobj.MACHINEPASS, 
subobj.DNSPASS);
-   message("--root='%s' --nobody='%s' --nogroup-'%s' \\\n", subobj.ROOT, 
subobj.NOBODY, subobj.NOGROUP);
+   message("--root='%s' --nobody='%s' --nogroup='%s' \\\n", subobj.ROOT, 
subobj.NOBODY, subobj.NOGROUP);
message("--wheel='%s' --users='%s' --server-role='%s' \\\n", 
subobj.WHEEL, subobj.USERS, subobj.SERVERROLE);
if (ldapbackend) {
message("--ldap-backend='%s' \\\n", subobj.LDAPBACKEND);

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

[abartlet]

Author: abartlet
Date: 2008-01-07 05:41:16 + (Mon, 07 Jan 2008)
New Revision: 26685

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26685

Log:
Fix bug 5137 by Mark Ridley.  The RPC-ATSVC test is not tested, so was
broken by 'ref' changes long ago.

We need a working script to aim against windows.

Andrew Bartlett

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


Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/atsvc.c
===
--- branches/SAMBA_4_0/source/torture/rpc/atsvc.c   2008-01-07 05:22:14 UTC 
(rev 26684)
+++ branches/SAMBA_4_0/source/torture/rpc/atsvc.c   2008-01-07 05:41:16 UTC 
(rev 26685)
@@ -27,9 +27,14 @@
 {
NTSTATUS status;
struct atsvc_JobGetInfo r;
+   struct atsvc_JobInfo *info = talloc(tctx, struct atsvc_JobInfo);
+   if (!info) {
+   return false;
+   }
 
r.in.servername = dcerpc_server_name(p);
r.in.job_id = job_id;
+   r.out.job_info = &info;
 
status = dcerpc_atsvc_JobGetInfo(p, tctx, &r);
 

svn commit: samba r26684 - in branches/SAMBA_4_0/source/lib/ldb/ldb_tdb: .

[abartlet]

Author: abartlet
Date: 2008-01-07 05:22:14 + (Mon, 07 Jan 2008)
New Revision: 26684

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26684

Log:
Trivial cleanup from Matthias Dieter Walln?\195?\182fer, from bug 5090

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_index.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_index.c
===
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_index.c   2008-01-07 
04:46:13 UTC (rev 26683)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_index.c   2008-01-07 
05:22:14 UTC (rev 26684)
@@ -886,7 +886,7 @@
msg->elements[idx].values[msg->elements[idx].num_values].data = 
discard_const_p(uint8_t, dn);
msg->elements[idx].num_values++;
 
-   return 0;
+   return LDB_SUCCESS;
 }
 
 /*

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

[tridge]

revno: 733
revision-id:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge.stable
timestamp: Mon 2008-01-07 16:17:22 +1100
message:
  merge from ronnie
modified:
  include/ctdb_private.h 
ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
  server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
=== modified file 'include/ctdb_private.h'
--- a/include/ctdb_private.h2008-01-06 02:24:55 +
+++ b/include/ctdb_private.h2008-01-07 05:17:22 +
@@ -366,6 +366,7 @@
struct _trbt_tree_t *server_ids;
const char *event_script_dir;
const char *default_public_interface;
+   pid_t ctdbd_pid;
pid_t recoverd_pid;
bool done_startup;
const char *node_ip;

=== modified file 'server/ctdb_recoverd.c'
--- a/server/ctdb_recoverd.c2008-01-07 03:08:25 +
+++ b/server/ctdb_recoverd.c2008-01-07 05:17:22 +
@@ -1821,6 +1821,12 @@
/* we only check for recovery once every second */
ctdb_wait_timeout(ctdb, ctdb->tunable.recover_interval);
 
+   /* verify that the main daemon is still running */
+   if (kill(ctdb->ctdbd_pid, 0) != 0) {
+   DEBUG(0,("CTDB daemon is no longer available. Shutting down 
recovery daemon\n"));
+   exit(-1);
+   }
+
if (rec->election_timeout) {
/* an election is in progress */
goto again;
@@ -2275,6 +2281,8 @@
return -1;
}
 
+   ctdb->ctdbd_pid = getpid();
+
ctdb->recoverd_pid = fork();
if (ctdb->recoverd_pid == -1) {
return -1;

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

[abartlet]

Author: abartlet
Date: 2008-01-07 04:46:13 + (Mon, 07 Jan 2008)
New Revision: 26683

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26683

Log:
Add another testcase.  I still don't know what's wrong here.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/torture/ldap/cldap.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/ldap/cldap.c
===
--- branches/SAMBA_4_0/source/torture/ldap/cldap.c  2008-01-07 03:15:39 UTC 
(rev 26682)
+++ branches/SAMBA_4_0/source/torture/ldap/cldap.c  2008-01-07 04:46:13 UTC 
(rev 26683)
@@ -80,6 +80,27 @@
CHECK_STATUS(status, NT_STATUS_OK);
}
 
+   search.in.version = 0x2006;
+   status = cldap_netlogon(cldap, tctx, &search);
+   CHECK_STATUS(status, NT_STATUS_OK);
+
+   printf("Trying with User=NULL\n");
+
+   search.in.user = NULL;
+   status = cldap_netlogon(cldap, tctx, &search);
+   CHECK_STATUS(status, NT_STATUS_OK);
+   CHECK_STRING(search.out.netlogon.logon5.user_name, "");
+   CHECK_VAL(search.out.netlogon.logon5.type, NETLOGON_RESPONSE_FROM_PDC2);
+
+   printf("Trying with User=Administrator\n");
+
+   search.in.user = "Administrator";
+   status = cldap_netlogon(cldap, tctx, &search);
+   CHECK_STATUS(status, NT_STATUS_OK);
+
+   CHECK_STRING(search.out.netlogon.logon5.user_name, search.in.user);
+   CHECK_VAL(search.out.netlogon.logon5.type, 
NETLOGON_RESPONSE_FROM_PDC_USER);
+
search.in.version = 6;
status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_OK);

Rev 825: remove for merge in http://samba.org/~tridge/ctdb

[tridge]

revno: 825
revision-id:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: ronnie.merge
timestamp: Mon 2008-01-07 13:41:08 +1100
message:
  remove for merge
removed:
  tests/ctdb_randrec.c   
ctdb_randrec.c-2008010308-584sshdn57l9l64m-1
=== removed file 'tests/ctdb_randrec.c'
--- a/tests/ctdb_randrec.c  2008-01-03 04:46:17 +
+++ b/tests/ctdb_randrec.c  1970-01-01 00:00:00 +
@@ -1,137 +0,0 @@
-/* 
-   create a lot of random records, both current records and deleted records
-
-   Copyright (C) Andrew Tridgell  2008
-   Ronnie sahlberg 2007
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, see .
-*/
-
-#include "includes.h"
-#include "lib/events/events.h"
-#include "system/filesys.h"
-#include "popt.h"
-#include "cmdline.h"
-
-#include 
-#include 
-
-static int num_records = 10;
-static int delete_pct = 75;
-static int base_rec;
-
-static void store_records(struct ctdb_context *ctdb, struct event_context *ev)
-{
-   TDB_DATA key, data;
-   struct ctdb_db_context *ctdb_db;
-   TALLOC_CTX *tmp_ctx = talloc_new(ctdb);
-   int ret;
-   struct ctdb_record_handle *h;
-   uint32_t i=0;
-   
-   ctdb_db = ctdb_db_handle(ctdb, "test.tdb");
-
-   srandom(time(NULL) ^ getpid());
-
-   printf("working with %d records\n", num_records);
-   while (1) {
-   unsigned r = random() % num_records;
-   key.dptr = (uint8_t *)&r;
-   key.dsize = sizeof(r); 
-
-   h = ctdb_fetch_lock(ctdb_db, tmp_ctx, key, &data);
-   if (h == NULL) {
-   printf("Failed to fetch record '%s' on node %d\n", 
-  (const char *)key.dptr, ctdb_get_pnn(ctdb));
-   talloc_free(tmp_ctx);
-   return;
-   }
-
-   if (random() % 100 < delete_pct) {
-   data.dptr = NULL;
-   data.dsize = 0;
-   } else {
-   data.dptr = talloc_zero_size(h, data.dsize + sizeof(r));
-   data.dsize += sizeof(r);
-   }
-
-   ret = ctdb_record_store(h, data);
-   talloc_free(h);
-   if (ret != 0) {
-   printf("Failed to store record\n");
-   }
-   if (i % 1000 == 0) {
-   printf("%u\r", i);
-   fflush(stdout);
-   }
-   i++;
-   }
-
-   talloc_free(tmp_ctx);
-}
-
-/*
-  main program
-*/
-int main(int argc, const char *argv[])
-{
-   struct ctdb_context *ctdb;
-   struct ctdb_db_context *ctdb_db;
-
-   struct poptOption popt_options[] = {
-   POPT_AUTOHELP
-   POPT_CTDB_CMDLINE
-   { "num-records", 'r', POPT_ARG_INT, &num_records, 0, 
"num_records", "integer" },
-   { "base-rec", 'b', POPT_ARG_INT, &base_rec, 0, "base_rec", 
"integer" },
-   POPT_TABLEEND
-   };
-   int opt;
-   const char **extra_argv;
-   int extra_argc = 0;
-   poptContext pc;
-   struct event_context *ev;
-
-   pc = poptGetContext(argv[0], argc, argv, popt_options, 
POPT_CONTEXT_KEEP_FIRST);
-
-   while ((opt = poptGetNextOpt(pc)) != -1) {
-   switch (opt) {
-   default:
-   fprintf(stderr, "Invalid option %s: %s\n", 
-   poptBadOption(pc, 0), poptStrerror(opt));
-   exit(1);
-   }
-   }
-
-   /* setup the remaining options for the main program to use */
-   extra_argv = poptGetArgs(pc);
-   if (extra_argv) {
-   extra_argv++;
-   while (extra_argv[extra_argc]) extra_argc++;
-   }
-
-   ev = event_context_init(NULL);
-
-   ctdb = ctdb_cmdline_client(ev);
-
-   /* attach to a specific database */
-   ctdb_db = ctdb_attach(ctdb, "test.tdb", false);
-   if (!ctdb_db) {
-   printf("ctdb_attach failed - %s\n", ctdb_errstr(ctdb));
-   exit(1);
-   }
-
-   store_records(ctdb, ev);
-
-   return 0;
-}

Rev 732: nicer onnode output in http://samba.org/~tridge/ctdb

[tridge]

revno: 732
revision-id:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge.stable
timestamp: Mon 2008-01-07 14:31:13 +1100
message:
  nicer onnode output
modified:
  config/ctdb.sysconfig  
ctdb.sysconfig-20070527204758-biuh7znabuwan3zn-7
  config/events.d/50.samba   samba-20070601105340-vlcvnp6euoj3zdwy-3
  doc/ctdbd.1.xmlctdbd.1.xml-20070610004256-jh1qq0ws5zidbmbq-1
  packaging/RPM/ctdb.specctdb.spec-20070527204758-biuh7znabuwan3zn-3
  server/ctdb_recover.c  
ctdb_recover.c-20070503002147-admmfgt1oj6gexfo-1
  tools/ctdb_diagnostics 
ctdb_diagnostics-20070905041904-9d9r1qnt1j9qiwiz-1
  tools/onnode.rsh   onnode.rsh-20070530010004-83j66tszzvsimcn2-1
  tools/onnode.ssh   onnode.ssh-20070530010004-83j66tszzvsimcn2-3

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

Rev 826: merged from tridge.stable in http://samba.org/~tridge/ctdb

[tridge]

revno: 826
revision-id:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: ronnie.merge
timestamp: Mon 2008-01-07 13:46:31 +1100
message:
  merged from tridge.stable
added:
  lib/replace/getaddrinfo.c  getaddrinfo.c-20080105064003-0l0vaddyd3689f0x-1
  lib/replace/getaddrinfo.h  getaddrinfo.h-20080105064016-nzzl0au2e9klsho4-1
  lib/replace/getaddrinfo.m4 
getaddrinfo.m4-20080105064006-hosjskadr4vu48vd-1
  lib/replace/getifaddrs.c   getifaddrs.c-20080105064003-0l0vaddyd3689f0x-2
  lib/replace/getifaddrs.m4  getifaddrs.m4-20080105064006-hosjskadr4vu48vd-2
  lib/replace/inet_ntop.cinet_ntop.c-20080105064003-0l0vaddyd3689f0x-3
  lib/replace/inet_ntop.m4   inet_ntop.m4-20080105064006-hosjskadr4vu48vd-3
  lib/replace/inet_pton.cinet_pton.c-20080105064003-0l0vaddyd3689f0x-4
  lib/replace/inet_pton.m4   inet_pton.m4-20080105064006-hosjskadr4vu48vd-4
  lib/replace/libreplace_ld.m4   
libreplace_ld.m4-20080105064006-hosjskadr4vu48vd-5
  tests/ctdb_randrec.c   
ctdb_randrec.c-20080103224053-3pf5tyxleld8dqam-1
modified:
  client/ctdb_client.c   ctdb_client.c-20070411010216-3kd8v37k61steeya-1
  config/ctdb.init   ctdb.init-20070527204758-biuh7znabuwan3zn-6
  include/ctdb_private.h 
ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
  include/includes.h includes.h-20061117234101-o3qt14umlg9en8z0-17
  lib/replace/README readme-20070125040949-7t3f5zdl1q4z9hyv-6
  lib/replace/configure.ac   configure.ac-20070125040949-7t3f5zdl1q4z9hyv-13
  lib/replace/dlfcn.cdlfcn.c-20070125040949-7t3f5zdl1q4z9hyv-14
  lib/replace/dlfcn.m4   dlfcn.m4-20070125040949-7t3f5zdl1q4z9hyv-15
  lib/replace/getpass.c  getpass.c-20070125040949-7t3f5zdl1q4z9hyv-16
  lib/replace/getpass.m4 getpass.m4-20070125040949-7t3f5zdl1q4z9hyv-17
  lib/replace/libreplace.m4  
libreplace.m4-20070125040949-7t3f5zdl1q4z9hyv-20
  lib/replace/libreplace_cc.m4   
libreplace_cc.m4-20070125040949-7t3f5zdl1q4z9hyv-21
  lib/replace/libreplace_macros.m4 
libreplace_macros.m4-20070125040949-7t3f5zdl1q4z9hyv-22
  lib/replace/replace.h  replace.h-20070125040949-7t3f5zdl1q4z9hyv-27
  lib/replace/system/capability.h 
capability.h-20070125040949-7t3f5zdl1q4z9hyv-76
  lib/replace/system/config.m4   config.m4-20070125040949-7t3f5zdl1q4z9hyv-77
  lib/replace/system/network.h   network.h-20070125040949-7t3f5zdl1q4z9hyv-84
  lib/replace/system/passwd.hpasswd.h-20070125040949-7t3f5zdl1q4z9hyv-85
  lib/replace/system/time.h  time.h-20070125040949-7t3f5zdl1q4z9hyv-92
  lib/replace/system/wait.h  wait.h-20070125040949-7t3f5zdl1q4z9hyv-93
  lib/tdb/Makefile.inmakefile.in-20070125040949-7t3f5zdl1q4z9hyv-59
  lib/tdb/autogen.sh autogen.sh-20070125040949-7t3f5zdl1q4z9hyv-61
  lib/tdb/common/error.c error.c-20070220022425-m1wibgjq7n5hahs6-3
  lib/tdb/common/freelist.c  freelist.c-20070220022425-m1wibgjq7n5hahs6-4
  lib/tdb/common/io.cio.c-20070220022425-m1wibgjq7n5hahs6-6
  lib/tdb/common/lock.c  lock.c-20070220022425-m1wibgjq7n5hahs6-7
  lib/tdb/common/open.c  open.c-20070220022425-m1wibgjq7n5hahs6-8
  lib/tdb/common/tdb.c   tdb.c-20070220022425-m1wibgjq7n5hahs6-9
  lib/tdb/common/tdb_private.h   
tdb_private.h-20070220022425-m1wibgjq7n5hahs6-10
  lib/tdb/common/transaction.c   
transaction.c-20070220022425-m1wibgjq7n5hahs6-11
  lib/tdb/common/traverse.c  traverse.c-20070220022425-m1wibgjq7n5hahs6-12
  lib/tdb/config.mk  config.mk-20070125040949-7t3f5zdl1q4z9hyv-63
  lib/tdb/configure.ac   configure.ac-20070125040949-7t3f5zdl1q4z9hyv-65
  lib/tdb/include/tdb.h  tdb.h-20070125040949-7t3f5zdl1q4z9hyv-101
  lib/tdb/libtdb.m4  libtdb.m4-20070125040949-7t3f5zdl1q4z9hyv-69
  lib/tdb/tools/tdbbackup.c  tdbbackup.c-20070125040949-7t3f5zdl1q4z9hyv-105
  lib/tdb/tools/tdbdump.ctdbdump.c-20070125040949-7t3f5zdl1q4z9hyv-106
  lib/tdb/tools/tdbtool.ctdbtool.c-20070125040949-7t3f5zdl1q4z9hyv-108
  lib/tdb/tools/tdbtorture.c 
tdbtorture.c-20070125040949-7t3f5zdl1q4z9hyv-109
  lib/util/db_wrap.c db_wrap.c-20070125041102-mfc39bu6uof09lw6-1
  lib/util/debug.c   debug.c-20070417155854-2i3crb0irl716qft-1
  lib/util/debug.h   debug.h-20070417155854-2i3crb0irl716qft-2
  packaging/RPM/ctdb.specctdb.spec-20070527204758-biuh7znabuwan3zn-3
  packaging/RPM/makerpms.sh  makerpms.sh-20070527204758-biuh7znabuwan3zn-4
  server/ctdb_call.c ctdb_call.c-20061128065342-to93h6eejj5kon81-1
  server/ctdb_control.c  
ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1
  server/ctdb_daemon.c   ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
  server/ctdb_freeze.c   ctdb_freeze.c-20070512051503-935zdtyuqknqnhmo-1
  s

Rev 729: don't retstart statd when we don't need to in http://samba.org/~tridge/ctdb

[tridge]

revno: 729
revision-id:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge.stable
timestamp: Mon 2008-01-07 14:05:30 +1100
message:
  don't retstart statd when we don't need to
modified:
  config/events.d/60.nfs nfs-20070601141008-hy3h4qgbk1jd2jci-1
=== modified file 'config/events.d/60.nfs'
--- a/config/events.d/60.nfs2007-11-16 02:37:27 +
+++ b/config/events.d/60.nfs2008-01-07 03:05:30 +
@@ -55,6 +55,9 @@
;;
 
  recovered)
+   # if no IPs have changed then don't need to restart statd 
+   [ -f $CTDB_BASE/state/statd/restart ] || exit 0;
+
# always restart the lockmanager so that we start with a clusterwide
# graceperiod when ip addresses has changed
[ -x $CTDB_BASE/statd-callout ] && {

Rev 731: catch internal traversal errors in http://samba.org/~tridge/ctdb

[tridge]

revno: 731
revision-id:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge.stable
timestamp: Mon 2008-01-07 14:08:25 +1100
message:
  catch internal traversal errors
modified:
  server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
=== modified file 'server/ctdb_recoverd.c'
--- a/server/ctdb_recoverd.c2008-01-06 02:24:55 +
+++ b/server/ctdb_recoverd.c2008-01-07 03:08:25 +
@@ -542,7 +542,7 @@
struct ctdb_ltdb_header header;
if (existing.dsize < sizeof(struct ctdb_ltdb_header)) {
DEBUG(0,(__location__ " Bad record size %u from 
node %u\n", 
-existing.dsize, srcnode));
+(unsigned)existing.dsize, srcnode));
free(existing.dptr);
talloc_free(tmp_ctx);
return -1;
@@ -898,6 +898,7 @@
struct ctdb_context *ctdb;
struct ctdb_control_pulldb_reply *recdata;
uint32_t len;
+   bool failed;
 };
 
 static int traverse_recdb(struct tdb_context *tdb, TDB_DATA key, TDB_DATA 
data, void *p)
@@ -917,10 +918,15 @@
 
/* add the record to the blob ready to send to the nodes */
rec = ctdb_marshall_record(params->recdata, 0, key, NULL, data);
+   if (rec == NULL) {
+   params->failed = true;
+   return -1;
+   }
params->recdata = talloc_realloc_size(NULL, params->recdata, 
rec->length + params->len);
if (params->recdata == NULL) {
DEBUG(0,(__location__ " Failed to expand recdata to %u (%u 
records)\n", 
 rec->length + params->len, params->recdata->count));
+   params->failed = true;
return -1;
}
params->recdata->count++;
@@ -949,12 +955,20 @@
params.ctdb = ctdb;
params.recdata = recdata;
params.len = offsetof(struct ctdb_control_pulldb_reply, data);
+   params.failed = false;
 
if (tdb_traverse_read(recdb->tdb, traverse_recdb, ¶ms) == -1) {
DEBUG(0,(__location__ " Failed to traverse recdb database\n"));
+   talloc_free(params.recdata);
return -1;
}
 
+   if (params.failed) {
+   DEBUG(0,(__location__ " Failed to traverse recdb database\n"));
+   talloc_free(params.recdata);
+   return -1;  
+   }
+
recdata = params.recdata;
 
outdata.dptr = (void *)recdata;

Rev 827: merge from tridge.stable in http://samba.org/~tridge/ctdb

[tridge]

revno: 827
revision-id:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: ronnie.merge
timestamp: Mon 2008-01-07 14:09:08 +1100
message:
  merge from tridge.stable
modified:
  config/events.d/60.nfs nfs-20070601141008-hy3h4qgbk1jd2jci-1
  server/ctdb_recover.c  
ctdb_recover.c-20070503002147-admmfgt1oj6gexfo-1

revno: 432.1.257.1.42
revision-id:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge.stable
timestamp: Mon 2008-01-07 14:08:25 +1100
message:
  catch internal traversal errors
modified:
  server/ctdb_recoverd.c 
recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1

revno: 432.1.257.1.41
revision-id:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge.stable
timestamp: Mon 2008-01-07 14:07:01 +1100
message:
  more efficient traversal in pulldb control
modified:
  server/ctdb_recover.c  
ctdb_recover.c-20070503002147-admmfgt1oj6gexfo-1

revno: 432.1.257.1.40
revision-id:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge.stable
timestamp: Mon 2008-01-07 14:05:30 +1100
message:
  don't retstart statd when we don't need to
modified:
  config/events.d/60.nfs nfs-20070601141008-hy3h4qgbk1jd2jci-1
=== modified file 'config/events.d/60.nfs'
--- a/config/events.d/60.nfs2007-11-16 02:37:27 +
+++ b/config/events.d/60.nfs2008-01-07 03:05:30 +
@@ -55,6 +55,9 @@
;;
 
  recovered)
+   # if no IPs have changed then don't need to restart statd 
+   [ -f $CTDB_BASE/state/statd/restart ] || exit 0;
+
# always restart the lockmanager so that we start with a clusterwide
# graceperiod when ip addresses has changed
[ -x $CTDB_BASE/statd-callout ] && {

=== modified file 'server/ctdb_recover.c'
--- a/server/ctdb_recover.c 2008-01-07 02:46:31 +
+++ b/server/ctdb_recover.c 2008-01-07 03:09:08 +
@@ -170,36 +170,38 @@
return 0;
 }
 
-struct getkeys_params {
+/* 
+   a traverse function for pulling all relevent records from pulldb
+ */
+struct pulldb_data {
struct ctdb_context *ctdb;
-   uint32_t lmaster;
-   uint32_t rec_count;
-   struct getkeys_rec {
-   TDB_DATA key;
-   TDB_DATA data;
-   } *recs;
+   struct ctdb_control_pulldb_reply *pulldata;
+   uint32_t len;
+   bool failed;
 };
 
-static int traverse_getkeys(struct tdb_context *tdb, TDB_DATA key, TDB_DATA 
data, void *p)
+static int traverse_pulldb(struct tdb_context *tdb, TDB_DATA key, TDB_DATA 
data, void *p)
 {
-   struct getkeys_params *params = (struct getkeys_params *)p;
-   uint32_t lmaster;
-
-   lmaster = ctdb_lmaster(params->ctdb, &key);
-
-   /* only include this record if the lmaster matches or if
-  the wildcard lmaster (-1) was specified.
-   */
-   if ((params->lmaster != CTDB_LMASTER_ANY) && (params->lmaster != 
lmaster)) {
-   return 0;
-   }
-
-   params->recs = talloc_realloc(NULL, params->recs, struct getkeys_rec, 
params->rec_count+1);
-   key.dptr = talloc_memdup(params->recs, key.dptr, key.dsize);
-   data.dptr = talloc_memdup(params->recs, data.dptr, data.dsize);
-   params->recs[params->rec_count].key = key;
-   params->recs[params->rec_count].data = data;
-   params->rec_count++;
+   struct pulldb_data *params = (struct pulldb_data *)p;
+   struct ctdb_rec_data *rec;
+
+   /* add the record to the blob */
+   rec = ctdb_marshall_record(params->pulldata, 0, key, NULL, data);
+   if (rec == NULL) {
+   params->failed = true;
+   return -1;
+   }
+   params->pulldata = talloc_realloc_size(NULL, params->pulldata, 
rec->length + params->len);
+   if (params->pulldata == NULL) {
+   DEBUG(0,(__location__ " Failed to expand pulldb_data to %u (%u 
records)\n", 
+rec->length + params->len, params->pulldata->count));
+   params->failed = true;
+   return -1;
+   }
+   params->pulldata->count++;
+   memcpy(params->len+(uint8_t *)params->pulldata, rec, rec->length);
+   params->len += rec->length;
+   talloc_free(rec);
 
return 0;
 }
@@ -211,10 +213,8 @@
 {
struct ctdb_control_pulldb *pull;
struct ctdb_db_context *ctdb_db;
-   struct getkeys_params params;
+   struct pulldb_data params;
struct ctdb_control_pulldb_reply *r

Rev 730: more efficient traversal in pulldb control in http://samba.org/~tridge/ctdb

[tridge]

revno: 730
revision-id:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge.stable
timestamp: Mon 2008-01-07 14:07:01 +1100
message:
  more efficient traversal in pulldb control
modified:
  server/ctdb_recover.c  
ctdb_recover.c-20070503002147-admmfgt1oj6gexfo-1
=== modified file 'server/ctdb_recover.c'
--- a/server/ctdb_recover.c 2008-01-06 01:38:01 +
+++ b/server/ctdb_recover.c 2008-01-07 03:07:01 +
@@ -170,36 +170,38 @@
return 0;
 }
 
-struct getkeys_params {
+/* 
+   a traverse function for pulling all relevent records from pulldb
+ */
+struct pulldb_data {
struct ctdb_context *ctdb;
-   uint32_t lmaster;
-   uint32_t rec_count;
-   struct getkeys_rec {
-   TDB_DATA key;
-   TDB_DATA data;
-   } *recs;
+   struct ctdb_control_pulldb_reply *pulldata;
+   uint32_t len;
+   bool failed;
 };
 
-static int traverse_getkeys(struct tdb_context *tdb, TDB_DATA key, TDB_DATA 
data, void *p)
+static int traverse_pulldb(struct tdb_context *tdb, TDB_DATA key, TDB_DATA 
data, void *p)
 {
-   struct getkeys_params *params = (struct getkeys_params *)p;
-   uint32_t lmaster;
-
-   lmaster = ctdb_lmaster(params->ctdb, &key);
-
-   /* only include this record if the lmaster matches or if
-  the wildcard lmaster (-1) was specified.
-   */
-   if ((params->lmaster != CTDB_LMASTER_ANY) && (params->lmaster != 
lmaster)) {
-   return 0;
-   }
-
-   params->recs = talloc_realloc(NULL, params->recs, struct getkeys_rec, 
params->rec_count+1);
-   key.dptr = talloc_memdup(params->recs, key.dptr, key.dsize);
-   data.dptr = talloc_memdup(params->recs, data.dptr, data.dsize);
-   params->recs[params->rec_count].key = key;
-   params->recs[params->rec_count].data = data;
-   params->rec_count++;
+   struct pulldb_data *params = (struct pulldb_data *)p;
+   struct ctdb_rec_data *rec;
+
+   /* add the record to the blob */
+   rec = ctdb_marshall_record(params->pulldata, 0, key, NULL, data);
+   if (rec == NULL) {
+   params->failed = true;
+   return -1;
+   }
+   params->pulldata = talloc_realloc_size(NULL, params->pulldata, 
rec->length + params->len);
+   if (params->pulldata == NULL) {
+   DEBUG(0,(__location__ " Failed to expand pulldb_data to %u (%u 
records)\n", 
+rec->length + params->len, params->pulldata->count));
+   params->failed = true;
+   return -1;
+   }
+   params->pulldata->count++;
+   memcpy(params->len+(uint8_t *)params->pulldata, rec, rec->length);
+   params->len += rec->length;
+   talloc_free(rec);
 
return 0;
 }
@@ -211,10 +213,8 @@
 {
struct ctdb_control_pulldb *pull;
struct ctdb_db_context *ctdb_db;
-   struct getkeys_params params;
+   struct pulldb_data params;
struct ctdb_control_pulldb_reply *reply;
-   int i;
-   size_t len = 0;
 
if (ctdb->freeze_mode != CTDB_FREEZE_FROZEN) {
DEBUG(0,("rejecting ctdb_control_pull_db when not frozen\n"));
@@ -229,43 +229,32 @@
return -1;
}
 
-   params.ctdb = ctdb;
-   params.lmaster = pull->lmaster;
-
-   params.rec_count = 0;
-   params.recs = talloc_array(outdata, struct getkeys_rec, 0);
-   CTDB_NO_MEMORY(ctdb, params.recs);
-
-   if (ctdb_lock_all_databases_mark(ctdb) != 0) {
-   DEBUG(0,(__location__ " Failed to get lock on entired db - 
failing\n"));
-   return -1;
-   }
-
-   tdb_traverse_read(ctdb_db->ltdb->tdb, traverse_getkeys, ¶ms);
-
-   ctdb_lock_all_databases_unmark(ctdb);
-
-   reply = talloc(outdata, struct ctdb_control_pulldb_reply);
+   reply = talloc_zero(outdata, struct ctdb_control_pulldb_reply);
CTDB_NO_MEMORY(ctdb, reply);
 
reply->db_id = pull->db_id;
-   reply->count = params.rec_count;
-
-   len = offsetof(struct ctdb_control_pulldb_reply, data);
-
-   for (i=0;icount;i++) {
-   struct ctdb_rec_data *rec;
-   rec = ctdb_marshall_record(outdata, 0, params.recs[i].key, 
NULL, params.recs[i].data);
-   reply = talloc_realloc_size(outdata, reply, rec->length + len);
-   memcpy(len+(uint8_t *)reply, rec, rec->length);
-   len += rec->length;
-   talloc_free(rec);
-   }
-
-   talloc_free(params.recs);
-
-   outdata->dptr = (uint8_t *)reply;
-   outdata->dsize = len;
+
+   params.ctdb = ctdb;
+   params.pulldata = reply;
+   params.len = offsetof(struct ctdb_control_pulldb_reply, data);
+   params.failed = false;
+
+   if (ctdb_lock_all_databases_mark(ctdb) != 0) {
+   DEBUG(0,(__location__ " Failed to get lock on entired db - 
fa

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

[abartlet]

Author: abartlet
Date: 2008-01-07 03:15:39 + (Mon, 07 Jan 2008)
New Revision: 26682

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26682

Log:
Move CLDAP to the modern torture system, and add value checking.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/torture/ldap/cldap.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/ldap/cldap.c
===
--- branches/SAMBA_4_0/source/torture/ldap/cldap.c  2008-01-07 03:14:51 UTC 
(rev 26681)
+++ branches/SAMBA_4_0/source/torture/ldap/cldap.c  2008-01-07 03:15:39 UTC 
(rev 26682)
@@ -28,15 +28,11 @@
 #include "lib/ldb/include/ldb.h"
 #include "param/param.h"
 
-#define CHECK_STATUS(status, correct) do { \
-   if (!NT_STATUS_EQUAL(status, correct)) { \
-   printf("(%s) Incorrect status %s - should be %s\n", \
-  __location__, nt_errstr(status), nt_errstr(correct)); \
-   ret = false; \
-   goto done; \
-   } \
-} while (0)
+#define CHECK_STATUS(status, correct) torture_assert_ntstatus_equal(tctx, 
status, correct, "incorrect status")
 
+#define CHECK_VAL(v, correct) torture_assert_int_equal(tctx, (v), (correct), 
"incorrect value");
+
+#define CHECK_STRING(v, correct) torture_assert_str_equal(tctx, v, correct, 
"incorrect value");
 /*
   test netlogon operations
 */
@@ -48,7 +44,6 @@
union nbt_cldap_netlogon n1;
struct GUID guid;
int i;
-   bool ret = true;
 
ZERO_STRUCT(search);
search.in.dest_address = dest;
@@ -94,6 +89,8 @@
search.in.user = NULL;
status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_OK);
+   CHECK_STRING(search.out.netlogon.logon5.user_name, "");
+   CHECK_VAL(search.out.netlogon.logon5.type, NETLOGON_RESPONSE_FROM_PDC2);
 
printf("Trying with User=Administrator\n");
 
@@ -101,11 +98,16 @@
status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_OK);
 
+   CHECK_STRING(search.out.netlogon.logon5.user_name, search.in.user);
+   CHECK_VAL(search.out.netlogon.logon5.type, 
NETLOGON_RESPONSE_FROM_PDC_USER);
+
printf("Trying with a GUID\n");
search.in.realm   = NULL;
search.in.domain_guid = GUID_string(tctx, &n1.logon5.domain_uuid);
status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_OK);
+   CHECK_VAL(search.out.netlogon.logon5.type, 
NETLOGON_RESPONSE_FROM_PDC_USER);
+   CHECK_STRING(GUID_string(tctx, 
&search.out.netlogon.logon5.domain_uuid), search.in.domain_guid);
 
printf("Trying with a incorrect GUID\n");
guid = GUID_random();
@@ -119,6 +121,8 @@
search.in.realm = n1.logon5.dns_domain;
status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_OK);
+   CHECK_VAL(search.out.netlogon.logon5.type, NETLOGON_RESPONSE_FROM_PDC2);
+   CHECK_STRING(search.out.netlogon.logon5.user_name, "");
 
printf("Trying with a bad AAC\n");
search.in.acct_control = 0xFF00FF00;
@@ -131,11 +135,15 @@
search.in.user = "Administrator";
status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_OK);
+   CHECK_STRING(search.out.netlogon.logon5.dns_domain, 
n1.logon5.dns_domain);
+   CHECK_STRING(search.out.netlogon.logon5.user_name, search.in.user);
 
printf("Trying with just a bad username\n");
search.in.user = "___no_such_user___";
status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_OK);
+   CHECK_STRING(search.out.netlogon.logon5.user_name, search.in.user);
+   CHECK_STRING(search.out.netlogon.logon5.dns_domain, 
n1.logon5.dns_domain);
 
printf("Trying with just a bad domain\n");
search = empty_search;
@@ -147,20 +155,28 @@
search.in.domain_guid = GUID_string(tctx, &n1.logon5.domain_uuid);
status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_OK);
+   CHECK_STRING(search.out.netlogon.logon5.dns_domain, 
n1.logon5.dns_domain);
+   CHECK_STRING(search.out.netlogon.logon5.user_name, "");
+   CHECK_VAL(search.out.netlogon.logon5.type, NETLOGON_RESPONSE_FROM_PDC2);
 
printf("Trying with a incorrect domain and incorrect guid\n");
search.in.domain_guid = GUID_string(tctx, &guid);
status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_NOT_FOUND);
+   CHECK_STRING(search.out.netlogon.logon5.dns_domain, 
n1.logon5.dns_domain);
+   CHECK_STRING(search.out.netlogon.logon5.user_name, "");
+   CHECK_VAL(search.out.netlogon.logon5.type, NETLOGON_RESPONSE_FROM_PDC2);
 
printf("Trying with a incorrect GUID and correct domain\n");
search.in.domain_guid = GUID_string(tctx, &guid);
search.in.realm = n1.logon5.dns_domain;
 

svn commit: samba r26681 - in branches/SAMBA_4_0/source/cldap_server: .

[abartlet]

Author: abartlet
Date: 2008-01-07 03:14:51 + (Mon, 07 Jan 2008)
New Revision: 26681

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26681

Log:
Use fewer magic numbers.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/cldap_server/netlogon.c


Changeset:
Modified: branches/SAMBA_4_0/source/cldap_server/netlogon.c
===
--- branches/SAMBA_4_0/source/cldap_server/netlogon.c   2008-01-07 00:47:01 UTC 
(rev 26680)
+++ branches/SAMBA_4_0/source/cldap_server/netlogon.c   2008-01-07 03:14:51 UTC 
(rev 26681)
@@ -230,7 +230,7 @@
case 5:
case 6:
case 7:
-   netlogon->logon5.type = (user?23+2:23);
+   netlogon->logon5.type = 
(user?NETLOGON_RESPONSE_FROM_PDC_USER:NETLOGON_RESPONSE_FROM_PDC2);
netlogon->logon5.server_type  = server_type;
netlogon->logon5.domain_uuid  = domain_uuid;
netlogon->logon5.forest   = realm;
@@ -245,7 +245,7 @@
netlogon->logon5.lm20_token   = 0x;
break;
default:
-   netlogon->logon13.type = (user?23+2:23);
+   netlogon->logon13.type = 
(user?NETLOGON_RESPONSE_FROM_PDC_USER:NETLOGON_RESPONSE_FROM_PDC2);
netlogon->logon13.server_type  = server_type;
netlogon->logon13.domain_uuid  = domain_uuid;
netlogon->logon13.forest   = realm;

svn commit: samba r26680 - in branches/SAMBA_4_0/source/cldap_server: .

[abartlet]

Author: abartlet
Date: 2008-01-07 00:47:01 + (Mon, 07 Jan 2008)
New Revision: 26680

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26680

Log:
Don't always advertise GC functionality.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/cldap_server/netlogon.c


Changeset:
Modified: branches/SAMBA_4_0/source/cldap_server/netlogon.c
===
--- branches/SAMBA_4_0/source/cldap_server/netlogon.c   2008-01-07 00:46:39 UTC 
(rev 26679)
+++ branches/SAMBA_4_0/source/cldap_server/netlogon.c   2008-01-07 00:47:01 UTC 
(rev 26680)
@@ -162,7 +162,6 @@
}
 
server_type  = 
-   NBT_SERVER_GC | 
NBT_SERVER_DS | NBT_SERVER_TIMESERV |
NBT_SERVER_CLOSEST | NBT_SERVER_WRITABLE | 
NBT_SERVER_GOOD_TIMESERV;
@@ -171,6 +170,10 @@
server_type |= NBT_SERVER_PDC;
}
 
+   if (samdb_is_gc(cldapd->samctx)) {
+   server_type |= NBT_SERVER_GC;
+   }
+
if (str_list_check(services, "ldap")) {
server_type |= NBT_SERVER_LDAP;
}

svn commit: samba r26679 - in branches/SAMBA_4_0/source/dsdb/common: .

[abartlet]

Author: abartlet
Date: 2008-01-07 00:46:39 + (Mon, 07 Jan 2008)
New Revision: 26679

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26679

Log:
It is very bad to free the ldb handle when you didn't create it...

(My bad when copying this code into samdb_is_gc()).

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/dsdb/common/util.c


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/common/util.c
===
--- branches/SAMBA_4_0/source/dsdb/common/util.c2008-01-06 23:42:46 UTC 
(rev 26678)
+++ branches/SAMBA_4_0/source/dsdb/common/util.c2008-01-07 00:46:39 UTC 
(rev 26679)
@@ -1395,7 +1395,7 @@
 
options = ldb_msg_find_attr_as_int(res->msgs[0], "options", 0);
talloc_free(res);
-   talloc_free(ldb);
+   talloc_free(tmp_ctx);
 
/* if options attribute has the 0x0001 flag set, then enable the 
global catlog */
if (options & 0x1) {

[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1119-gd9d6775

[Michael Adam]

The branch, v3-2-test has been updated
   via  d9d6775878f8b3425665c6a45a5ef9cb92932cf8 (commit)
   via  73e28806ce87d829ea7c38ed3440020845bb13bf (commit)
  from  4f2d139a186048f08180378a877b69d2f80ad51f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -
commit d9d6775878f8b3425665c6a45a5ef9cb92932cf8
Author: Michael Adam <[EMAIL PROTECTED]>
Date:   Mon Jan 7 00:21:12 2008 +0100

Adapt fset_nt_acl() and fget_nt_acl() in examples/VFS/ to vfs prototype 
change.

Michael

commit 73e28806ce87d829ea7c38ed3440020845bb13bf
Author: Michael Adam <[EMAIL PROTECTED]>
Date:   Mon Jan 7 00:14:19 2008 +0100

Remove unneeded parameter fd from SMB_VFS_PREAD().

Michael

---

Summary of changes:
 examples/VFS/skel_opaque.c  |   10 +-
 examples/VFS/skel_transparent.c |   12 ++--
 source/include/vfs.h|3 ++-
 source/include/vfs_macros.h |6 +++---
 source/modules/vfs_cacheprime.c |5 ++---
 source/modules/vfs_default.c|   16 
 source/modules/vfs_full_audit.c |6 +++---
 source/modules/vfs_readahead.c  |   11 +--
 source/smbd/fileio.c|4 ++--
 source/smbd/vfs.c   |2 +-
 10 files changed, 37 insertions(+), 38 deletions(-)


Changeset truncated at 500 lines:

diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index fd4b206..21b39c1 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -135,9 +135,9 @@ static ssize_t skel_read(vfs_handle_struct *handle, 
files_struct *fsp, int fd, v
return vfswrap_read(NULL, fsp, fd, data, n);
 }
 
-static ssize_t skel_pread(vfs_handle_struct *handle, struct files_struct *fsp, 
int fd, void *data, size_t n, SMB_OFF_T offset)
+static ssize_t skel_pread(vfs_handle_struct *handle, struct files_struct *fsp, 
void *data, size_t n, SMB_OFF_T offset)
 {
-   return vfswrap_pread(NULL, fsp, fd, data, n, offset);
+   return vfswrap_pread(NULL, fsp, data, n, offset);
 }
 
 static ssize_t skel_write(vfs_handle_struct *handle, files_struct *fsp, int 
fd, const void *data, size_t n)
@@ -301,7 +301,7 @@ static struct file_id skel_file_id_create(vfs_handle_struct 
*handle,
 }
 
 static size_t skel_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-   int fd, uint32 security_info, SEC_DESC **ppdesc)
+   uint32 security_info, SEC_DESC **ppdesc)
 {
errno = ENOSYS;
return 0;
@@ -314,8 +314,8 @@ static size_t skel_get_nt_acl(vfs_handle_struct *handle, 
files_struct *fsp,
return 0;
 }
 
-static NTSTATUS skel_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, 
int
-   fd, uint32 security_info_sent, SEC_DESC *psd)
+static NTSTATUS skel_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
+   uint32 security_info_sent, SEC_DESC *psd)
 {
errno = ENOSYS;
return NT_STATUS_NOT_IMPLEMENTED;
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 2512f4d..76ef7e0 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -129,9 +129,9 @@ static ssize_t skel_read(vfs_handle_struct *handle, 
files_struct *fsp, int fd, v
return SMB_VFS_NEXT_READ(handle, fsp, fd, data, n);
 }
 
-static ssize_t skel_pread(vfs_handle_struct *handle, files_struct *fsp, int 
fd, void *data, size_t n, SMB_OFF_T offset)
+static ssize_t skel_pread(vfs_handle_struct *handle, files_struct *fsp, void 
*data, size_t n, SMB_OFF_T offset)
 {
-   return SMB_VFS_NEXT_PREAD(handle, fsp, fd, data, n, offset);
+   return SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset);
 }
 
 static ssize_t skel_write(vfs_handle_struct *handle, files_struct *fsp, int 
fd, const void *data, size_t n)
@@ -290,9 +290,9 @@ static struct file_id skel_file_id_create(vfs_handle_struct 
*handle,
 }
 
 static size_t skel_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-   int fd, uint32 security_info, SEC_DESC **ppdesc)
+   uint32 security_info, SEC_DESC **ppdesc)
 {
-   return SMB_VFS_NEXT_FGET_NT_ACL(handle, fsp, fd, security_info, ppdesc);
+   return SMB_VFS_NEXT_FGET_NT_ACL(handle, fsp, security_info, ppdesc);
 }
 
 static size_t skel_get_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
@@ -302,9 +302,9 @@ static size_t skel_get_nt_acl(vfs_handle_struct *handle, 
files_struct *fsp,
 }
 
 static NTSTATUS skel_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-   int fd, uint32 security_info_sent, SEC_DESC *psd)
+   uint32 security_info_sent, SEC_DESC *psd)
 {
-   return SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, fd, security_info_sent, 
psd);
+   return SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, security_info_sent, psd);
 }
 
 static NTSTATUS skel_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
diff --git a/source/include/vfs.h b/source

Build status as of Mon Jan 7 00:00:02 2008

[build]

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

--- /home/build/master/cache/broken_results.txt.old 2008-01-06 
00:00:58.0 +
+++ /home/build/master/cache/broken_results.txt 2008-01-07 00:00:40.0 
+
@@ -1,26 +1,26 @@
-Build status as of Sun Jan  6 00:00:02 2008
+Build status as of Mon Jan  7 00:00:02 2008
 
 Build counts:
 Tree Total  Broken Panic 
 SOC  0  0  0 
 build_farm   0  0  0 
-ccache   27 8  0 
+ccache   28 8  0 
 ctdb 0  0  0 
 distcc   1  0  0 
-ldb  27 12 0 
-libreplace   26 13 0 
-lorikeet-heimdal 23 14 0 
+ldb  28 12 0 
+libreplace   27 13 0 
+lorikeet-heimdal 24 14 0 
 pidl 17 5  0 
 ppp  9  7  0 
 python   0  0  0 
-rsync27 10 0 
+rsync28 10 0 
 samba-docs   0  0  0 
 samba-gtk3  3  0 
-samba4   24 19 8 
+samba4   24 15 4 
 samba_3_21  0  0 
 samba_3_2_test 26 12 0 
 samba_4_0_test 0  0  0 
-smb-build25 3  0 
-talloc   27 7  0 
-tdb  27 5  0 
+smb-build26 3  0 
+talloc   28 7  0 
+tdb  28 5  0 
 

svn commit: samba r26678 - in branches/SAMBA_4_0/source/lib/tdb: .

[tpot]

Author: tpot
Date: 2008-01-06 23:42:46 + (Sun, 06 Jan 2008)
New Revision: 26678

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26678

Log:
Check in auto-generated swig files.

Modified:
   branches/SAMBA_4_0/source/lib/tdb/tdb.py
   branches/SAMBA_4_0/source/lib/tdb/tdb_wrap.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/tdb/tdb.py
===
--- branches/SAMBA_4_0/source/lib/tdb/tdb.py2008-01-06 23:17:55 UTC (rev 
26677)
+++ branches/SAMBA_4_0/source/lib/tdb/tdb.py2008-01-06 23:42:46 UTC (rev 
26678)
@@ -1,5 +1,5 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.33
+# Version 1.3.31
 #
 # Don't modify this file, modify the SWIG interface instead.
 
@@ -164,7 +164,17 @@
 for k in iter(self):
 del(self[k])
 
+def iterkeys(self):
+for k in iter(self):
+yield k
+   
+def itervalues(self):
+for k in iter(self):
+yield self[k]
 
+def iteritems(self):
+for k in iter(self):
+yield (k, self[k])
 
 
 

Modified: branches/SAMBA_4_0/source/lib/tdb/tdb_wrap.c
===
--- branches/SAMBA_4_0/source/lib/tdb/tdb_wrap.c2008-01-06 23:17:55 UTC 
(rev 26677)
+++ branches/SAMBA_4_0/source/lib/tdb/tdb_wrap.c2008-01-06 23:42:46 UTC 
(rev 26678)
@@ -1,6 +1,6 @@
 /* 
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.33
+ * Version 1.3.31
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not 
make
@@ -17,14 +17,14 @@
 
 /* template workaround for compilers that cannot correctly implement the C++ 
standard */
 #ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
-#  define SWIGTEMPLATEDISAMBIGUATOR template
-# elif defined(__HP_aCC)
-/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 
*/
-/* If we find a maximum version that requires this, the test would be __HP_aCC 
<= 35500 for A.03.55 */
-#  define SWIGTEMPLATEDISAMBIGUATOR template
+# if defined(__SUNPRO_CC)
+#   if (__SUNPRO_CC <= 0x560)
+# define SWIGTEMPLATEDISAMBIGUATOR template
+#   else
+# define SWIGTEMPLATEDISAMBIGUATOR 
+#   endif
 # else
-#  define SWIGTEMPLATEDISAMBIGUATOR
+#   define SWIGTEMPLATEDISAMBIGUATOR 
 # endif
 #endif
 
@@ -107,13 +107,7 @@
 # define _CRT_SECURE_NO_DEPRECATE
 #endif
 
-/* Deal with Microsoft's attempt at deprecating methods in the standard C++ 
library */
-#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && 
!defined(_SCL_SECURE_NO_DEPRECATE)
-# define _SCL_SECURE_NO_DEPRECATE
-#endif
 
-
-
 /* Python.h has to appear first */
 #include 
 
@@ -349,7 +343,7 @@
 while ((*f2 == ' ') && (f2 != l2)) ++f2;
 if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1;
   }
-  return (int)((l1 - f1) - (l2 - f2));
+  return (l1 - f1) - (l2 - f2);
 }
 
 /*
@@ -1096,14 +1090,14 @@
 /* Unpack the argument tuple */
 
 SWIGINTERN int
-SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, 
Py_ssize_t max, PyObject **objs)
+SWIG_Python_UnpackTuple(PyObject *args, const char *name, int min, int max, 
PyObject **objs)
 {
   if (!args) {
 if (!min && !max) {
   return 1;
 } else {
   PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got none", 
-  name, (min == max ? "" : "at least "), (int)min);
+  name, (min == max ? "" : "at least "), min);
   return 0;
 }
   }  
@@ -,14 +1105,14 @@
 PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a 
tuple");
 return 0;
   } else {
-register Py_ssize_t l = PyTuple_GET_SIZE(args);
+register int l = PyTuple_GET_SIZE(args);
 if (l < min) {
   PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-  name, (min == max ? "" : "at least "), (int)min, (int)l);
+  name, (min == max ? "" : "at least "), min, l);
   return 0;
 } else if (l > max) {
   PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-  name, (min == max ? "" : "at most "), (int)max, (int)l);
+  name, (min == max ? "" : "at most "), max, l);
   return 0;
 } else {
   register int i;
@@ -1597,11 +1591,9 @@
 (unaryfunc)0, /*nb_float*/
 (unaryfunc)PySwigObject_oct,  /*nb_oct*/
 (unaryfunc)PySwigObject_hex,  /*nb_hex*/
-#if PY_VERSION_HEX >= 0x0205 /* 2.5.0 */
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index */
-#elif PY_VERSION_HEX >= 0x0202 /* 2.2.0 */
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide 
*/
-#elif PY_VERSION_HEX

svn commit: samba r26677 - in branches/SAMBA_4_0/source/lib/tdb: . python/tests

[tpot]

Author: tpot
Date: 2008-01-06 23:17:55 + (Sun, 06 Jan 2008)
New Revision: 26677

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26677

Log:
Implement and test iter{keys,values,items} for tdb bindings.

Use tempfile.mkstemp() instead of os.tmpnam() in tests.

Modified:
   branches/SAMBA_4_0/source/lib/tdb/python/tests/simple.py
   branches/SAMBA_4_0/source/lib/tdb/tdb.i


Changeset:
Modified: branches/SAMBA_4_0/source/lib/tdb/python/tests/simple.py
===
--- branches/SAMBA_4_0/source/lib/tdb/python/tests/simple.py2008-01-06 
22:01:31 UTC (rev 26676)
+++ branches/SAMBA_4_0/source/lib/tdb/python/tests/simple.py2008-01-06 
23:17:55 UTC (rev 26677)
@@ -8,7 +8,7 @@
 
 import tdb
 from unittest import TestCase
-import os
+import os, tempfile
 
 
 class OpenTdbTests(TestCase):
@@ -19,7 +19,7 @@
 class SimpleTdbTests(TestCase):
 def setUp(self):
 super(SimpleTdbTests, self).setUp()
-self.tdb = tdb.Tdb(os.tmpnam(), 0, tdb.DEFAULT, os.O_CREAT|os.O_RDWR)
+self.tdb = tdb.Tdb(tempfile.mkstemp()[1], 0, tdb.DEFAULT, 
os.O_CREAT|os.O_RDWR)
 self.assertNotEqual(None, self.tdb)
 
 def tearDown(self):
@@ -82,6 +82,13 @@
 self.tdb["brainslug"] = "2"
 self.assertEquals([("bla", "1"), ("brainslug", "2")], self.tdb.items())
 
+def test_iteritems(self):
+self.tdb["bloe"] = "2"
+self.tdb["bla"] = "25"
+i = self.tdb.iteritems()
+self.assertEquals(set([("bla", "25"), ("bloe", "2")]),
+  set([i.next(), i.next()]))
+
 def test_transaction_cancel(self):
 self.tdb["bloe"] = "2"
 self.tdb.transaction_start()
@@ -107,11 +114,23 @@
 self.tdb["bla"] = "25"
 self.assertEquals(["bla", "bloe"], self.tdb.keys())
 
+def test_iterkeys(self):
+self.tdb["bloe"] = "2"
+self.tdb["bla"] = "25"
+i = self.tdb.iterkeys()
+self.assertEquals(set(["bloe", "bla"]), set([i.next(), i.next()]))
+
 def test_values(self):
 self.tdb["bloe"] = "2"
 self.tdb["bla"] = "25"
 self.assertEquals(["25", "2"], self.tdb.values())
 
+def test_itervalues(self):
+self.tdb["bloe"] = "2"
+self.tdb["bla"] = "25"
+i = self.tdb.itervalues()
+self.assertEquals(set(["25", "2"]), set([i.next(), i.next()]))
+
 def test_clear(self):
 self.tdb["bloe"] = "2"
 self.tdb["bla"] = "25"

Modified: branches/SAMBA_4_0/source/lib/tdb/tdb.i
===
--- branches/SAMBA_4_0/source/lib/tdb/tdb.i 2008-01-06 22:01:31 UTC (rev 
26676)
+++ branches/SAMBA_4_0/source/lib/tdb/tdb.i 2008-01-06 23:17:55 UTC (rev 
26677)
@@ -263,8 +263,18 @@
 for k in iter(self):
 del(self[k])
 
-# TODO: iterkeys, itervalues, iteritems
+def iterkeys(self):
+for k in iter(self):
+yield k
+   
+def itervalues(self):
+for k in iter(self):
+yield self[k]
 
+def iteritems(self):
+for k in iter(self):
+yield (k, self[k])
+
 # TODO: any other missing methods for container types
 }
 } tdb;

[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1117-g4f2d139

[Michael Adam]

The branch, v3-2-test has been updated
   via  4f2d139a186048f08180378a877b69d2f80ad51f (commit)
   via  8fce247bcf7fb27a31a7b8103377681d692d35aa (commit)
   via  c0c7c1223da29c68359dac64a340c1c710d5f3d2 (commit)
  from  020ed731b17ac00dd490f210f108eae249fb27ad (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -
commit 4f2d139a186048f08180378a877b69d2f80ad51f
Author: Michael Adam <[EMAIL PROTECTED]>
Date:   Sun Jan 6 18:48:02 2008 +0100

Remove superfluous parameter fd from SMB_VFS_FSET_NT_ACL().

Michael

commit 8fce247bcf7fb27a31a7b8103377681d692d35aa
Author: Michael Adam <[EMAIL PROTECTED]>
Date:   Sun Jan 6 18:03:33 2008 +0100

Wrap lines for readability.

Michael

commit c0c7c1223da29c68359dac64a340c1c710d5f3d2
Author: Michael Adam <[EMAIL PROTECTED]>
Date:   Sat Jan 5 02:16:15 2008 +0100

Remove superfluous fd parameter from SMB_VFS_FGET_NT_ACL().

Michael

---

Summary of changes:
 source/include/vfs.h|   15 ---
 source/include/vfs_macros.h |   12 ++--
 source/modules/vfs_afsacl.c |4 ++--
 source/modules/vfs_aixacl2.c|4 ++--
 source/modules/vfs_default.c|4 ++--
 source/modules/vfs_full_audit.c |   14 ++
 source/modules/vfs_gpfs.c   |4 ++--
 source/modules/vfs_zfsacl.c |4 ++--
 source/smbd/dir.c   |4 ++--
 source/smbd/nttrans.c   |5 ++---
 source/smbd/open.c  |3 +--
 11 files changed, 39 insertions(+), 34 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/vfs.h b/source/include/vfs.h
index 5a3ec58..038da29 100644
--- a/source/include/vfs.h
+++ b/source/include/vfs.h
@@ -77,6 +77,8 @@
 /* Leave at 22 - not yet released. Change get_nt_acl to return NTSTATUS - vl */
 /* Leave at 22 - not yet released. Change get_nt_acl to *not* take a
  * files_struct. - obnox.*/
+/* Leave at 22 - not yet released. Remove parameter fd from fget_nt_acl. - 
obnox */
+/* Leave at 22 - not yet released. Remove parameter fd from gset_nt_acl. - 
obnox */
 
 #define SMB_VFS_INTERFACE_VERSION 22
 
@@ -310,15 +312,22 @@ struct vfs_ops {
/* NT ACL operations. */

NTSTATUS (*fget_nt_acl)(struct vfs_handle_struct *handle,
-   struct files_struct *fsp, int fd,
+   struct files_struct *fsp,
uint32 security_info,
struct security_descriptor **ppdesc);
NTSTATUS (*get_nt_acl)(struct vfs_handle_struct *handle,
   const char *name,
   uint32 security_info,
   struct security_descriptor **ppdesc);
-   NTSTATUS (*fset_nt_acl)(struct vfs_handle_struct *handle, 
struct files_struct *fsp, int fd, uint32 security_info_sent, struct 
security_descriptor *psd);
-   NTSTATUS (*set_nt_acl)(struct vfs_handle_struct *handle, struct 
files_struct *fsp, const char *name, uint32 security_info_sent, struct 
security_descriptor *psd);
+   NTSTATUS (*fset_nt_acl)(struct vfs_handle_struct *handle,
+   struct files_struct *fsp,
+   uint32 security_info_sent,
+   struct security_descriptor *psd);
+   NTSTATUS (*set_nt_acl)(struct vfs_handle_struct *handle,
+  struct files_struct *fsp,
+  const char *name,
+  uint32 security_info_sent,
+  struct security_descriptor *psd);

/* POSIX ACL operations. */

diff --git a/source/include/vfs_macros.h b/source/include/vfs_macros.h
index c31d6cf..45c5353 100644
--- a/source/include/vfs_macros.h
+++ b/source/include/vfs_macros.h
@@ -84,9 +84,9 @@
 #define SMB_VFS_FILE_ID_CREATE(conn, dev, inode) 
((conn)->vfs.ops.file_id_create((conn)->vfs.handles.file_id_create, (dev), 
(inode)))
 
 /* NT ACL operations. */
-#define SMB_VFS_FGET_NT_ACL(fsp, fd, security_info, ppdesc) 
((fsp)->conn->vfs.ops.fget_nt_acl((fsp)->conn->vfs.handles.fget_nt_acl, (fsp), 
(fd), (security_info), (ppdesc)))
+#define SMB_VFS_FGET_NT_ACL(fsp, security_info, ppdesc) 
((fsp)->conn->vfs.ops.fget_nt_acl((fsp)->conn->vfs.handles.fget_nt_acl, (fsp), 
(security_info), (ppdesc)))
 #define SMB_VFS_GET_NT_ACL(conn, name, security_info, ppdesc) 
((conn)->vfs.ops.get_nt_acl((conn)->vfs.handles.get_nt_acl, (name), 
(security_info), (ppdesc)))
-#define SMB_VFS_FSET_NT_ACL(fsp, fd, security_info_sent, psd) 
((fsp)->conn->vfs.ops.fset_nt_acl((fs

svn commit: samba r26676 - in branches/SAMBA_4_0: . source/libcli/raw source/libcli/smb_composite

[jelmer]

Author: jelmer
Date: 2008-01-06 22:01:31 + (Sun, 06 Jan 2008)
New Revision: 26676

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26676

Log:
libcli: Fill in lp_workgroup() again, should fix my breakage of cifsdd tests. 
Thanks to Andrew for catching this. 

Also fixes a typo in sessetup.c.

Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/libcli/raw/clitree.c
   branches/SAMBA_4_0/source/libcli/smb_composite/sesssetup.c


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/libcli/raw/clitree.c
===
--- branches/SAMBA_4_0/source/libcli/raw/clitree.c  2008-01-05 21:29:25 UTC 
(rev 26675)
+++ branches/SAMBA_4_0/source/libcli/raw/clitree.c  2008-01-06 22:01:31 UTC 
(rev 26676)
@@ -192,6 +192,7 @@
io.in.service_type = service_type;
io.in.credentials = credentials;
io.in.fallback_to_anonymous = false;
+   io.in.workgroup = lp_workgroup(global_loadparm);
io.in.options = *options;

status = smb_composite_connect(&io, parent_ctx, resolve_ctx, ev);

Modified: branches/SAMBA_4_0/source/libcli/smb_composite/sesssetup.c
===
--- branches/SAMBA_4_0/source/libcli/smb_composite/sesssetup.c  2008-01-05 
21:29:25 UTC (rev 26675)
+++ branches/SAMBA_4_0/source/libcli/smb_composite/sesssetup.c  2008-01-06 
22:01:31 UTC (rev 26676)
@@ -129,7 +129,7 @@
case RAW_SESSSETUP_SPNEGO:
state->io->out.vuid = state->setup.spnego.out.vuid;
if (NT_STATUS_EQUAL(c->status, NT_STATUS_LOGON_FAILURE)) {
-   /* we neet to reset the vuid for a new try */
+   /* we need to reset the vuid for a new try */
session->vuid = 0;
if 
(cli_credentials_wrong_password(state->io->in.credentials)) {
nt_status = session_setup_spnego(c, session, 

[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1114-g020ed73

[Michael Adam]

The branch, v3-2-test has been updated
   via  020ed731b17ac00dd490f210f108eae249fb27ad (commit)
  from  d3b91e494c824a65506ba1bc1cba5bba77000530 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -
commit 020ed731b17ac00dd490f210f108eae249fb27ad
Author: Michael Adam <[EMAIL PROTECTED]>
Date:   Sun Jan 6 22:50:38 2008 +0100

Remove vlp.o in make clean.

Michael

---

Summary of changes:
 source/Makefile.in |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index 2267be4..3e02b89 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1992,6 +1992,7 @@ clean: delheaders
-rm -f $(PRECOMPILED_HEADER)
-rm -f core */*~ *~ \
*/*.o */*/*.o */*/*/*.o \
+   ../testsuite/*/*.o \
*/[EMAIL PROTECTED]@ */*/[EMAIL PROTECTED]@ */*/*/[EMAIL 
PROTECTED]@ \
$(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(ROOT_SBIN_PROGS) \
$(MODULES) $(TORTURE_PROGS) $(LIBSMBCLIENT) $(LIBADDNS) \


-- 
Samba Shared Repository