Build status as of Tue Dec 1 07:00:02 2009

[build]

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

--- /home/build/master/cache/broken_results.txt.old 2009-11-30 
00:00:05.0 -0700
+++ /home/build/master/cache/broken_results.txt 2009-12-01 00:00:03.0 
-0700
@@ -1,22 +1,22 @@
-Build status as of Mon Nov 30 07:00:02 2009
+Build status as of Tue Dec  1 07:00:02 2009
 
 Build counts:
 Tree Total  Broken Panic 
 build_farm   0  0  0 
-ccache   30 6  0 
+ccache   32 6  0 
 distcc   0  0  0 
 ldb  32 32 0 
-libreplace   2  0  0 
+libreplace   1  0  0 
 lorikeet 0  0  0 
 pidl 22 21 0 
-ppp  13 0  0 
+ppp  15 0  0 
 rsync32 12 0 
 samba-docs   0  0  0 
 samba-web0  0  0 
-samba_3_current 1  1  0 
-samba_3_master 30 23 2 
-samba_3_next 30 29 12
-samba_4_0_test 32 30 0 
+samba_3_current 30 28 0 
+samba_3_master 30 22 3 
+samba_3_next 30 29 2 
+samba_4_0_test 32 29 1 
 talloc   2  1  0 
 tdb  2  1  0 
 

[SCM] CTDB repository - branch master updated - ctdb-1.0.105-51-g83e7c16

[Ronnie Sahlberg]

The branch, master has been updated
   via  83e7c161efa93cd7acdfc803142b4fb3bfde7538 (commit)
   via  bc8aee079e09164e06533a1474f5e9d899795933 (commit)
   via  bb8d02abd88899d259085b9b23fa52accb222be9 (commit)
  from  4f50aa8bb8be544058523f2f544109a26c2b3b51 (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -
commit 83e7c161efa93cd7acdfc803142b4fb3bfde7538
Author: Michael Adam 
Date:   Thu Nov 26 08:35:20 2009 +0100

packaging:maketarball.sh: add a DEBIAN_MODE to the tarball creation

It is triggered by setting DEBIAN_MODE=yes in the environment.
This creates a tarball suitable for use in debian packages.
The differences from the standard tarball are these:

* The tar ball file is called ctdb_VERSION.orig.tar.gz
* The base directory in the tar ball is ctdb-VERSION.orig/

Michael

commit bc8aee079e09164e06533a1474f5e9d899795933
Author: Michael Adam 
Date:   Thu Nov 26 08:34:44 2009 +0100

configure:maketarball.sh: call autogen.sh and include configure in the 
tarball

Michael

commit bb8d02abd88899d259085b9b23fa52accb222be9
Author: Michael Adam 
Date:   Thu Nov 26 08:32:24 2009 +0100

packaging:maketarball.sh: create the specfile from the ctdb.spec.in

Michael

---

Summary of changes:
 packaging/maketarball.sh |   61 ++
 1 files changed, 56 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/maketarball.sh b/packaging/maketarball.sh
index 18e57a2..1ba353d 100755
--- a/packaging/maketarball.sh
+++ b/packaging/maketarball.sh
@@ -28,10 +28,21 @@ DIRNAME=$(dirname $0)
 TOPDIR=${DIRNAME}/..
 RPMDIR=${DIRNAME}/RPM
 SPECFILE=${RPMDIR}/ctdb.spec
+SPECFILE_IN=${SPECFILE}.in
 
 EXTRA_SUFFIX="$1"
 
-VERSION=$(grep ^Version ${SPECFILE} | sed -e 's/^Version:\ \+//')
+GITHASH=".$(git log --pretty=format:%h -1)"
+
+if test "x$USE_GITHASH" = "xno" ; then
+   GITHASH=""
+fi
+
+sed -e s/GITHASH/${GITHASH}/g \
+   < ${SPECFILE_IN} \
+   > ${SPECFILE}
+
+VERSION=$(grep ^Version ${SPECFILE} | sed -e 's/^Version:\ \+//')${GITHASH}
 
 if [ "x${EXTRA_SUFFIX}" != "x" ]; then
VERSION="${VERSION}-${EXTRA_SUFFIX}"
@@ -43,18 +54,58 @@ else
GZIP="gzip -9"
 fi
 
+TAR_PREFIX="ctdb-${VERSION}"
+TAR_BASE="ctdb-${VERSION}"
+
+if test "x${DEBIAN_MODE}" = "xyes" ; then
+   TAR_PREFIX="ctdb-${VERSION}.orig"
+   TAR_BASE="ctdb_${VERSION}.orig"
+fi
+
+TAR_BALL=${TAR_BASE}.tar
+TAR_GZ_BALL=${TAR_BALL}.gz
+
 pushd ${TOPDIR}
-echo -n "Creating ctdb-${VERSION}.tar.gz ... "
-git archive --prefix=ctdb-${VERSION}/ HEAD | ${GZIP} \
-   > ${TOPDIR}/ctdb-${VERSION}.tar.gz
+echo "Creating ${TAR_BASE}.tar.gz ... "
+git archive --prefix=${TAR_PREFIX}/ HEAD | ( cd /tmp ; tar xf - )
 RC=$?
 popd
+if [ $RC -ne 0 ]; then
+   echo "Error calling git archive."
+   exit 1
+fi
 
-echo "Done."
+pushd /tmp/${TAR_PREFIX}
+./autogen.sh
+RC=$?
+popd
+if [ $RC -ne 0 ]; then
+   echo "Error calling autogen.sh."
+   exit 1
+fi
 
+pushd /tmp
+tar cf ${TAR_BALL} ${TAR_PREFIX}
+RC=$?
 if [ $RC -ne 0 ]; then
+   popd
 echo "Creation of tarball failed."
 exit 1
 fi
 
+${GZIP} ${TAR_BALL}
+RC=$?
+if [ $RC -ne 0 ]; then
+   popd
+echo "Zipping tarball failed."
+exit 1
+fi
+
+rm -rf ${TAR_PREFIX}
+
+popd
+
+mv /tmp/${TAR_GZ_BALL} .
+
+echo "Done."
 exit 0


-- 
CTDB repository

[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
   via  2d1bd87... s4:torture/raw/lock - Fix "discard const" warnings by 
introducing "discard_const_p"s
   via  262d26d... s4:torture/nbt/wins - Add more casts
   via  58a5e76... s4:torture/nbench/nbench - Add a cast before 
"str_list_make_shell"
   via  8b44999... s4:torture/ldap/ldap_sort - Add some casts to suppress 
warnings
   via  7be99d3... s4:schema - Make some more (result) variables const and 
fix up warnings with "discard_const_p"
   via  012494b... util/util_strlist - add a call "const_str_list" for 
making "unconst" lists "const"
   via  9ce7e9a... s4:kdc - Merged kdc_tcp_accept() and 
kpasswdd_tcp_accept().
   via  0c89a6f... s4:kdc - Merged kdc_add_kdc_socket() and 
kdc_add_kpasswd_socket().
   via  bd17df7... s4 - Create default modules directory.
   via  c93fc3a... s4:kdc - Disable KDC port when it's set to 0.
  from  183ea82... Merge commit 'origin/master' into abartlet-devel

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 2d1bd87f732e37323bd382ac66f41bfc52a23dac
Author: Matthias Dieter Wallnöfer 
Date:   Fri Nov 20 11:35:13 2009 +0100

s4:torture/raw/lock - Fix "discard const" warnings by introducing 
"discard_const_p"s

commit 262d26d05a6b1f6b074408ba8be352324d1b0d47
Author: Matthias Dieter Wallnöfer 
Date:   Sat Oct 17 22:36:00 2009 +0200

s4:torture/nbt/wins - Add more casts

commit 58a5e764a9c96229cb4daa99d3d8ef18c188b4fe
Author: Matthias Dieter Wallnöfer 
Date:   Sat Oct 17 22:35:21 2009 +0200

s4:torture/nbench/nbench - Add a cast before "str_list_make_shell"

commit 8b4499942eff7bc6ea1b64cdc6ab6958b8f5d1a8
Author: Matthias Dieter Wallnöfer 
Date:   Sat Oct 17 22:34:00 2009 +0200

s4:torture/ldap/ldap_sort - Add some casts to suppress warnings

commit 7be99d373578f42ac47e67ef1b95a2409cecc184
Author: Matthias Dieter Wallnöfer 
Date:   Sat Oct 17 22:25:12 2009 +0200

s4:schema - Make some more (result) variables const and fix up warnings 
with "discard_const_p"

commit 012494b8005b621642ec98d51d067378f8e10421
Author: Matthias Dieter Wallnöfer 
Date:   Wed Nov 25 09:15:39 2009 +0100

util/util_strlist - add a call "const_str_list" for making "unconst" lists 
"const"

commit 9ce7e9ab8401e038b36d53e477fcb658d1c54f80
Author: Endi S. Dewata 
Date:   Tue Nov 24 01:00:45 2009 -0600

s4:kdc - Merged kdc_tcp_accept() and kpasswdd_tcp_accept().

Signed-off-by: Andrew Bartlett 

commit 0c89a6f2aa433e54d7af99d9214ddc186784af97
Author: Endi S. Dewata 
Date:   Mon Nov 23 22:28:11 2009 -0600

s4:kdc - Merged kdc_add_kdc_socket() and kdc_add_kpasswd_socket().

Signed-off-by: Andrew Bartlett 

commit bd17df71b59ba54c7845ddc000e8cb17b6a23928
Author: Endi S. Dewata 
Date:   Fri Nov 20 14:57:11 2009 -0600

s4 - Create default modules directory.

Signed-off-by: Andrew Bartlett 

commit c93fc3a10a8839752eb4c1d1e91c1b455c974eef
Author: Endi S. Dewata 
Date:   Fri Nov 20 08:47:40 2009 -0600

s4:kdc - Disable KDC port when it's set to 0.

Signed-off-by: Andrew Bartlett 

---

Summary of changes:
 lib/util/util.h|5 +
 lib/util/util_strlist.c|9 ++
 source4/Makefile   |1 +
 source4/dsdb/schema/schema.h   |8 +-
 source4/dsdb/schema/schema_inferiors.c |  117 +++---
 source4/kdc/kdc.c  |  147 +++-
 source4/torture/ldap/ldap_sort.c   |   14 ++--
 source4/torture/nbench/nbench.c|5 +-
 source4/torture/nbt/wins.c |   18 +++--
 source4/torture/raw/lock.c |9 ++-
 10 files changed, 165 insertions(+), 168 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/util.h b/lib/util/util.h
index e7ea0ba..729190a 100644
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -535,6 +535,11 @@ _PUBLIC_ const char **str_list_add_const(const char 
**list, const char *s);
 _PUBLIC_ const char **str_list_copy_const(TALLOC_CTX *mem_ctx,
  const char **list);
 
+/**
+ * Needed for making an "unconst" list "const"
+ */
+_PUBLIC_ const char **const_str_list(char **list);
+
 
 /* The following definitions come from lib/util/util_file.c  */
 
diff --git a/lib/util/util_strlist.c b/lib/util/util_strlist.c
index 71998b9..6d1a695 100644
--- a/lib/util/util_strlist.c
+++ b/lib/util/util_strlist.c
@@ -486,3 +486,12 @@ _PUBLIC_ const char **str_list_copy_const(TALLOC_CTX 
*mem_ctx,
ret[i] = NULL;
return ret;
 }
+
+/**
+ * Needed for making an "unconst" list "const"
+ */
+_PUBLIC_ const char **const_str_list(char **list)
+{
+   return (const char **)list;
+}
+
diff --git a/source4/Makefile b/source4/Makefile
index 8f23da5..8e4895b 100644
--- a/source4/Makefile
+++ b/source4/M

[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
   via  183ea82... Merge commit 'origin/master' into abartlet-devel
   via  d58413d... On our way to Samba4 alpha10!
   via  ca2c645... Fix build of Samba4 from tarball generated by 
mkrelease.sh
   via  5c2db53... Improve upgrade instructions
   via  5203128... This is alpha9
  from  83c106e... s4-ldb: the '1' form of extended_dn search is easier to 
read

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 183ea8220a2832b2b12d92219f9bd040dbe82772
Merge: d58413d3314bc245c6be6499bea40cca0ab3d242 
83c106e084876ee82c66a165a7b02c7702c752f4
Author: Andrew Bartlett 
Date:   Tue Dec 1 16:12:53 2009 +1100

Merge commit 'origin/master' into abartlet-devel

commit d58413d3314bc245c6be6499bea40cca0ab3d242
Author: Andrew Bartlett 
Date:   Tue Dec 1 16:06:59 2009 +1100

On our way to Samba4 alpha10!

---

Summary of changes:
 source4/VERSION |2 +-
 source4/script/mkrelease.sh |3 ---
 upgrading-samba4.txt|   20 ++--
 3 files changed, 7 insertions(+), 18 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/VERSION b/source4/VERSION
index 92a4f00..99fc68f 100644
--- a/source4/VERSION
+++ b/source4/VERSION
@@ -57,7 +57,7 @@ SAMBA_VERSION_TP_RELEASE=
 # e.g. SAMBA_VERSION_ALPHA_RELEASE=1   #
 #  ->  "4.0.0alpha1"   #
 
-SAMBA_VERSION_ALPHA_RELEASE=9
+SAMBA_VERSION_ALPHA_RELEASE=10
 
 
 # For 'pre' releases the version will be   #
diff --git a/source4/script/mkrelease.sh b/source4/script/mkrelease.sh
index 69ddaa2..303dfe6 100755
--- a/source4/script/mkrelease.sh
+++ b/source4/script/mkrelease.sh
@@ -11,9 +11,6 @@ OUTDIR=`mktemp -d samba-X`
 
 echo SAMBA_VERSION_IS_GIT_SNAPSHOT=no >> $OUTDIR/source4/VERSION
 
-rm -f $OUTDIR/source4/ldap_server/devdocs/rfc.txt \
-  $OUTDIR/source4/heimdal/lib/wind/rfc.txt
-
 #Prepare the tarball for a Samba4 release, with some generated files,
 #but without Samba3 stuff (to avoid confusion)
 ( cd $OUTDIR/ || exit 1
diff --git a/upgrading-samba4.txt b/upgrading-samba4.txt
index b84bbab..85e4699 100644
--- a/upgrading-samba4.txt
+++ b/upgrading-samba4.txt
@@ -1,24 +1,16 @@
 Upgrading from an older samba4 installation.
 
-For users of samba4 alpha 8 and after
-=
-
 * Stop any samba process
 * Backup your samba4 provision:
   go in the directory where your samba4 provision is stored (/usr/local/samba 
by default)
   do tar cf $HOME/backup.tar private (it's also recommended to save the 
etc/smb.conf and var/sysvol dir aswell)
 * Go in the source4 dir
-* run ./scripting/bin/upgradeprovision
+* run ./scripting/bin/upgradeprovision -s 
 * do make install
 
-For users of samba4 alpha 8 and after
-=
-
-* Stop any samba/smbd process
-* Backup your samba4 provision:
-  go in the directory where your samba4 provision is stored (/usr/local/samba 
by default)
-  do tar cf $HOME/backup.tar private (it's also recommended to save the 
etc/smb.conf and var/sysvol dir aswell)
-* Go in the source4 dir
-* run ./scripting/bin/upgradeprovision --full
-* do make install
+This will do the minimum (safest) upgrade of the data.  
 
+Runing upgradeprovision with --full will do a more comprehensive
+upgrade of the data (including schema and display specifiers).  This
+attempts to do a new provision, and to then copy existing data into
+that database.


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - annotated tag build_3.2.0_ctdb.40 created

[Andrew Bartlett]

The annotated tag, build_3.2.0_ctdb.40 has been created
at  e0134b58f0ad692e17c9c0b2a714a98c8896efa9 (tag)
   tagging  3e83a980586634bd6a18d5e17e4f326bccd397e3 (commit)
  replaces  build_3.2.0_ctdb.39
 tagged by  Michael Adam
on  Wed Aug 6 02:16:54 2008 +0200

- Log -
build_3.2.0_ctdb.40 for SOFS samba testing

* merges from v3-2-stable upstream (3.2.1 bugfixes)
* ctdb persistent store deadlock prevention
* ctdb persistent store retry loop
  controlled by new parameter "dbwrap ctdb:max store retries"
  which defaults to 5.

Michael
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAkiY7eYACgkQyU9JOBhPkDQrrQCgoMLwENqv1OkC8ftRRSKBUZRT
tiUAniwlVMVy1zTwHDJOp28b2xiQg1zV
=l+ib
-END PGP SIGNATURE-

Andreas Schneider (1):
  Remove trailing withespace from wbinfo -m which breaks gdm auth.

Günther Deschner (3):
  libwbclient: let wbcStringToSid handle the global NULL sid.
  winbindd: handle trusted domains without sid.
  rpc_client: Bug 5616 - fix session keys also in 
rpccli_netr_LogonSamLogonEx wrapper.

Herb Lewis (1):
  get rid of unused variable warnings when HAVE_IPV6 not defined

Jeremy Allison (5):
  Use sys_getgrnam not getgrnam. Pointed out by Herb.
  Remove test changes added in error.
  If we're not allowing streams on this conn ptr,
  Fix bug creating files using DOS clients with mixed
  Fix uninitialized variable.

John H Terpstra (1):
  pdb_ldap: Raise level for debug message to avoid log file flooding.

Karolin Seeger (7):
  man pages: "printcap name" is a global parameter, not a share specific 
one.
  talloc_string_sub2: Don't return NULL if src is empty.
  WHATSNEW: Update changes since 3.2.0.
  WHATSNEW: Update changes since 3.2.0.
  man pages: Fix typos in man smbclient.
  WHATSNEW: Update changes since 3.2.0.
  Samba3 HowTo: Fix duplicate chapter id.

Michael Adam (16):
  testsuite: fix expr syntax error in net registry test.
  testsuite: fix another expr syntax error. in tests_all.sh.
  testsuite: fix expr error on Tru64, triggered by uninitialized failed 
variable.
  packaging(RHEL-CTDB): Bump release number to ctdb.40 for the next RPM.
  Merge commit 'origin/v3-2-stable' into v3-2-ctdb
  Merge commit 'origin/v3-2-stable' into v3-2-ctdb
  dbwrap ctdb: remove erroneously duplicated comment.
  dbwrap ctdb: release the lock before calling ctdbd_persistent_store()
  dbwrap ctdb: add a retry loop to the persistent store operation.
  dbwrap ctdb: call db_ctdb_store() in db_ctdb_delete().
  dbwrap ctdb: add db_ctdb_delete_persistent() and use it for persistent DBs
  registry: use _bystring wrappers to dbwrap_trans_(store|delete).
  idmap_tdb2: fix a race condition in idmap_tdb2_allocate_id().
  dbwrap: add comment describing behaviour of dbwrap_change_uint32_atomic().
  secrets: fix replacemend random seed generator (security issue).
  dbwrap: add comment describing behaviour of dbwrap_change_int32_atomic().

Volker Lendecke (4):
  Update Roadmap
  Fix a race condition in winbind leading to a crash
  Fix an incompatible pointer warning
  Attempt to fix bug 5616

---


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - annotated tag build_3.2.0_ctdb.38 created

[Andrew Bartlett]

The annotated tag, build_3.2.0_ctdb.38 has been created
at  829fa75e2fca80315fb56fa610ae686c4d9b28b1 (tag)
   tagging  c1817f95a04f000638c1cf5784961947c2cd2bee (commit)
  replaces  build_3.2.0_ctdb.37
 tagged by  Michael Adam
on  Wed Jul 23 02:00:12 2008 +0200

- Log -
build_3.2.0_ctdb.38 for SOFS samba testing

* merges from upstream v3-2-stable
* add ctdbd_start_persistent_update() changes from Ronnie

Michael
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAkiGdLYACgkQyU9JOBhPkDR2jACeLBYDDb8iUFrBO2lj52vSdjE3
BccAnjJr9WXR9ibFnc/2MgIeiz5ZyK/m
=/QtN
-END PGP SIGNATURE-

Alexander Bokovoy (1):
  Fix link to Using Samba

Bo Yang (1):
  Allow %u parameters for print job username - use advanced sub

Herb Lewis (1):
  allow SID with 0 in subauthority to be converted properly

Jeremy Allison (1):
  From Jim McDonough

Karolin Seeger (2):
  smbldap: Fix typo in debug message.
  WHATSNEW: Update changes since 3.2.0.

Michael Adam (9):
  packaging(RHEL-CTDB): bump Release number to ctdb.37 for next rpm.
  gitignore: ignore the generated library symbol files
  dbwrap_crdb: wrap the tdb_store in db_ctdb_store_persistent() into 
transactions
  dbwrap_ctdb: wrap tdb_store() in transactions in db_ctdb_store().
  dbwrap_ctdb: wrap tdb_store() in transactions in db_ctdb_delete().
  Merge commit 'origin/v3-2-stable' into v3-2-ctdb
  Revert "dbwrap_ctdb: wrap tdb_store() in transactions in 
db_ctdb_delete()."
  Revert "dbwrap_ctdb: wrap tdb_store() in transactions in db_ctdb_store()."
  Revert "dbwrap_crdb: wrap the tdb_store in db_ctdb_store_persistent() 
into transactions"

Ronnie Sahlberg (1):
  Use transaction start/cancel for persistent writes to avoid leaving the 
database in an inconsistent state if we crash during the operation

Volker Lendecke (4):
  A brown paper bag bug fix for "net sam rights"
  Change the directory parameter in streams_depot to become consistent
  Document the streams modules
  Fix the build of vfs_zfsacl.c

---


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - annotated tag build_3.2.0_ctdb.39 created

[Andrew Bartlett]

The annotated tag, build_3.2.0_ctdb.39 has been created
at  3bddb6b7fbe6d81a1908ae7106a9c826a570b01e (tag)
   tagging  6a2371cda9708cc0e18323ad66789cf5704dd54d (commit)
  replaces  build_3.2.0_ctdb.38
 tagged by  Michael Adam
on  Wed Jul 30 15:44:50 2008 +0200

- Log -
build_3.2.0_ctdb.39 for SOFS samba testing

* pick "Fix a race condition in winbind leading to a crash"  by Volker Lendecke.

Michael
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAkiQcJUACgkQyU9JOBhPkDQnYgCcCpAQhouqqCgZR5y4ppoROpY5
ZtUAnjludC5nT/pcE4NlnGTMwdeo7jn/
=NKDN
-END PGP SIGNATURE-

Michael Adam (1):
  packaging(RHEL-CTDB): Bump release number to ctdb.39 for the next RPM.

Volker Lendecke (1):
  Fix a race condition in winbind leading to a crash

---


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - annotated tag build_3.2.0_ctdb.36 created

[Andrew Bartlett]

The annotated tag, build_3.2.0_ctdb.36 has been created
at  2145e53f9aea7118c7595b370cfcdbf8857f170d (tag)
   tagging  ab06803c62dc963a8485ae80e8f01859a6de0eab (commit)
  replaces  build_3.2.0_ctdb.35
 tagged by  Michael Adam
on  Thu Jul 10 23:25:20 2008 +0200

- Log -
build_3.2.0_ctdb.36 for SOFS samba testing

Registry fixes for treatment of incomplete keys.
Bugfixes from v3-2-stable.

Michael
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAkh2fpIACgkQyU9JOBhPkDTfoACeM/FTK0lU/lBfP1eZIZc6We3T
n20AoIVEWkfuBVNXgWLt/s36EW/EpFTs
=YWQ4
-END PGP SIGNATURE-

Günther Deschner (2):
  Fix build warning.
  libnetjoin: fix Bug #5570.

Jeremy Allison (9):
  Fix problem noticed by Jim Brown . When reverse 
searching decrement index,
  Two more fixes from Jim Brown  for SGI compiler 
warnings.
  Jim Brown  was right, this needs to be a signed int 
or
  MSG_DEBUG now forwarded to all the winbindd children by parent.
  Ensure consistent use of pdb_get_nt_passwd instead of 
pdb_get_lanman_passwd.
  Fix bug #5578, reported by sendel2...@hotbox.ru. Bad (non-Samba) use of 
strlcat gives error.
  Canonicalize servername in the printer functions to remove leading '\\' 
characters. Ensure we always return consistent names.
  Remove worrying warning message when safe_strcpy tries to copy a pseaudo 
interface
  Patch from SATOH Fumiyasu  for bug #5202. 
Re-activate "acl group control"

Karolin Seeger (2):
  VERSION: Raise version number to 3.2.1.
  WHATSNEW: Update changes since 3.2.0.

Lars Müller (1):
  Add SMB_VFS_OP_RECVFILE to get it in sync with vfs.h

Michael Adam (7):
  packaging(RHEL-CTDB): bump Release number to ctdb.36 for next rpm.
  registry: fetch regdb_fetch_keys() when a key exists but not its 
subkey-record.
  registry: improve logic for deleting value records in regdb_store_keys().
  registry: fix logic in deleting subkeys record in regdb_fetch_keys().
  testsuite: fix expr typo in net registry testscript.
  testsuite: fix another expr typo in net registry test script.
  Merge commit 'origin/v3-2-stable' into v3-2-ctdb

---


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - annotated tag build_3.2.0_ctdb.37 created

[Andrew Bartlett]

The annotated tag, build_3.2.0_ctdb.37 has been created
at  947d46c3d8bc053f1de55133471445f8de0e3a08 (tag)
   tagging  6179fe894d3d4a8f645c8bc0c6fd3ba65579cbb5 (commit)
  replaces  build_3.2.0_ctdb.36
 tagged by  Michael Adam
on  Fri Jul 18 11:16:18 2008 +0200

- Log -
build_3.2.0_ctdb.37 for SOFS samba testing

* merges from upstream v3-2-stable
* fixes for ctdb related panics / error propagation
* fixes: don't fall back to tdb backend when ctdbd is not running.

Michael
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAkiAX7sACgkQyU9JOBhPkDRnqgCggTzzNTErh8RcFyHQX5rfF5ih
vtkAniAuGkd3CHJzpsdc0rt9ejF4aBt1
=SnB6
-END PGP SIGNATURE-

Andreas Schneider (1):
  Release still reachable memory if the smbclient context is freed.

Christoph Zauner (1):
  man pages: Fix typos and add improvements.

Herb Lewis (3):
  fix comment typo and change some uint32 to uint32_t
  use variables for files used in multiple places
  cleanup some dup code by passing the password to the wbinfo_auth*

Jeremy Allison (5):
  Allow authentication and memory credential refresh after password change 
from gdm/xdm. Patch from boyang .
  Fix option processing in smbcacls - add POPT_COMMON_CONNECTION.
  Add fix from Simo for bug #5540 - missing code to substitute
  Fix swat. Bug #5613.
  Fix from Volodymyr Khomenko . Make ntimes

Karolin Seeger (4):
  WHATSNEW: Update changes since 3.2.0.
  man pages: Add missing whitespace.
  Fix typo.
  WHATSNEW: Update changes since 3.2.0.

Michael Adam (48):
  build: fix creation of libsmbsharemodes.a - don't link in libtdb.a.
  build: fix creation of libsmbclient.a - don't link in libtalloc.a
  build: fix creation of libaddns.a - don't link in libtalloc.a
  testsuite: fix expr typo in net registry testscript.
  testsuite: fix another expr typo in net registry test script.
  packaging(RHEL-CTDB): Bump release number to ctdb.37 for the next RPM.
  docs: update the section about net conf in the net(8) manpage.
  docs: fix VERSION section in the net(8) manpage.
  docs: fix the net conf section of net(8) to mention "config backend = 
registry".
  build: fix bug #5608: link creation for libtalloc.so.1 (and friends) on 
solaris 8
  loadparm: refactor initalization of registry config out into 
lp_smbconf_ctx().
  loadparm: refactor processing of service out of process_registry_globals()
  loadparm: add a function process_registry_shares()
  loadparm: add parameter allow_registry_shares to lp_load_ex().
  loadparm: add call to do_section() to process_registry_service().
  loadparm: add funcion lp_load_with_registry_shares().
  testparm: list registry shares with testparm.
  loadarm: fix testparm with "config backend = registry".
  loadparm: fix process_registry_shares() when there is only [global] in 
registry.
  build: fix build of libaddns shared lib. symbols file was missing.
  build: fix build of libaddns shared lib : it needs socket_wrapper.
  docs: fix the specified default of "password server" - it is *, not "".
  build: fix build on systems with picky make and without shared libwbclient
  build: use $(POPT_LIBS) instad of @POPT_LIBS@ in rules.
  build: use $(LIBTALLOC_LIBS) instead of @LIBTALLOC_LIBS@ in rules.
  build: use $(LIBTDB_LIBS) instead of @LIBTDB_LIBS@ in rules.
  build: link in $(WINBIND_LIBS) instead of @LIBWBCLIENT_SHARED@
  build: use $(LIBNETAPI_LIBS) instead of @LIBNETAPI_LIBS@ in rules.
  build: use $(LDAP_LIBS) instead of @LDAP_LIBS@ in rules.
  build: use $(WINBIND_NSS_EXTRA_LIBS) instead of @WINBIND_NSS_EXTRA_LIBS@ 
in rules.
  build: use $(WINBIND_NSS_PTHREAD) instead of @WINBIND_NSS_PTHREAD@ in 
rules.
  build: use $(PAM_WINBIND_EXTRA_LIBS) instead of @PAM_WINBIND_EXTRA_LIBS@ 
in rules.
  testparm: add a switch --skip-global-checks.
  testsuite: fix bug #5594 by using the new --skip-global-ckecks switch
  testparm: rename -g|--skip-global-ckecks to -l|--skip-logic-checks
  testparm: skip the per-share logic checks when --skip-logic-checks is 
specified.
  testparm: refactor the per-share logic checks out into 
do_per_share_checks().
  Merge commit 'origin/v3-2-stable' into v3-2-ctdb
  popt: add a popt_common_debuglevel set of options providing 
-d|--debuglevel
  testparm: allow the default debug level of 2 to be changed from the 
command line.
  dbwrap: when clustering = yes, don't fall back to db_open_tdb in db_open
  dbwrap: when clustering = yes, don't fall back to db_open_tdb in 
db_open_trans.
  registry: bump debug level to 1 in regdb_init() if opening the registry 
fails.
  registry: bump debug level to 1 in regdb_init() if storing version string 
fails.
  Revert "Do not panic if db_open_ctdb fails"
  dbwrap: don't panic in db

[SCM] Samba Shared Repository - annotated tag build_3.2.0_ctdb.35 created

[Andrew Bartlett]

The annotated tag, build_3.2.0_ctdb.35 has been created
at  afb49f30a396e22207cb4a893fd851621ddfce64 (tag)
   tagging  d6dcbe724b7d5518af27468aa717f98b9e7eb02b (commit)
  replaces  build_3.2.0_ctdb.34
 tagged by  Michael Adam
on  Fri Jul 4 15:02:42 2008 +0200

- Log -
build_3.2.0_ctdb.35 for SOFS samba testing

Mergerd in final samba 3.2.0 upstream changes.

Michael
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAkhuH5IACgkQyU9JOBhPkDTv/QCdH9V/5RzYDW3se7iJiBBcZGku
TKwAnjqcEdjfpY/MBMuxsC1BPvMDr1zz
=13fN
-END PGP SIGNATURE-

Gerald W. Carter (1):
  Return NULL in sitename_fetch() if gencache_init() fails.  Not false

Jeremy Allison (5):
  Fix gcc warnings at -O3.
  Fix usage message for net rpc trustdom add.
  Fix bug #5568 net rpc trustdom add broken !
  Fix from Atte Peltomäki - atte.peltom...@f-secure.com to correctly check
  After technical consultation, add Steven Danneman's 
 patch to make winbindd enum users and groups async.

Karolin Seeger (9):
  VERSION: Update version.
  WHATSNEW: Preparations for 3.2.0.
  WHATSNEW: Update changes since 3.2.0rc2.
  WHATSNEW: Update changes since 3.2.0rc2.
  Fix warnings on SuSE 9.0.
  WHATSNEW: Update changes since 3.2.0rc2.
  WHATSNEW: Fix alphabetical order, update changes.
  WHATSNEW: Update changes since 3.2.0rc2.
  WHATSNEW: Remove reference to 3rd version of Using Samba.

Michael Adam (2):
  packaging(RHEL-CTDB): Bump release number to ctdb.35 for the next RPM.
  Merge commit 'origin/v3-2-stable' into v3-2-ctdb

Volker Lendecke (4):
  Fix a segfault in rpcclient adddriver
  Fix valgrind errors in _spoolss_addprinterdriver
  Fix a file descriptor leak in add_port_hook
  Attempt to fix the build on Irix CC

---


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - annotated tag build_3.2.0_ctdb.34 created

[Andrew Bartlett]

The annotated tag, build_3.2.0_ctdb.34 has been created
at  b8cd43c8c6a216e9ba67d258329ddbf130c02c31 (tag)
   tagging  5621508199ccaa43318cf89fcecfe21403da15d3 (commit)
  replaces  build_3.2.0_ctdb.33
 tagged by  Michael Adam
on  Fri Jun 27 16:52:28 2008 +0200

- Log -
build_3.2.0_ctdb.34 for SOFS samba testing

This includes a gpfs_prefech module by Volker.

Michael
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAkhk/uoACgkQyU9JOBhPkDTeaACdGhxrMeZENhLoY7OE6afZiyDk
DDUAoJOp1v89dDxPfMvp+N7weaqEMp7X
=JjXe
-END PGP SIGNATURE-

Andreas Schneider (2):
  Add krb5 support for the testbrowse example.
  Add documentation for kerberos support in libsmbclient.

Andrew Tridgell (1):
  make parametic options case insensitive

Derrell Lipman (1):
  Remove prototype of unimplemented smbc_chown() function.

Jeremy Allison (7):
  Fix bug #5533. Winbindd fails to cope correctly with a workgroup name 
containing a '.'.
  Fix bug #5531 - fix conversion of ns units when converting from nttime to 
timespec.
  Sorry volker, lost your original git-id due to proto.h conflicts.
  Fix bug #. Don't return NT_STATUS_PASSWORD_MUST_CHANGE error on 
machine account logon.
  Fix for bug #5551, smbd recursing back into winbindd from a winbindd call.
  Final (hopefully :-) part of fix for bug #5551. Allow passdb backend to 
enumerate domain groups.
  Part of fix for #5551. Split out the group enumeration functions to a 
BUILTIN and a Domain

John H Terpstra (5):
  Fixing net help info.
  Clarification that hosts resolution is done by winbind only on IRIX, all 
other systems use libnss_wins.so.
  Clarification that hosts resolution is done by winbind only on IRIX, all 
other systems use libnss_wins.so.
  Added TDB File documentation requested by some users.
  Fixed publishing date info.

Kai Blin (3):
  selftest: Use TESTS env var to specify tests to run like Samba4 does.
  selftest: Advertise as PDC and time server during make test
  tests: Add a net_misc test.

Karolin Seeger (5):
  man pages: Correct version in man winbindd again.
  Samba3 HOWTO: Remove trailing whitespaces.
  WHATSNEW: Update changes since 3.2.0rc2.
  WHATSNEW: Fix typo.
  tests_all.sh: Do not execute $SMB4TORTURE --version if it is not 
available.

Michael Adam (32):
  packaging(RHEL-CTDB): bump Release number to ctdb.34 for the next RPM.
  Fix Bug #5548 (segfauls in handle_include with %m macro expansion).
  Merge commit 'origin/v3-2-stable' into v3-2-ctdb
  testsuite: use domain==workgroup in wbinfo tests now that we are PDC.
  testsuite: adapt informative message to say "Running _local_ registry 
tests".
  testsuite: add the ability to test "net rpc registry" with the 
net_registry tests
  testsuite: run the net rpc registry tests from the net_s3 tests.
  testsuite: give the testuser administrative rights in selftest.sh
  testsuite: make diagnostic output more appropriate in tests_all.sh
  testsuite: make structuring output of net_s3 tests stand out more.
  testsuite: allow selection of posix_s3 subtests by env var POSIX_SUBTESTS.
  testsuite: don't give the testuser administrative rights globally.
  testsuite: give admin rights to testuser only for the "net rpc registry" 
test.
  testsuite: update introductory comment to test_net_regsistry.sh
  testsuite: add a testparm_s3 test script.
  testsuite: enable the testparm_s3 tests.
  Merge commit 'origin/v3-2-stable' into v3-2-ctdb
  loadparm: don't treat a missing include file as an error in 
handle_include().
  loadparm: use the return value of the special handlers in lp_load().
  Merge commit 'origin/v3-2-stable' into v3-2-ctdb
  Merge commit 'origin/v3-2-stable' into v3-2-ctdb
  Revert "Exit nmbd cleanly if messaging_init() fails"
  nmbd: don't panic if messaging_init() fails - return NULL instead.
  nmbd: untangle logic in nmbd_messaging_context() slightly.
  Revert "Dont core dump if ctdb is not running"
  smbd: don't panic if messaging_init() fails but return NULL
  smbd: untangle logic in smbd_messaging_context() slightly.
  winbindd: don't panic if messaging_init() fails - return NULL instead.
  winbind: untangle logic in winbind_messaging_context() slightly.
  winbind: remove duplicate debug message for failing messaging_init().
  messages: bump debug level to 1 for "messaging_ctdb_init failed".
  ctdbd_connect: bump debug level to 1 for "connect failed" message.

Volker Lendecke (14):
  Fix a brown paper bag segfault in clitar
  Revert "Fix a memleak in svcctl_init_keys()"
  Fix the build on FreeBSD 4.6.2
  Use "init_shared_module" instead of "init_module" for initializing .so's
  Attempt to fix the darwin build
  Fix a double-closedir() in form_

[SCM] Samba Shared Repository - annotated tag build_3.2.0_ctdb.33 created

[Andrew Bartlett]

The annotated tag, build_3.2.0_ctdb.33 has been created
at  e2d58ff80620b1bca667118952a40e5a54ecb638 (tag)
   tagging  bde03141678ed997578943bbf64b6d73a54b941d (commit)
  replaces  build_3.2.0_ctdb.32
 tagged by  Michael Adam
on  Wed Jun 18 18:43:16 2008 +0200

- Log -
build_3.2.0_ctdb.32 for SOFS samba testing

This includes first ACL fixes by Volker.

Michael
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAkhZO1QACgkQyU9JOBhPkDS5igCfSiwl2kSD1awL1yAdO0AkTVPS
mMgAn2ED7HLMayQJqgGqa8+vI8IVihJP
=ytlu
-END PGP SIGNATURE-

Günther Deschner (5):
  samsync: add samsync_fix_delta_array()
  net: Fix bug #5542 (samsync contains empty passwords).
  netapi: Fix Bug #5545 (libnetapi_init without $USER)
  net_vampire: fix build warning.
  net_vampire: fix samsync_process_database(). Final fix for Bug #5542.

Jeremy Allison (1):
  More correct fix (hopefully :-) for any memory leaks.

Karolin Seeger (3):
  net: Fix several typos in comments.
  WHATSNEW: Updates changes since 3.2.0rc2.
  man pages: Move 'smbsh' man page to the examples directory.

Michael Adam (6):
  packaging(RHEL-CTDB): remove the libnss_wins modules to reduce deps.
  packaging(RHEL-CTDB): bump Release to ctdb.33 for the next build
  Merge commit 'origin/v3-2-stable' into v3-2-ctdb
  packaging(RHEL-CTDB): update the build instructions in the README.
  Merge commit 'origin/v3-2-stable' into v3-2-ctdb
  Fix Bug #5548 (segfauls in handle_include with %m macro expansion).

Volker Lendecke (15):
  Fix a crash in _winreg_QueryValue
  Fix bug 5500 -- thanks to mathion at thorrovydeti.com for reporting
  Fix an uninitialized variable found by the IBM checker
  Fix group parsing in libwbclient's copy_group_entry()
  Fix a handle leak for error returns in ldb_try_load_dso
  Revert "Fix a memleak caused by a crappy get_sorted_dc_list() API"
  Revert "Fix a memleak in ads_find_dc() in case get_sorted_dc_list() fails"
  Fix a memleak in wbcAuthenticateUserEx()
  Replace a very unusual variable declaration by a more conventional one
  Fix a segfault in wbcLookupRids
  Fix a segfault in wbcLookupSid
  Fix a memleak in svcctl_init_keys()
  Fix checks in can_delete_file_in_directory()
  RWX on a file does not imply DELETE access
  Revert "Fix a memleak in svcctl_init_keys()"

---


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - annotated tag build_3.2.0_ctdb.32 created

[Andrew Bartlett]

The annotated tag, build_3.2.0_ctdb.32 has been created
at  59e8abdd91d41c75ed23a198b8cd7d3b90ce6f46 (tag)
   tagging  848570856efb3cbe0bee9881769cd35163c4570f (commit)
  replaces  build_3.2.0_ctdb.30
 tagged by  Michael Adam
on  Tue Jun 17 11:25:39 2008 +0200

- Log -
build_3.2.0_ctdb.32 for SOFS samba testing

Michael
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAkhXgzoACgkQyU9JOBhPkDQImACfSfm8RY2dOamJ5SBxruPyVpyN
2WAAnjZColXLWqMA261Nup/jNQzuGXdW
=OAIF
-END PGP SIGNATURE-

Christoph Zauner (4):
  Fix typos.
  Samba3-HOWTO: Fix typos.
  man pages: Fix typos.
  man pages: Added improvements.

Gerald W. Carter (2):
  Manually merge Steven Danneman's patch for SPNEGO auth to a trusted
  Manually port Steven Dannenman fix for using the correct machine domain 
when

Günther Deschner (9):
  mailslot: always pull a command 25 type reply.
  libnetjoin: First store configuration and then verify the join.
  libnetjoin: add libnet_join_rollback().
  pam_winbind: fix pam_sm_chauthtok for storing modified cached creds.
  netdomjoin-gui: some minor fixes + hunting down typecast bugs.
  netdomjoin-gui: disable annoying "reboot now" dialog.
  netdomjoin-gui: fix more gtk runtime warnings.
  netdomjoin-gui: enable NetGetJoinInformation() call after successfull 
joining.
  pam_winbind: Update cached creds during password change.

Jeremy Allison (1):
  Bugfix noticed by Herb. On using the again: tag as a

Jim McDonough (1):
  Don't reset password last set time just because the expired flag

Karolin Seeger (15):
  Samba3-HOWTO: Add improvements/fixes.
  Revert "build: add symbol versioning when we build with gnu ld"
  WHATSNEW: Update changes since 3.2.0rc1.
  WHATSNEW: Update changes since 3.2.0rc1.
  WHATSNEW: Update changes since 3.2.0rc1.
  WHATSNEW: Update changes since 3.2.0rc2.
  WHATSNEW: Update changes since 3.2.0rc1.
  man pages: Remove wrong synonym.
  man pages: Fix synonyms.
  WHATSNEW: Update changes since 3.2.0rc1.
  WHATSNEW: Update changes since 3.2.0rc1.
  man pages: Fix broken smb.conf section about the 'get quota command'.
  man pages: Don't refer to numbered chapter of the HOWTO collection.
  man pages: Fix typo in smb.conf section about the 'deleteprinter command'.
  man pages: Fix indentation in smb.conf section about 'map readonly'.

Stefan Metzmacher (6):
  configure: fix warnings with autoconf-2.62 rename smb_krb5_ => 
smb_krb5_cv_
  configure: fix warnings with autoconf-2.62 rename samba_stat_hires => 
samba_cv_stat_hires
  configure: fix warnings with autoconf-2.62 rename SMB_BUILD_ => samba_cv_
  configure: we require autoconf 2.54
  libreplace: fix warnings with autoconf-2.62 rename ac_ => libreplace_cv_
  libreplace: only include AC_USE_SYSTEM_EXTENSIONS fallback if required

Volker Lendecke (21):
  Add STREAMINFO op to vfs_full_audit
  Fix a memleak in secrets_fetch_afs_key
  Fix a memleak in secrets_fetch_trust_account_password_legacy
  Fix a memleak in fetch_ldap_pw
  Fix the compile on NetBSD -- readlink and read are macros there
  Fix the compile on NetBSD -- missing prototypes
  shrink ldbtools
  Fix some scary FC9 warnings
  Correctly find a [u]int32_t replacement
  Merge commit 'origin/v3-2-stable' into v3-2-ctdb
  Fix max_fd calculation in event_loop_once
  Fix max_fd calculation in event_loop_once
  AIX build fixes from William Jojo -- thanks
  Add -brtl to the AIX linker flags
  Do not panic if db_open_ctdb fails
  Do not segfault if corepath is not set up properly
  Exit nmbd cleanly if messaging_init() fails
  Exit smbstatus cleanly if messaging_init fails
  Correctly return NULL from messaging_ctdbd_connection if messaging_init 
failed
  Merge commit 'origin/v3-2-stable' into v3-2-ctdb
  bump version number to 32

root (3):
  Dont core dump if ctdb is not running
  Fix README: DOCS_DIR is replaced by DOCS_TARBALL
  Package 32-bit versions of libtalloc into the winbind rpm

---


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - annotated tag build_3.2.0_ctdb.28 created

[Andrew Bartlett]

The annotated tag, build_3.2.0_ctdb.28 has been created
at  3ec1b81058d40acdf7d51ba9ca92338afc138450 (tag)
   tagging  931e96f3713b0488a0f0c1c1cd9f6653a625ba55 (commit)
  replaces  build_3.2.0_ctdb.27
 tagged by  Michael Adam
on  Wed May 21 12:25:43 2008 +0200

- Log -
build_3.2.0_ctdb.28 for SOFS samba testing

Michael
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAkgz+NoACgkQyU9JOBhPkDSCjQCeNd8oc46M19byXX3eTIgjvcjA
RF0An2KYSDtr1oVrwxpUbacF9Nmci6NU
=rvOC
-END PGP SIGNATURE-

Günther Deschner (8):
  IDL: Fix IDL for samr_GetDisplayEnumerationIndex{2}.
  IDL: rerun make idl.
  Fix Bug #5461 and implement a very basic 
_samr_GetDisplayEnumerationIndex().
  build: fix the build w/o ldap.
  rpcclient: Add getdispinfoidx command.
  rpcclient: Add tiny fix for cmd_samr_get_dispinfo_idx().
  Make sure to zero the returned handle in _svcctl_CloseServiceHandle().
  Fix typo.

Jeremy Allison (3):
  Restructuring of code to fix #5460. Remove search
  Fix bug #5477 - recvfile code was broken.
  Convert in_transaction to a bool. Add the same fix Volker

Jim McDonough (1):
  Enable winbind child processes to do something with signals,

Kai Blin (1):
  net: Display net rpc trustdom usage from net rpc trustdom

Karolin Seeger (8):
  man pages: Remove man page for 'mangled map'.
  WHATSNEW: Fix typo.
  WHATSNEW: Add 'smb encrypt' to the list of new parameters.
  WHATSNEW: Fix typo.
  VERSION: Raise version from pre3 to rc1.
  WHATSNEW: Update changes since 3.2.0pre3.
  Developer's Guide: Fix typos.
  man pages: Add documentation for new cluster parameters.

Michael Adam (3):
  packaging: disable cups in the RHEL-CTDB build.
  Merge commit 'origin/v3-2-stable' into v3-2-ctdb
  packaging: bump the rhel-ctdb rpm releas number to ctbd.28

Simo Sorce (1):
  Enable use of Relocations Read-Only, if supported, for enhanced security.

Volker Lendecke (9):
  If no node number is given, default to the current node in smbcontrol
  Don't block smbcontrol online/offline if !"winbind offline logons"
  Convert messages_local.c to use "struct tdb_wrap"
  Fix a memleak in construct_printer_info_7()
  Fix memcache_flush()
  Fix nesting tdb_traverse in a transaction
  Fix a valgrind error in _samr_LookupNames
  Add winbind:online check timeout parameter
  Do not call testparm in /etc/init.d/smb

---


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - annotated tag build_3.2.0_ctdb.30 created

[Andrew Bartlett]

The annotated tag, build_3.2.0_ctdb.30 has been created
at  a22ddf07065cefb90c28ccb120fe4a1f531e86a4 (tag)
   tagging  990a58cdccf5c55d7a7656ffafa6b821fe462a67 (commit)
  replaces  release-3-2-0rc1
 tagged by  Michael Adam
on  Tue Jun 17 11:34:48 2008 +0200

- Log -
build_3.2.0_ctdb.30 for SOFS samba testing

Michael
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAkhXhV0ACgkQyU9JOBhPkDRHIQCZAd0yUKpsuTmmAjhCx+UJmtW9
BisAn0aR5y0uKyInAwJQogUY9gjIMUQB
=hmLT
-END PGP SIGNATURE-

Alexander Bokovoy (1):
  Ignore Emacs' semantic.cache

Andreas Schneider (2):
  Fix saving of the config file in SWAT; [#5516].
  Fix empty input fields in SWAT; [#5515].

Andrew Tridgell (6):
  update configure.rpm for clustered Samba usage
  keep compatibility with v3-0-ctdb name for fileid:mapping option
  apply patch from v3-0-ctdb to special case root in libnss_winbind
  merge in spec file from Michael
  fixed version in spec file
  merge build changes from Mathias

Björn Jacke (1):
  Add ldap connection timeout for OpenLDAP and Netscape LDAP libs. This can 
be controlled via the ldap connection timeout parameter. This fixes fallbacks 
to secondary LDAP servers in multi LDAP server setups like in #4544

Chere Zhou (1):
  minor memory leak fix

Günther Deschner (10):
  _netr_LogonSamLogon: fix lm session key length.
  Fix Bug #5465 (joining with createcomputer=ou1/ou2/ou3).
  idl: avoid sa_family as it its a macro on IRIX.
  re-run make idl.
  dsgetdcname: use family (instead of sa_family).
  Fix Bug #5285. (libcap header mismatch)
  libnetjoin: delete possible "realm" leftover parameter.
  libnetjoin: only close existing policy handles while unjoining.
  libnetjoin: correctly copy returned lsa policy sid.
  build: fix build warning.

Jeremy Allison (19):
  Fix replacement getpass. If we ^C at the prompt echo was left off.
  Fix bug #5464. Pointed out by Herb @ Connectathon. In fork_domain_child() 
we call :
  Fix bug #5460. The problem is RHEL5.0 shipped a CIFS client
  Second part of patch for bug #5460. Cope with pathnames
  Ensure we don't keep searching for sharename if it's
  Fix debug message.
  Enable tests for splice on Linux. Add a static (vl, I hate this)
  Re-enable the evil "aio write behind" parameter.
  Security fix for CVE-2008-1105: Boundary failure when parsing SMB 
responses
  Fix winbindd on a PDC by reverting : 
83b04c60fac76ccd2d5aecb14f8896a07d488b1f..6e66512d5beb256a44c6703cdb8c7fa7e0fd8537.
  Fix valgrind bug in debug statement. Don't reference uninitialized memory.
  Fix bug #5504. winbindd children and parent were handing SIGTERM in the 
same way - deleting the socket!
  Memory leak fixes from Chere Zhou .
  A few cleanups from Chere Zhou .
  From Michael R Sweet .
  Fix bug reported by David Eisner . When allocating cli
  Fix by Bo Yang  for bug with winbindd trusted domain 
child
  Split the winbindd_passdb backend into a 'builtin' and a 'sam'
  Allow server manager to close open files selected by id.

Karolin Seeger (12):
  man pages: Correct version string.
  WHATSNEW: Update changes since 3.2.0pre3.
  Eliminate global variable in_client.
  Remove source/librpc/gen_ndr/cli_messaging.c.
  WHATSNEW: Update changes since 3.2.0rc1.
  VERSION: Raise version number to 3.2.0rc2.
  WHATSNEW: Update changes since 3.2.0rc1.
  WHATSNEW: Update changes since 3.2.0rc1.
  WHATSNEW: Update changes since 3.2.0rc1.
  man pages: Add documentation for new parameter 'ldap connection timeout'.
  WHATSNEW: Update changes since 3.2.0rc1.
  WHATSNEW: Update changes since 3.2.0rc1.

Marc VanHeyningen (1):
  Tiny memory leak

Michael Adam (77):
  registry: use dbwrap_fetch_bystring() in regdb_fetch_keys().
  registry: use dbwrap_fetch_bystring() in regdb_fetch_values().
  registry: use normalize_reg_path() in regdb_fetch_keys()
  registry: combine talloc_strdup() and normalize_reg_path() in 
regdb_fetch_keys().
  registry: add a function for fetching a tdb record for a given keystring
  registry: use regdb_fetch_key_internal() in regdb_fetch_keys().
  registry: use regdb_fetch_key_internal() in regdb_fetch_values().
  registry: add function regdb_key_exists() to check for existence of a key.
  registry: check for existence of key init_registry_key and possibly save 
a write.
  registry: save writes in init_registry_data() if data does already exist.
  registry: skip writes of existing keys in init_registry_data().
  registry: change order of arguments of regdb_fetch_key_internal()
  registry: free temporary data in regdb_fetch_key_internal().
  registry: make normalize_reg_path() strip leading and trailing '/' chars.
  registry: Implement new 

[SCM] Samba Shared Repository - annotated tag build_3.2.0_ctdb.27 created

[Andrew Bartlett]

The annotated tag, build_3.2.0_ctdb.27 has been created
at  39008baadf8feeb00ee60966cd3331054714a46f (tag)
   tagging  6e66a0017f9429fb8b3d1757969074be260215e1 (commit)
  replaces  build_3.2.0_ctdb.1
 tagged by  Michael Adam
on  Thu May 22 14:56:06 2008 +0200

- Log -
tag samba-ctdb rpm build: build_3.2.0_ctdb.27

Note: The release number "ctbd.27" was set manually (from "ctdb.1")
before shipping that rpm. So except for that numbering change,
the shipped rpm is the same build as the "ctdb.1" build - the first
build, I created from out of this git repository with the makerpms script.

For tagging the branch, I chose the commit that set the Release
number to "ctdb.27". The only other differences are two
picked WHATSNEW changes from 3-2-stable and a removed manpage
from the docs sources (which are not used for the rpm anyways).

>From now on, tags will be properly on the exact commit of the build.

Michael
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAkg1bhUACgkQyU9JOBhPkDRbFwCcCWpkNgtFQfui1yE7An8qVNp5
HHYAn08HqDwoZSLrppE3A6ZB4NmfGhhs
=bX2T
-END PGP SIGNATURE-

Michael Adam (1):
  packaging: we are at release ctdb.27 in RHEL-CTDB.

---


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - annotated tag build_3.2.0_ctdb.1 created

[Andrew Bartlett]

The annotated tag, build_3.2.0_ctdb.1 has been created
at  8ef824b9d6cf04e07a407da82fda1ce53ba5423a (tag)
   tagging  be62d594bc2b680dfefb4a5050d033b77c08154b (commit)
  replaces  release-3-2-0pre3
 tagged by  Michael Adam
on  Thu May 22 14:52:34 2008 +0200

- Log -
tag samba-ctdb rpm build: build_3.2.0_ctdb.1

This was the first rpm, I produced from git with the
makerpms.sh script. It was shortly afterwards
replaced by the "ctdb.27" build which was the proper
release number to follow...

Michael
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAkg1bO4ACgkQyU9JOBhPkDSGVQCfc14yAMgpH4FUC1AEoFBDXxjA
VxYAnj9Yjld2GeFTG9Ht9NjCmzownFhy
=nnOC
-END PGP SIGNATURE-

Alexander Bokovoy (1):
  Use more error-prone form of testing dm_destroy_session() return code 
after discussing with Tridge

Andrew Bartlett (1):
  Add in a nice big comment explaining why SamLogonEx matters.

Andrew Tridgell (6):
  update configure.rpm for clustered Samba usage
  keep compatibility with v3-0-ctdb name for fileid:mapping option
  apply patch from v3-0-ctdb to special case root in libnss_winbind
  merge in spec file from Michael
  fixed version in spec file
  merge build changes from Mathias

Björn Jacke (2):
  increase log level for this failed setsockopt call. EINVAL is a normal 
error on Solaris when we do this on an already resetted connection.
  fix some extrasemi compile warnings

Eric Cronin (1):
  Missing HAVE_UPDWTMPX check before using updwtmpx().

Gerald W. Carter (3):
  BUG 5429: Clarify log msgs re: failure to create 
BUILTIN\{Administrators,Users}
  BUG 5107: Fix handling of large DNS replies on AIX and Solaris.
  Winbind: Prevent cycle in children list when reaping dead child processes.

Günther Deschner (13):
  Fill in WHATSNEW.txt for pre3.
  errors: add WERR_INVALID_DOMAINNAME.
  samlogoncache: Use data_blob_const in netsamlogon_cache_get.
  Fix typo.
  Strip whitespace in ntsvcs rpc server.
  netapi: add -f switch for DsGetDCName() example and be more verbose on 
output.
  wins: fix null pointer crash in nss_wins module.
  pam_winbind: Fix Bug #5430 (patch from fumi...@osstech.co.jp).
  _netr_LogonSamLogon: fix lm session key length.
  Fix Bug #5465 (joining with createcomputer=ou1/ou2/ou3).
  _netr_LogonSamLogon: fix lm session key length.
  Fix Bug #5465 (joining with createcomputer=ou1/ou2/ou3).
  Fix client authentication with -P switch in client tools (Bug 5435).

Holger Hetterich (1):
  winbindd_cache: recognize and allow longer UA keys

James Peach (4):
  smbspool: add my copyright.
  smbspool: Run indent to approximate conding standards.
  smbspool: minor formatting cleanups.
  smbspool: Fix the smbspool build.

Jeremy Allison (21):
  Fix typo noticed by David Disseldorp . AF_INET should be 
AF_INET6 in this case.
  Fix bug #5434 found by Ted Percival .
  Tidyup to ensure '\n' is treated identically in all
  Remove hard coded sizes.
  Fix from Martin Zielinski . Don't delete files when
  The first of Martin Zielinski  Vista printing patches.
  Fix bug #5095, "Manage Documents privilege is not functional".
  Fix bug found by Igor Mammedov  where we are
  Fix bug #5452 - smbclient put always creates zero length
  Fix replacement getpass. If we ^C at the prompt echo was left off.
  Fix bug #5464. Pointed out by Herb @ Connectathon. In fork_domain_child() 
we call :
  Fix bug #5460. The problem is RHEL5.0 shipped a CIFS client
  Second part of patch for bug #5460. Cope with pathnames
  Fix debug message.
  Ensure we don't keep searching for sharename if it's
  Fix replacement getpass. If we ^C at the prompt echo was left off.
  Fix bug #5464. Pointed out by Herb @ Connectathon. In fork_domain_child() 
we call :
  Fix bug #5460. The problem is RHEL5.0 shipped a CIFS client
  Second part of patch for bug #5460. Cope with pathnames
  Ensure we don't keep searching for sharename if it's
  Fix debug message.

Karolin Seeger (11):
  WHATSNEW: Preparation for 3.2.0rc1.
  WHATSNEW: Add changes from Steven Danneman.
  man smbcacls: Correct possible flag values.
  WHATSNEW: Cleanup.
  WHATSNEW: Update changes since 3.2.0pre3.
  man pages: Correct version string.
  WHATSNEW: Update changes since 3.2.0pre3.
  WHATSNEW: Update changes since 3.2.0pre3.
  WHATSNEW: Remove trailing whitespace.
  man pages: Correct version string.
  WHATSNEW: Update changes since 3.2.0pre3.

Michael Adam (69):
  winbindd_cache: simplify logic in new key length check for UA keys.
  vfs_cacheprime: fix C++ warning - make implicit cast explicit
  rpc_parse: fix "assignment discards qualifier" warning by using 
CONST_DISCARD.
  loadparm: reformat - fix whitespace/tab
   

[SCM] CTDB repository - branch master updated - ctdb-1.0.105-48-g4f50aa8

[Ronnie Sahlberg]

The branch, master has been updated
   via  4f50aa8bb8be544058523f2f544109a26c2b3b51 (commit)
  from  821333afb458358f90446062b0242790695e5060 (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -
commit 4f50aa8bb8be544058523f2f544109a26c2b3b51
Author: Ronnie Sahlberg 
Date:   Tue Dec 1 16:06:59 2009 +1100

when we detect a ip-allocation mismatch, just force a new ip reassignment
instead of a full blown recovery

---

Summary of changes:
 server/ctdb_recoverd.c |   51 ---
 1 files changed, 26 insertions(+), 25 deletions(-)


Changeset truncated at 500 lines:

diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index d304e24..a227dba 100644
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -1855,6 +1855,11 @@ static void process_ipreallocate_requests(struct 
ctdb_context *ctdb, struct ctdb
result.dptr  = (uint8_t *)&ret;
 
for (callers=rec->reallocate_callers; callers; callers=callers->next) {
+
+   /* Someone that sent srvid==0 does not want a reply */
+   if (callers->rd->srvid == 0) {
+   continue;
+   }
DEBUG(DEBUG_INFO,("Sending ip reallocate reply message to "
  "%u:%llu\n", (unsigned)callers->rd->pnn,
  (unsigned long long)callers->rd->srvid));
@@ -2286,7 +2291,7 @@ static enum monitor_result verify_recmaster(struct 
ctdb_recoverd *rec, struct ct
 
 /* called to check that the allocation of public ip addresses is ok.
 */
-static int verify_ip_allocation(struct ctdb_context *ctdb, uint32_t pnn)
+static int verify_ip_allocation(struct ctdb_context *ctdb, struct 
ctdb_recoverd *rec, uint32_t pnn)
 {
TALLOC_CTX *mem_ctx = talloc_new(NULL);
struct ctdb_all_public_ips *ips = NULL;
@@ -2352,41 +2357,38 @@ static int verify_ip_allocation(struct ctdb_context 
*ctdb, uint32_t pnn)
for (j=0; jnum; j++) {
if (ips->ips[j].pnn == pnn) {
if (!ctdb_sys_have_ip(&ips->ips[j].addr)) {
+   struct takeover_run_reply rd;
+   TDB_DATA data;
+
DEBUG(DEBUG_CRIT,("Public address '%s' is 
missing and we should serve this ip\n",
ctdb_addr_to_str(&ips->ips[j].addr)));
-   ret = ctdb_ctrl_freeze_priority(ctdb, 
CONTROL_TIMEOUT(), CTDB_CURRENT_NODE, 1);
-   if (ret != 0) {
-   DEBUG(DEBUG_ERR,(__location__ " Failed 
to freeze node due to public ip address mismatches\n"));
 
-   talloc_free(mem_ctx);
-   return -1;
-   }
-   ret = ctdb_ctrl_setrecmode(ctdb, 
CONTROL_TIMEOUT(), CTDB_CURRENT_NODE, CTDB_RECOVERY_ACTIVE);
-   if (ret != 0) {
-   DEBUG(DEBUG_ERR,(__location__ " Failed 
to activate recovery mode due to public ip address mismatches\n"));
+   rd.pnn   = ctdb->pnn;
+   rd.srvid = 0;
+   data.dptr = (uint8_t *)&rd;
+   data.dsize = sizeof(rd);
 
-   talloc_free(mem_ctx);
-   return -1;
+   ret = ctdb_send_message(ctdb, rec->recmaster, 
CTDB_SRVID_TAKEOVER_RUN, data);
+   if (ret != 0) {
+   DEBUG(DEBUG_ERR,(__location__ " Failed 
to send ipreallocate to recmaster :%d\n", (int)rec->recmaster));
}
}
} else {
if (ctdb_sys_have_ip(&ips->ips[j].addr)) {
+   struct takeover_run_reply rd;
+   TDB_DATA data;
+
DEBUG(DEBUG_CRIT,("We are still serving a 
public address '%s' that we should not be serving.\n", 
ctdb_addr_to_str(&ips->ips[j].addr)));
 
-   ret = ctdb_ctrl_freeze_priority(ctdb, 
CONTROL_TIMEOUT(), CTDB_CURRENT_NODE, 1);
-   if (ret != 0) {
-   DEBUG(DEBUG_ERR,(__location__ " Failed 
to freeze node due to public ip address mismatches\n"));
+   rd.pnn   = ctdb->pnn;
+   rd.srvid = 0;
+   data.dptr = (uint8_t *)&rd;
+   data.dsize = sizeof(rd);
 
- 

[SCM] CTDB repository - branch master updated - ctdb-1.0.105-47-g821333a

[Ronnie Sahlberg]

The branch, master has been updated
   via  821333afb458358f90446062b0242790695e5060 (commit)
   via  e9b3477a5b9a2eff18f727e7d59338bfb5214793 (commit)
   via  a1f37fdc5217e57d2d643d77a811afca747685e0 (commit)
   via  16db4882635d84b8410a77e2ea8b08d0a257b0ab (commit)
   via  50c2caed57c0520f506eaaeeb0bba2c272da6ef6 (commit)
   via  937823cc73eb098230acff4b1583f6d01f26c21a (commit)
   via  0e6c06ac38fd82adf124d111717502055501974a (commit)
   via  c278c798d41a35f58ca81f8f0e08e4dab51eba9b (commit)
   via  28d0648725e7de4e4d0e8569e3fbfb0fa1d7f934 (commit)
   via  143f1fa3cc4588505e3992c601153ea08be8432d (commit)
   via  a1d654a982ca56fade82552f4e6b5586236d3233 (commit)
   via  d3e7407dc9854ec358d081777c5450ec68b17862 (commit)
   via  a2830594ebeb54eb51ff90999cb12370aeec6e8b (commit)
   via  517e9d9b188b18dffc712a8fecddb41540d27b8d (commit)
   via  5d97c07be13a8209a81dfc8f73e49371949e4dc3 (commit)
   via  3c93336ab92c2e4829ff4dc360045bfa6df21d50 (commit)
   via  1d24a3869fe89fc9a109fd9e9b69df5fc665a5f6 (commit)
   via  2e60749de3714239224cc04170a9a158153f (commit)
   via  66b22980b14601f29fe8cc64bd8f29883c7ca1c0 (commit)
   via  83b7b233cb4707e826f6ba260bd630c8bc8f1e76 (commit)
   via  a6d353519932eee48f9241ad8887b692882906c9 (commit)
   via  33fb0e7ba047ca73969b59bccf70a04a17c25a0a (commit)
   via  b0648c7f08eba87ec3c9714e2525c9b621bfb4ef (commit)
   via  6c79fa33e26cc4f0873577f8e122b1495b4c427e (commit)
   via  834c93b3e1b8f4151b8a2cd82c2dd8bacc17f66c (commit)
   via  8001488be4f2beb25e943fe01b2afc2e8779930d (commit)
   via  470822b329f9d3ca9bef518b56e9ce28d5fedda2 (commit)
   via  533c3e053293941d2a9484b495e78d45f478bb08 (commit)
   via  fe8027309c1f7b987cd368fa98f9b28741baa786 (commit)
   via  466beafadb37011fe273de8810ab0012e92a1fd8 (commit)
   via  e7d57d7ae678b24dab3364a348838c6a3398942c (commit)
   via  b90bdb07c1f6913ddbf11bde9684bdc8af61c549 (commit)
   via  20b15de068d042b292725945927ceda1b01d07c0 (commit)
   via  6804f880436645b52c09a78fa300377fa8058d0e (commit)
   via  defbe318152fc479e8076ad70433cdb4971951af (commit)
   via  c715746c2f40eb9b21dbf011d16f1f1b0b53fdf9 (commit)
   via  c5f798116bf3b7954e23c7267b056ee1f5560f45 (commit)
   via  35a60a63a9b5c7d98dde514ae552239506b691c9 (commit)
   via  f1e350f9edb74cc44b6c5be4c062fd93e98ba8c4 (commit)
   via  ac655b0a65b32d809d47fec9821f7f31bb2fe2a7 (commit)
   via  364e70b763f0ccd7714d15723ad3ea4d7e2968a1 (commit)
   via  1908bac812650ca25151051f5d86815e0b8ed319 (commit)
  from  12b187f971d857353403393a9850503e0e558672 (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -
commit 821333afb458358f90446062b0242790695e5060
Author: Ronnie Sahlberg 
Date:   Tue Dec 1 13:19:58 2009 +1100

When starting up ctdbd, wait until all initial recoveries have finished
and until we have gone through a full re-recovery timeout without triggering
any pending recoveries before we start up the services and start monitoring
the node.

commit e9b3477a5b9a2eff18f727e7d59338bfb5214793
Merge: 12b187f971d857353403393a9850503e0e558672 
a1f37fdc5217e57d2d643d77a811afca747685e0
Author: Ronnie Sahlberg 
Date:   Tue Dec 1 10:53:18 2009 +1100

Merge commit 'martins/status-test-2'

Conflicts:

server/eventscript.c

---

Summary of changes:
 config/ctdb.init  |2 +-
 config/events.d/00.ctdb   |8 +-
 config/events.d/01.reclock|   60 ++---
 config/events.d/10.interface  |   11 +-
 config/events.d/11.natgw  |   15 +-
 config/events.d/11.routing|6 +-
 config/events.d/20.multipathd |9 +-
 config/events.d/31.clamd  |   41 ++--
 config/events.d/40.vsftpd |   74 +++
 config/events.d/41.httpd  |   71 +++---
 config/events.d/50.samba  |  161 +++---
 config/events.d/60.nfs|   95 
 config/events.d/61.nfstickle  |   47 +---
 config/events.d/70.iscsi  |   30 +--
 config/events.d/91.lvs|   16 +--
 config/events.d/99.timeout|   15 +-
 config/functions  |  395 --
 config/statd-callout  |4 +-
 include/ctdb_private.h|   33 +++-
 server/ctdb_control.c |2 +-
 server/ctdb_monitor.c |   60 +-
 server/ctdb_recover.c |   25 +-
 server/ctdb_recoverd.c|2 +-
 server/ctdb_takeover.c|   17 +-
 server/ctdb_tunables.c|3 +-
 server/eventscript.c  |  484 +++--
 26 files changed, 889 insertions(+), 797 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/ctdb.init b/config/ctdb.init
index 67747fd..4bd570d 100755
--- a/config/ctdb.init
+++ b/config/ctdb.init
@@ -25

[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
   via  83c106e... s4-ldb: the '1' form of extended_dn search is easier to 
read
  from  a88f086... s4:setup Adjust upgradeprovision blackbox test now we 
don't have --targetdir

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 83c106e084876ee82c66a165a7b02c7702c752f4
Author: Andrew Tridgell 
Date:   Mon Nov 30 22:49:39 2009 +1100

s4-ldb: the '1' form of extended_dn search is easier to read

The '1' form gives GUIDs and SIDs in the ascii form as normally used
for display.

---

Summary of changes:
 source4/lib/ldb/tools/cmdline.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c
index 522bbed..e27ca5b 100644
--- a/source4/lib/ldb/tools/cmdline.c
+++ b/source4/lib/ldb/tools/cmdline.c
@@ -232,7 +232,7 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context 
*ldb,
}
break;
case 'E':
-   if (!add_control(ret, "extended_dn:1")) {
+   if (!add_control(ret, "extended_dn:1:1")) {
fprintf(stderr, __location__ ": out of 
memory\n");
goto failed;
}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
   via  a88f086... s4:setup Adjust upgradeprovision blackbox test now we 
don't have --targetdir
   via  1d0d78a... s4: Remove targetdir as it can cause some trouble and 
can be replaced by an adapted -s smb.conf
   via  fe12912... s4: Handle the case in secrets.ldb without name attribute
   via  4861ad5... s4: don't forget to update defaultSecurityDescriptor
   via  bf2c1e9... s4: load the domain level of the current provision and 
create a provision with the same domain level
   via  f653608... s4:ldap.py Add test of namingContext behaviour after 
tridge found a bug
   via  ce86fdf... s4:WHATSNEW Nadezhda's acl module handles modifies
  from  48f4079... Fix DEBUG 0 -> DEBUG 10 (left over code). Fix opendir 
status return if access denied. Jeremy.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit a88f086d96df01f974696f7fd76f68042e75a7d1
Author: Andrew Bartlett 
Date:   Tue Dec 1 09:04:21 2009 +1100

s4:setup Adjust upgradeprovision blackbox test now we don't have --targetdir

commit 1d0d78ab3d1f4210984a5a012cdb6d17862cec51
Author: Matthieu Patou 
Date:   Sun Nov 29 19:44:08 2009 +0300

s4: Remove targetdir as it can cause some trouble and can be replaced by an 
adapted -s smb.conf

Signed-off-by: Andrew Bartlett 

commit fe1291227f0a3137938dc369afc2f63626c30359
Author: Matthieu Patou 
Date:   Sun Nov 29 16:26:31 2009 +0300

s4: Handle the case in secrets.ldb without name attribute

Signed-off-by: Andrew Bartlett 

commit 4861ad57fb533dbb060faa0a0630f8d8afe87421
Author: Matthieu Patou 
Date:   Sun Nov 29 02:28:26 2009 +0300

s4: don't forget to update defaultSecurityDescriptor

Signed-off-by: Andrew Bartlett 

commit bf2c1e9c4f6fa7d1ea778f54593c308b56efacd2
Author: Matthieu Patou 
Date:   Fri Nov 27 20:50:04 2009 +0300

s4: load the domain level of the current provision and create a provision 
with the same domain level

Signed-off-by: Andrew Bartlett 

commit f65360840a43616d870b0f26925067f248aa6376
Author: Andrew Bartlett 
Date:   Mon Nov 30 18:39:58 2009 +1100

s4:ldap.py Add test of namingContext behaviour after tridge found a bug

Tridge found that the partitions.c module was being initialised twice,
and setting the partitions into the rootDSE twice.

Andrew Bartlett

commit ce86fdfed9f7b9b5012f02210aaa1c5bf6ffcdf1
Author: Andrew Bartlett 
Date:   Mon Nov 30 14:46:03 2009 +1100

s4:WHATSNEW Nadezhda's acl module handles modifies

---

Summary of changes:
 WHATSNEW4.txt|4 +-
 source4/lib/ldb/tests/python/ldap.py |   15 +++
 source4/scripting/bin/upgradeprovision   |   49 -
 source4/scripting/python/samba/provision.py  |2 +-
 source4/setup/tests/blackbox_upgradeprovision.sh |4 +-
 5 files changed, 57 insertions(+), 17 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW4.txt b/WHATSNEW4.txt
index 1c9d1e4..4513f22 100644
--- a/WHATSNEW4.txt
+++ b/WHATSNEW4.txt
@@ -80,8 +80,8 @@ continued to evolve, but you may particularly notice these 
areas
 
  Access Control Lists (in nTSecurityDescriptor) are now set correctly
  on objects in the directory, based on the same rules as Windows 2008.
- (Searches and modifications still use a simplistic administrator/not
- administrator criteria)
+ (Searches and still use a simplistic administrator/not administrator
+ criteria)
 
 These are just some of the user-visible highlights of the work done in
 the past few months.  More details of the work done 'under the hood'
diff --git a/source4/lib/ldb/tests/python/ldap.py 
b/source4/lib/ldb/tests/python/ldap.py
index 0292422..384e69e 100755
--- a/source4/lib/ldb/tests/python/ldap.py
+++ b/source4/lib/ldb/tests/python/ldap.py
@@ -1923,6 +1923,21 @@ class BaseDnTests(unittest.TestCase):
 attrs=["netlogon", "highestCommittedUSN"])
 self.assertEquals(len(res), 0)
 
+def test_namingContexts(self):
+"""Testing for namingContexts in rootDSE"""
+res = self.ldb.search("", scope=SCOPE_BASE,
+attrs=["namingContexts", "defaultNamingContext", 
"schemaNamingContext", "configurationNamingContext"])
+self.assertEquals(len(res), 1)
+
+ncs = set([])
+for nc in res[0]["namingContexts"]:
+self.assertTrue(nc not in ncs)
+ncs.add(nc)
+
+self.assertTrue(res[0]["defaultNamingContext"][0] in ncs)
+self.assertTrue(res[0]["configurationNamingContext"][0] in ncs)
+self.assertTrue(res[0]["schemaNamingContext"][0] in ncs)
+
 class SchemaTests(unittest.TestCase):
 def delete_force(self, ldb, dn):
 try:
diff --git a/source4/scripting/bin/upgradeprovision 
b/source4/scripting/bin/upgradeprovision

[SCM] Samba Shared Repository - branch v3-5-test updated

[Jeremy Allison]

The branch, v3-5-test has been updated
   via  8e77a75... Fix DEBUG 0 -> DEBUG 10 (left over code). Fix opendir 
status return if access denied. Jeremy. (cherry picked from commit 
48f40793ae4190ebc9eec83924aeda9e3f16bf0d)
  from  70c4293... Fix bug 6938 : No hook exists to check creation rights 
when using acl_xattr module Fix ACL modules to test for permissions on 
open/mkdir/opendir. Ensure that underlying ACLs are returned for 
directories/files with no Windows xattr or tdb acls stored. Jeremy. (cherry 
picked from commit bdc8c9d37ca478f74127628ab03bb68cd72bff63)

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


- Log -
commit 8e77a754190dfdece3b4786eaee97eab96a97c1e
Author: Jeremy Allison 
Date:   Mon Nov 30 16:56:35 2009 -0800

Fix DEBUG 0 -> DEBUG 10 (left over code).
Fix opendir status return if access denied.
Jeremy.
(cherry picked from commit 48f40793ae4190ebc9eec83924aeda9e3f16bf0d)

---

Summary of changes:
 source3/modules/vfs_acl_common.c |6 --
 1 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 0919dcc..116211c 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -512,7 +512,7 @@ static NTSTATUS check_parent_acl_common(vfs_handle_struct 
*handle,
 DACL_SECURITY_INFORMATION),
&parent_desc);
if (!NT_STATUS_IS_OK(status)) {
-   DEBUG(0,("check_parent_acl_common: SMB_VFS_GET_NT_ACL "
+   DEBUG(10,("check_parent_acl_common: SMB_VFS_GET_NT_ACL "
"on directory %s for "
"path %s returned %s\n",
parent_name,
@@ -525,7 +525,7 @@ static NTSTATUS check_parent_acl_common(vfs_handle_struct 
*handle,
access_mask,
&access_granted);
if(!NT_STATUS_IS_OK(status)) {
-   DEBUG(0,("check_parent_acl_common: access check "
+   DEBUG(10,("check_parent_acl_common: access check "
"on directory %s for "
"path %s for mask 0x%x returned %s\n",
parent_name,
@@ -783,6 +783,8 @@ static SMB_STRUCT_DIR *opendir_acl_common(vfs_handle_struct 
*handle,
NTSTATUS status = check_parent_acl_common(handle, fname, SEC_DIR_LIST);
 
if (!NT_STATUS_IS_OK(status)) {
+   errno = map_errno_from_nt_status(status);
+   return NULL;
}
return SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
 }


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
   via  48f4079... Fix DEBUG 0 -> DEBUG 10 (left over code). Fix opendir 
status return if access denied. Jeremy.
  from  bdc8c9d... Fix bug 6938 : No hook exists to check creation rights 
when using acl_xattr module Fix ACL modules to test for permissions on 
open/mkdir/opendir. Ensure that underlying ACLs are returned for 
directories/files with no Windows xattr or tdb acls stored. Jeremy.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 48f40793ae4190ebc9eec83924aeda9e3f16bf0d
Author: Jeremy Allison 
Date:   Mon Nov 30 16:56:35 2009 -0800

Fix DEBUG 0 -> DEBUG 10 (left over code).
Fix opendir status return if access denied.
Jeremy.

---

Summary of changes:
 source3/modules/vfs_acl_common.c |6 --
 1 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 0919dcc..116211c 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -512,7 +512,7 @@ static NTSTATUS check_parent_acl_common(vfs_handle_struct 
*handle,
 DACL_SECURITY_INFORMATION),
&parent_desc);
if (!NT_STATUS_IS_OK(status)) {
-   DEBUG(0,("check_parent_acl_common: SMB_VFS_GET_NT_ACL "
+   DEBUG(10,("check_parent_acl_common: SMB_VFS_GET_NT_ACL "
"on directory %s for "
"path %s returned %s\n",
parent_name,
@@ -525,7 +525,7 @@ static NTSTATUS check_parent_acl_common(vfs_handle_struct 
*handle,
access_mask,
&access_granted);
if(!NT_STATUS_IS_OK(status)) {
-   DEBUG(0,("check_parent_acl_common: access check "
+   DEBUG(10,("check_parent_acl_common: access check "
"on directory %s for "
"path %s for mask 0x%x returned %s\n",
parent_name,
@@ -783,6 +783,8 @@ static SMB_STRUCT_DIR *opendir_acl_common(vfs_handle_struct 
*handle,
NTSTATUS status = check_parent_acl_common(handle, fname, SEC_DIR_LIST);
 
if (!NT_STATUS_IS_OK(status)) {
+   errno = map_errno_from_nt_status(status);
+   return NULL;
}
return SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
 }


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-5-test updated

[Jeremy Allison]

The branch, v3-5-test has been updated
   via  70c4293... Fix bug 6938 : No hook exists to check creation rights 
when using acl_xattr module Fix ACL modules to test for permissions on 
open/mkdir/opendir. Ensure that underlying ACLs are returned for 
directories/files with no Windows xattr or tdb acls stored. Jeremy. (cherry 
picked from commit bdc8c9d37ca478f74127628ab03bb68cd72bff63)
  from  d3339cd... drsuapi: fix build warning of NDR size calculation of 
drsuapi_DsReplicaObjectIdentifier3Binary.

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


- Log -
commit 70c4293644b623e031dc4e086c52c929faab00a9
Author: Jeremy Allison 
Date:   Mon Nov 30 16:50:34 2009 -0800

Fix bug 6938 : No hook exists to check creation rights when using acl_xattr 
module
Fix ACL modules to test for permissions on open/mkdir/opendir.
Ensure that underlying ACLs are returned for directories/files with
no Windows xattr or tdb acls stored.
Jeremy.
(cherry picked from commit bdc8c9d37ca478f74127628ab03bb68cd72bff63)

---

Summary of changes:
 source3/modules/vfs_acl_common.c |  109 +++---
 source3/modules/vfs_acl_tdb.c|1 +
 source3/modules/vfs_acl_xattr.c  |1 +
 3 files changed, 104 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 0bb0bca..0919dcc 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -186,6 +186,20 @@ static NTSTATUS get_nt_acl_internal(vfs_handle_struct 
*handle,
status = get_acl_blob(talloc_tos(), handle, fsp, name, &blob);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("get_acl_blob returned %s\n", nt_errstr(status)));
+   if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
+   /* Pull the ACL from the underlying system. */
+   if (fsp) {
+   status = SMB_VFS_NEXT_FGET_NT_ACL(handle,
+   fsp,
+   security_info,
+   ppdesc);
+   } else {
+   status = SMB_VFS_NEXT_GET_NT_ACL(handle,
+   name,
+   security_info,
+   ppdesc);
+   }
+   }
return status;
}
 
@@ -478,6 +492,51 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle,
}
 }
 
+static NTSTATUS check_parent_acl_common(vfs_handle_struct *handle,
+   const char *path,
+   uint32_t access_mask)
+{
+   char *parent_name = NULL;
+   struct security_descriptor *parent_desc = NULL;
+   uint32_t access_granted = 0;
+   NTSTATUS status;
+
+   if (!parent_dirname(talloc_tos(), path, &parent_name, NULL)) {
+   return NT_STATUS_NO_MEMORY;
+   }
+
+   status = SMB_VFS_GET_NT_ACL(handle->conn,
+   parent_name,
+   (OWNER_SECURITY_INFORMATION |
+GROUP_SECURITY_INFORMATION |
+DACL_SECURITY_INFORMATION),
+   &parent_desc);
+   if (!NT_STATUS_IS_OK(status)) {
+   DEBUG(0,("check_parent_acl_common: SMB_VFS_GET_NT_ACL "
+   "on directory %s for "
+   "path %s returned %s\n",
+   parent_name,
+   path,
+   nt_errstr(status) ));
+   return status;
+   }
+   status = smb1_file_se_access_check(parent_desc,
+   handle->conn->server_info->ptok,
+   access_mask,
+   &access_granted);
+   if(!NT_STATUS_IS_OK(status)) {
+   DEBUG(0,("check_parent_acl_common: access check "
+   "on directory %s for "
+   "path %s for mask 0x%x returned %s\n",
+   parent_name,
+   path,
+   access_mask,
+   nt_errstr(status) ));
+   return status;
+   }
+   return NT_STATUS_OK;
+}
+
 /*
  Check ACL on open. For new files inherit from parent directory.
 */
@@ -504,8 +563,7 @@

[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
   via  bdc8c9d... Fix bug 6938 : No hook exists to check creation rights 
when using acl_xattr module Fix ACL modules to test for permissions on 
open/mkdir/opendir. Ensure that underlying ACLs are returned for 
directories/files with no Windows xattr or tdb acls stored. Jeremy.
  from  ea20678... s3-build: taise tdb version when building against system 
libtdb library.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit bdc8c9d37ca478f74127628ab03bb68cd72bff63
Author: Jeremy Allison 
Date:   Mon Nov 30 16:50:34 2009 -0800

Fix bug 6938 : No hook exists to check creation rights when using acl_xattr 
module
Fix ACL modules to test for permissions on open/mkdir/opendir.
Ensure that underlying ACLs are returned for directories/files with
no Windows xattr or tdb acls stored.
Jeremy.

---

Summary of changes:
 source3/modules/vfs_acl_common.c |  109 +++---
 source3/modules/vfs_acl_tdb.c|1 +
 source3/modules/vfs_acl_xattr.c  |1 +
 3 files changed, 104 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 0bb0bca..0919dcc 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -186,6 +186,20 @@ static NTSTATUS get_nt_acl_internal(vfs_handle_struct 
*handle,
status = get_acl_blob(talloc_tos(), handle, fsp, name, &blob);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("get_acl_blob returned %s\n", nt_errstr(status)));
+   if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
+   /* Pull the ACL from the underlying system. */
+   if (fsp) {
+   status = SMB_VFS_NEXT_FGET_NT_ACL(handle,
+   fsp,
+   security_info,
+   ppdesc);
+   } else {
+   status = SMB_VFS_NEXT_GET_NT_ACL(handle,
+   name,
+   security_info,
+   ppdesc);
+   }
+   }
return status;
}
 
@@ -478,6 +492,51 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle,
}
 }
 
+static NTSTATUS check_parent_acl_common(vfs_handle_struct *handle,
+   const char *path,
+   uint32_t access_mask)
+{
+   char *parent_name = NULL;
+   struct security_descriptor *parent_desc = NULL;
+   uint32_t access_granted = 0;
+   NTSTATUS status;
+
+   if (!parent_dirname(talloc_tos(), path, &parent_name, NULL)) {
+   return NT_STATUS_NO_MEMORY;
+   }
+
+   status = SMB_VFS_GET_NT_ACL(handle->conn,
+   parent_name,
+   (OWNER_SECURITY_INFORMATION |
+GROUP_SECURITY_INFORMATION |
+DACL_SECURITY_INFORMATION),
+   &parent_desc);
+   if (!NT_STATUS_IS_OK(status)) {
+   DEBUG(0,("check_parent_acl_common: SMB_VFS_GET_NT_ACL "
+   "on directory %s for "
+   "path %s returned %s\n",
+   parent_name,
+   path,
+   nt_errstr(status) ));
+   return status;
+   }
+   status = smb1_file_se_access_check(parent_desc,
+   handle->conn->server_info->ptok,
+   access_mask,
+   &access_granted);
+   if(!NT_STATUS_IS_OK(status)) {
+   DEBUG(0,("check_parent_acl_common: access check "
+   "on directory %s for "
+   "path %s for mask 0x%x returned %s\n",
+   parent_name,
+   path,
+   access_mask,
+   nt_errstr(status) ));
+   return status;
+   }
+   return NT_STATUS_OK;
+}
+
 /*
  Check ACL on open. For new files inherit from parent directory.
 */
@@ -504,8 +563,7 @@ static int open_acl_common(vfs_handle_struct *handle,
status = get_full_smb_filename(talloc_tos(), smb_fname,
   &fname);
 

[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
   via  ea20678... s3-build: taise tdb version when building against system 
libtdb library.
  from  6dd6000... s3:add split_tokens, a cmdline tool to test 
next_token_talloc()

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit ea20678c55fee9f4586630cdb5fe7f35457d309a
Author: Günther Deschner 
Date:   Tue Dec 1 01:22:44 2009 +0100

s3-build: taise tdb version when building against system libtdb library.

Try to fix the build on "buildsamba02". At least fixes the build on fedora12
with libtdb-devel-1.1.5-2.fc12.x86_64 installed.

Volker, please check.

Guenther

---

Summary of changes:
 source3/configure.in |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 80952b5..01dcd9f 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -4891,7 +4891,7 @@ AC_ARG_ENABLE(external_libtdb,
 
 if test "x$enable_external_libtdb" != xno
 then
-   PKG_CHECK_MODULES(LIBTDB, tdb >= 1.1.4,
+   PKG_CHECK_MODULES(LIBTDB, tdb >= 1.2.0,
[ enable_external_libtdb=yes ],
[
if test x$enable_external_libtdb = xyes; then


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-5-test updated

[Günther Deschner]

The branch, v3-5-test has been updated
   via  d3339cd... drsuapi: fix build warning of NDR size calculation of 
drsuapi_DsReplicaObjectIdentifier3Binary.
   via  f5b1366... s3-spoolss: fix fstrings in convert_devicemode() 
function.
  from  756b503... Restructure the connect function code to always call 
down to NEXT-> before initializing. This allows us to do cleanup (by calling 
DISCONNECT) if initialization fails. Also fix vfs_acl_xattr which was failing 
to call the NEXT connect function. Jeremy. (cherry picked from commit 
8303bc49a45d5bab0cdbd4f2d793088f600f715f)

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


- Log -
commit d3339cd0c6ffa490513cc4562d2c06c218c7967e
Author: Günther Deschner 
Date:   Tue Dec 1 00:24:16 2009 +0100

drsuapi: fix build warning of NDR size calculation of 
drsuapi_DsReplicaObjectIdentifier3Binary.

The generated size actually does not include the size of the binary itself.

Guenther

commit f5b13667385bbdaa0f75dd46864ad952f7a9bbfe
Author: Günther Deschner 
Date:   Mon Nov 30 18:10:59 2009 +0100

s3-spoolss: fix fstrings in convert_devicemode() function.

Guenther
(cherry picked from commit 753b9c6d566fafee9724a84fbd91316767c1c7a2)

---

Summary of changes:
 librpc/gen_ndr/drsuapi.h|4 ++--
 librpc/gen_ndr/ndr_drsuapi.c|9 ++---
 librpc/gen_ndr/ndr_drsuapi.h|1 -
 librpc/idl/drsuapi.idl  |4 ++--
 librpc/ndr/ndr_drsuapi.c|6 ++
 librpc/ndr/ndr_drsuapi.h|2 ++
 source3/rpc_server/srv_spoolss_nt.c |7 +--
 7 files changed, 19 insertions(+), 14 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/drsuapi.h b/librpc/gen_ndr/drsuapi.h
index 52b6ee9..116ded4 100644
--- a/librpc/gen_ndr/drsuapi.h
+++ b/librpc/gen_ndr/drsuapi.h
@@ -517,7 +517,7 @@ struct drsuapi_DsReplicaObjectIdentifier3 {
 }/* [gensize,public] */;
 
 struct drsuapi_DsReplicaObjectIdentifier3Binary {
-   uint32_t __ndr_size;/* 
[value(ndr_size_drsuapi_DsReplicaObjectIdentifier3(r,ndr->iconv_convenience,ndr->flags))]
 */
+   uint32_t __ndr_size;/* 
[value(ndr_size_drsuapi_DsReplicaObjectIdentifier3Binary_without_Binary(r,ndr->iconv_convenience,ndr->flags))]
 */
uint32_t __ndr_size_sid;/* [value(ndr_size_dom_sid28(&sid,ndr->flags))] 
*/
struct GUID guid;
struct dom_sid28 sid;
@@ -525,7 +525,7 @@ struct drsuapi_DsReplicaObjectIdentifier3Binary {
const char *dn;/* [charset(UTF16)] */
uint32_t __ndr_size_binary;/* [value(binary.length+4)] */
DATA_BLOB binary;/* [flag(LIBNDR_FLAG_REMAINING)] */
-}/* [gensize,public] */;
+}/* [public] */;
 
 struct drsuapi_DsReplicaAttribute {
enum drsuapi_DsAttributeId attid;
diff --git a/librpc/gen_ndr/ndr_drsuapi.c b/librpc/gen_ndr/ndr_drsuapi.c
index 700306c..6777acc 100644
--- a/librpc/gen_ndr/ndr_drsuapi.c
+++ b/librpc/gen_ndr/ndr_drsuapi.c
@@ -2176,7 +2176,7 @@ _PUBLIC_ enum ndr_err_code 
ndr_push_drsuapi_DsReplicaObjectIdentifier3Binary(str
 {
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
-   NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 
ndr_size_drsuapi_DsReplicaObjectIdentifier3(r, ndr->iconv_convenience, 
ndr->flags)));
+   NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 
ndr_size_drsuapi_DsReplicaObjectIdentifier3Binary_without_Binary(r, 
ndr->iconv_convenience, ndr->flags)));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 
ndr_size_dom_sid28(&r->sid, ndr->flags)));
NDR_CHECK(ndr_push_GUID(ndr, NDR_SCALARS, &r->guid));
NDR_CHECK(ndr_push_dom_sid28(ndr, NDR_SCALARS, &r->sid));
@@ -2226,7 +2226,7 @@ _PUBLIC_ void 
ndr_print_drsuapi_DsReplicaObjectIdentifier3Binary(struct ndr_prin
 {
ndr_print_struct(ndr, name, "drsuapi_DsReplicaObjectIdentifier3Binary");
ndr->depth++;
-   ndr_print_uint32(ndr, "__ndr_size", (ndr->flags & 
LIBNDR_PRINT_SET_VALUES)?ndr_size_drsuapi_DsReplicaObjectIdentifier3(r, 
ndr->iconv_convenience, ndr->flags):r->__ndr_size);
+   ndr_print_uint32(ndr, "__ndr_size", (ndr->flags & 
LIBNDR_PRINT_SET_VALUES)?ndr_size_drsuapi_DsReplicaObjectIdentifier3Binary_without_Binary(r,
 ndr->iconv_convenience, ndr->flags):r->__ndr_size);
ndr_print_uint32(ndr, "__ndr_size_sid", (ndr->flags & 
LIBNDR_PRINT_SET_VALUES)?ndr_size_dom_sid28(&r->sid, 
ndr->flags):r->__ndr_size_sid);
ndr_print_GUID(ndr, "guid", &r->guid);
ndr_print_dom_sid28(ndr, "sid", &r->sid);
@@ -2237,11 +2237,6 @@ _PUBLIC_ void 
ndr_print_drsuapi_DsReplicaObjectIdentifier3Binary(struct ndr_prin
ndr->depth--;
 }
 
-_PUBLIC_ size_t ndr_size_drsuapi_DsReplicaObjectIdentifier3Binary(const struct 
drsuapi_DsReplicaObjectIdentifier3Binary *r, struct smb_iconv_convenience *ic, 
in

[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
   via  6dd6000... s3:add split_tokens, a cmdline tool to test 
next_token_talloc()
   via  92547d2... s3:fix linking of the t_str* test programs
   via  b82f685... s3:fix linking of libbigballofmud (on my box at least)
   via  350352c... s3:torture: make t_stringoverflow.c compile at least 
(pstring is long gone)
  from  8303bc4... Restructure the connect function code to always call 
down to NEXT-> before initializing. This allows us to do cleanup (by calling 
DISCONNECT) if initialization fails. Also fix vfs_acl_xattr which was failing 
to call the NEXT connect function. Jeremy.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 6dd60008c4bebf42795d4a030b3724ce610bbeeb
Author: Michael Adam 
Date:   Tue Dec 1 00:53:03 2009 +0100

s3:add split_tokens, a cmdline tool to test next_token_talloc()

Michael

commit 92547d2873b357b3d6ea21edff646a66f1d22368
Author: Michael Adam 
Date:   Fri Nov 20 18:25:27 2009 +0100

s3:fix linking of the t_str* test programs

Michael

commit b82f6855a2762df6240caf100fe775aa06392c40
Author: Michael Adam 
Date:   Fri Nov 20 18:24:53 2009 +0100

s3:fix linking of libbigballofmud (on my box at least)

Michael

commit 350352cf38bccfa6ef60db1840bd09a4798a392e
Author: Michael Adam 
Date:   Fri Nov 20 17:48:18 2009 +0100

s3:torture: make t_stringoverflow.c compile at least (pstring is long gone)

I don't know whether these t_* programs are used at all any more, but this
one was using pstrcpy...

Michael

---

Summary of changes:
 source3/Makefile.in|   28 ++---
 source3/torture/t_stringoverflow.c |4 +-
 source3/utils/split_tokens.c   |   78 
 3 files changed, 101 insertions(+), 9 deletions(-)
 create mode 100644 source3/utils/split_tokens.c


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 29a5b3d..b1f1658 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1344,6 +1344,12 @@ DBWRAP_TORTURE_OBJ = utils/dbwrap_torture.o \
 $(LIBSAMBA_OBJ) \
 $(POPT_LIB_OBJ)
 
+SPLIT_TOKENS_OBJ = utils/split_tokens.o \
+   $(PARAM_OBJ) \
+  $(LIB_NONSMBD_OBJ) \
+  $(POPT_LIB_OBJ) \
+  $(LIBSAMBA_OBJ)
+
 ##
 # now the rules...
 ##
@@ -2419,11 +2425,11 @@ showlibs:: showlibsmbsharemodes
 #---
 
 # This is probably wrong for anything other than the GNU linker.
-bin/libbigballofm...@shlibext@: $(BINARY_PREREQS) $(LIBBIGBALLOFMUD_OBJ) 
$(LIBTALLOC)
+bin/libbigballofm...@shlibext@: $(BINARY_PREREQS) $(LIBBIGBALLOFMUD_OBJ) 
$(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
@echo Linking shared library $@
@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_OBJ) \
-   $(LIBS) $(LIBTALLOC_LIBS) \
-   $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
+   $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) \
+   $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS) -lz \
@sonamef...@`basename $...@`.$(LIBBIGBALLOFMUD_MAJOR)
ln -snf libbigballofmud.so bin/libbigballofmud.so.0
 
@@ -2875,19 +2881,19 @@ bin/tdbtort...@exeext@: $(BINARY_PREREQS) 
$(TDBTORTURE_OBJ) $(LIBTALLOC) $(LIBTD
 
 bin/t_str...@exeext@: $(BINARY_PREREQS) $(LIBTALLOC) 
bin/libbigballofm...@shlibext@ torture/t_strcmp.o
$(CC) -o $@ $(DYNEXP) $(LIBS) $(LIBTALLOC_LIBS) \
-   torture/t_strcmp.o -L ./bin -lbigballofmud
+   torture/t_strcmp.o -L ./bin -lbigballofmud $(LIBWBCLIENT_LIBS)
 
 bin/t_str...@exeext@: $(BINARY_PREREQS) $(LIBTALLOC) 
bin/libbigballofm...@shlibext@ torture/t_strstr.o
$(CC) -o $@ $(DYNEXP) $(LIBS) $(LIBTALLOC_LIBS) \
-   torture/t_strstr.o -L ./bin -lbigballofmud
+   torture/t_strstr.o -L ./bin -lbigballofmud $(LIBWBCLIENT_LIBS)
 
 bin/t_strapp...@exeext@: $(BINARY_PREREQS) $(LIBTALLOC) 
bin/libbigballofm...@shlibext@ torture/t_strappend.o
$(CC) -o $@ $(DYNEXP) $(LIBS) $(LIBTALLOC_LIBS) \
-   torture/t_strappend.o -L ./bin -lbigballofmud
+   torture/t_strappend.o -L ./bin -lbigballofmud 
$(LIBWBCLIENT_LIBS)
 
 bin/t_stringoverf...@exeext@: $(BINARY_PREREQS) bin/libbigballofm...@shlibext@ 
torture/t_stringoverflow.o
$(CC) -o $@ $(DYNEXP) torture/t_stringoverflow.o \
-   -L./bin -lbigballofmud
+   -L./bin -lbigballofmud $(LIBWBCLIENT_LIBS)
 
 bin/timeli...@exeext@: script/tests/timelimit.o
@echo Linking $@
@@ -2927,6 +2933,14 

[SCM] Samba Shared Repository - branch v3-5-test updated

[Jeremy Allison]

The branch, v3-5-test has been updated
   via  756b503... Restructure the connect function code to always call 
down to NEXT-> before initializing. This allows us to do cleanup (by calling 
DISCONNECT) if initialization fails. Also fix vfs_acl_xattr which was failing 
to call the NEXT connect function. Jeremy. (cherry picked from commit 
8303bc49a45d5bab0cdbd4f2d793088f600f715f)
  from  c0282f8... Fix bug 6546: Avoid accessing buf[-1] if NUL byte comes 
from fgets

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


- Log -
commit 756b5032032c58815a227fdfd27140373d8ebc8c
Author: Jeremy Allison 
Date:   Mon Nov 30 15:53:04 2009 -0800

Restructure the connect function code to always call
down to NEXT-> before initializing. This allows us to
do cleanup (by calling DISCONNECT) if initialization
fails. Also fix vfs_acl_xattr which was failing to
call the NEXT connect function.
Jeremy.
(cherry picked from commit 8303bc49a45d5bab0cdbd4f2d793088f600f715f)

---

Summary of changes:
 source3/modules/vfs_acl_tdb.c  |9 -
 source3/modules/vfs_acl_xattr.c|6 ++
 source3/modules/vfs_afsacl.c   |   11 ---
 source3/modules/vfs_audit.c|   11 +++
 source3/modules/vfs_cacheprime.c   |9 -
 source3/modules/vfs_commit.c   |8 +++-
 source3/modules/vfs_extd_audit.c   |   10 ++
 source3/modules/vfs_fileid.c   |9 -
 source3/modules/vfs_full_audit.c   |   10 +-
 source3/modules/vfs_onefs.c|9 +++--
 source3/modules/vfs_prealloc.c |   10 --
 source3/modules/vfs_readahead.c|   11 +--
 source3/modules/vfs_readonly.c |9 +++--
 source3/modules/vfs_recycle.c  |8 +++-
 source3/modules/vfs_smb_traffic_analyzer.c |   10 +-
 source3/modules/vfs_tsmsm.c|   14 +++---
 16 files changed, 117 insertions(+), 37 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c
index db3881e..e9d0f90 100644
--- a/source3/modules/vfs_acl_tdb.c
+++ b/source3/modules/vfs_acl_tdb.c
@@ -367,12 +367,11 @@ static int connect_acl_tdb(struct vfs_handle_struct 
*handle,
const char *user)
 {
struct db_context *db;
-   int res;
+   int ret = SMB_VFS_NEXT_CONNECT(handle, service, user);
 
-res = SMB_VFS_NEXT_CONNECT(handle, service, user);
-if (res < 0) {
-return res;
-}
+   if (ret < 0) {
+   return ret;
+   }
 
if (!acl_tdb_init(&db)) {
SMB_VFS_NEXT_DISCONNECT(handle);
diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c
index 962d1b7..5e51a68 100644
--- a/source3/modules/vfs_acl_xattr.c
+++ b/source3/modules/vfs_acl_xattr.c
@@ -212,6 +212,12 @@ static int connect_acl_xattr(struct vfs_handle_struct 
*handle,
const char *service,
const char *user)
 {
+   int ret = SMB_VFS_NEXT_CONNECT(handle, service, user);
+
+   if (ret < 0) {
+   return ret;
+   }
+
/* Ensure we have "inherit acls = yes" if we're
 * using this module. */
DEBUG(2,("connect_acl_xattr: setting 'inherit acls = true' "
diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c
index 4666be2..82c1799 100644
--- a/source3/modules/vfs_afsacl.c
+++ b/source3/modules/vfs_afsacl.c
@@ -1065,14 +1065,19 @@ static int afsacl_connect(vfs_handle_struct *handle,
  const char *service, 
  const char *user)
 {
-   const char *spc;
+   const char *spc;
+   int ret = SMB_VFS_NEXT_CONNECT(handle, service, user);
+
+   if (ret < 0) {
+   return ret;
+   }
 
spc = lp_parm_const_string(SNUM(handle->conn), "afsacl", "space", "%");
 
if (spc != NULL)
space_replacement = spc[0];
-   
-   return SMB_VFS_NEXT_CONNECT(handle, service, user);
+
+   return 0;
 }
 
 static struct vfs_fn_pointers vfs_afsacl_fns = {
diff --git a/source3/modules/vfs_audit.c b/source3/modules/vfs_audit.c
index 258246e..d256c2f 100644
--- a/source3/modules/vfs_audit.c
+++ b/source3/modules/vfs_audit.c
@@ -78,15 +78,18 @@ static int audit_syslog_priority(vfs_handle_struct *handle)
 static int audit_connect(vfs_handle_struct *handle, const char *svc, const 
char *user)
 {
int result;
-   
+
+   result = SMB_VFS_NEXT_CONNECT(handle, svc, user);
+   if (result < 0) {
+   return result;
+   }
+
openlog("smbd_audit", LOG_PID, audit_syslog_facility(han

[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
   via  8303bc4... Restructure the connect function code to always call 
down to NEXT-> before initializing. This allows us to do cleanup (by calling 
DISCONNECT) if initialization fails. Also fix vfs_acl_xattr which was failing 
to call the NEXT connect function. Jeremy.
  from  b852a34... drsuapi: fix build warning of NDR size calculation of 
drsuapi_DsReplicaObjectIdentifier3Binary.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 8303bc49a45d5bab0cdbd4f2d793088f600f715f
Author: Jeremy Allison 
Date:   Mon Nov 30 15:53:04 2009 -0800

Restructure the connect function code to always call
down to NEXT-> before initializing. This allows us to
do cleanup (by calling DISCONNECT) if initialization
fails. Also fix vfs_acl_xattr which was failing to
call the NEXT connect function.
Jeremy.

---

Summary of changes:
 source3/modules/vfs_acl_tdb.c  |9 -
 source3/modules/vfs_acl_xattr.c|6 ++
 source3/modules/vfs_afsacl.c   |   11 ---
 source3/modules/vfs_audit.c|   11 +++
 source3/modules/vfs_cacheprime.c   |9 -
 source3/modules/vfs_commit.c   |8 +++-
 source3/modules/vfs_extd_audit.c   |   10 ++
 source3/modules/vfs_fileid.c   |9 -
 source3/modules/vfs_full_audit.c   |   10 +-
 source3/modules/vfs_onefs.c|9 +++--
 source3/modules/vfs_prealloc.c |   10 --
 source3/modules/vfs_readahead.c|   11 +--
 source3/modules/vfs_readonly.c |9 +++--
 source3/modules/vfs_recycle.c  |8 +++-
 source3/modules/vfs_smb_traffic_analyzer.c |   10 +-
 source3/modules/vfs_tsmsm.c|   14 +++---
 16 files changed, 117 insertions(+), 37 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c
index db3881e..e9d0f90 100644
--- a/source3/modules/vfs_acl_tdb.c
+++ b/source3/modules/vfs_acl_tdb.c
@@ -367,12 +367,11 @@ static int connect_acl_tdb(struct vfs_handle_struct 
*handle,
const char *user)
 {
struct db_context *db;
-   int res;
+   int ret = SMB_VFS_NEXT_CONNECT(handle, service, user);
 
-res = SMB_VFS_NEXT_CONNECT(handle, service, user);
-if (res < 0) {
-return res;
-}
+   if (ret < 0) {
+   return ret;
+   }
 
if (!acl_tdb_init(&db)) {
SMB_VFS_NEXT_DISCONNECT(handle);
diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c
index 962d1b7..5e51a68 100644
--- a/source3/modules/vfs_acl_xattr.c
+++ b/source3/modules/vfs_acl_xattr.c
@@ -212,6 +212,12 @@ static int connect_acl_xattr(struct vfs_handle_struct 
*handle,
const char *service,
const char *user)
 {
+   int ret = SMB_VFS_NEXT_CONNECT(handle, service, user);
+
+   if (ret < 0) {
+   return ret;
+   }
+
/* Ensure we have "inherit acls = yes" if we're
 * using this module. */
DEBUG(2,("connect_acl_xattr: setting 'inherit acls = true' "
diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c
index 4666be2..82c1799 100644
--- a/source3/modules/vfs_afsacl.c
+++ b/source3/modules/vfs_afsacl.c
@@ -1065,14 +1065,19 @@ static int afsacl_connect(vfs_handle_struct *handle,
  const char *service, 
  const char *user)
 {
-   const char *spc;
+   const char *spc;
+   int ret = SMB_VFS_NEXT_CONNECT(handle, service, user);
+
+   if (ret < 0) {
+   return ret;
+   }
 
spc = lp_parm_const_string(SNUM(handle->conn), "afsacl", "space", "%");
 
if (spc != NULL)
space_replacement = spc[0];
-   
-   return SMB_VFS_NEXT_CONNECT(handle, service, user);
+
+   return 0;
 }
 
 static struct vfs_fn_pointers vfs_afsacl_fns = {
diff --git a/source3/modules/vfs_audit.c b/source3/modules/vfs_audit.c
index 258246e..d256c2f 100644
--- a/source3/modules/vfs_audit.c
+++ b/source3/modules/vfs_audit.c
@@ -78,15 +78,18 @@ static int audit_syslog_priority(vfs_handle_struct *handle)
 static int audit_connect(vfs_handle_struct *handle, const char *svc, const 
char *user)
 {
int result;
-   
+
+   result = SMB_VFS_NEXT_CONNECT(handle, svc, user);
+   if (result < 0) {
+   return result;
+   }
+
openlog("smbd_audit", LOG_PID, audit_syslog_facility(handle));
 
syslog(audit_syslog_priority(handle), "connect to service %s by user 
%s\n", 
   svc, user)

[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
   via  b852a34... drsuapi: fix build warning of NDR size calculation of 
drsuapi_DsReplicaObjectIdentifier3Binary.
  from  753b9c6... s3-spoolss: fix fstrings in convert_devicemode() 
function.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit b852a3494aa3af3d69175f68669609b23fefc1bb
Author: Günther Deschner 
Date:   Tue Dec 1 00:24:16 2009 +0100

drsuapi: fix build warning of NDR size calculation of 
drsuapi_DsReplicaObjectIdentifier3Binary.

The generated size actually does not include the size of the binary itself.

Guenther

---

Summary of changes:
 librpc/gen_ndr/drsuapi.h |4 ++--
 librpc/gen_ndr/ndr_drsuapi.c |9 ++---
 librpc/gen_ndr/ndr_drsuapi.h |1 -
 librpc/idl/drsuapi.idl   |4 ++--
 librpc/ndr/ndr_drsuapi.c |6 ++
 librpc/ndr/ndr_drsuapi.h |2 ++
 6 files changed, 14 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/drsuapi.h b/librpc/gen_ndr/drsuapi.h
index 96b0651..a5016fa 100644
--- a/librpc/gen_ndr/drsuapi.h
+++ b/librpc/gen_ndr/drsuapi.h
@@ -549,7 +549,7 @@ struct drsuapi_DsReplicaObjectIdentifier3 {
 }/* [gensize,public] */;
 
 struct drsuapi_DsReplicaObjectIdentifier3Binary {
-   uint32_t __ndr_size;/* 
[value(ndr_size_drsuapi_DsReplicaObjectIdentifier3(r,ndr->iconv_convenience,ndr->flags))]
 */
+   uint32_t __ndr_size;/* 
[value(ndr_size_drsuapi_DsReplicaObjectIdentifier3Binary_without_Binary(r,ndr->iconv_convenience,ndr->flags))]
 */
uint32_t __ndr_size_sid;/* [value(ndr_size_dom_sid28(&sid,ndr->flags))] 
*/
struct GUID guid;
struct dom_sid28 sid;
@@ -557,7 +557,7 @@ struct drsuapi_DsReplicaObjectIdentifier3Binary {
const char *dn;/* [charset(UTF16)] */
uint32_t __ndr_size_binary;/* [value(binary.length+4)] */
DATA_BLOB binary;/* [flag(LIBNDR_FLAG_REMAINING)] */
-}/* [gensize,public] */;
+}/* [public] */;
 
 struct drsuapi_DsReplicaAttribute {
enum drsuapi_DsAttributeId attid;
diff --git a/librpc/gen_ndr/ndr_drsuapi.c b/librpc/gen_ndr/ndr_drsuapi.c
index f09affc..eb89db7 100644
--- a/librpc/gen_ndr/ndr_drsuapi.c
+++ b/librpc/gen_ndr/ndr_drsuapi.c
@@ -2264,7 +2264,7 @@ _PUBLIC_ enum ndr_err_code 
ndr_push_drsuapi_DsReplicaObjectIdentifier3Binary(str
 {
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
-   NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 
ndr_size_drsuapi_DsReplicaObjectIdentifier3(r, ndr->iconv_convenience, 
ndr->flags)));
+   NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 
ndr_size_drsuapi_DsReplicaObjectIdentifier3Binary_without_Binary(r, 
ndr->iconv_convenience, ndr->flags)));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 
ndr_size_dom_sid28(&r->sid, ndr->flags)));
NDR_CHECK(ndr_push_GUID(ndr, NDR_SCALARS, &r->guid));
NDR_CHECK(ndr_push_dom_sid28(ndr, NDR_SCALARS, &r->sid));
@@ -2314,7 +2314,7 @@ _PUBLIC_ void 
ndr_print_drsuapi_DsReplicaObjectIdentifier3Binary(struct ndr_prin
 {
ndr_print_struct(ndr, name, "drsuapi_DsReplicaObjectIdentifier3Binary");
ndr->depth++;
-   ndr_print_uint32(ndr, "__ndr_size", (ndr->flags & 
LIBNDR_PRINT_SET_VALUES)?ndr_size_drsuapi_DsReplicaObjectIdentifier3(r, 
ndr->iconv_convenience, ndr->flags):r->__ndr_size);
+   ndr_print_uint32(ndr, "__ndr_size", (ndr->flags & 
LIBNDR_PRINT_SET_VALUES)?ndr_size_drsuapi_DsReplicaObjectIdentifier3Binary_without_Binary(r,
 ndr->iconv_convenience, ndr->flags):r->__ndr_size);
ndr_print_uint32(ndr, "__ndr_size_sid", (ndr->flags & 
LIBNDR_PRINT_SET_VALUES)?ndr_size_dom_sid28(&r->sid, 
ndr->flags):r->__ndr_size_sid);
ndr_print_GUID(ndr, "guid", &r->guid);
ndr_print_dom_sid28(ndr, "sid", &r->sid);
@@ -2325,11 +2325,6 @@ _PUBLIC_ void 
ndr_print_drsuapi_DsReplicaObjectIdentifier3Binary(struct ndr_prin
ndr->depth--;
 }
 
-_PUBLIC_ size_t ndr_size_drsuapi_DsReplicaObjectIdentifier3Binary(const struct 
drsuapi_DsReplicaObjectIdentifier3Binary *r, struct smb_iconv_convenience *ic, 
int flags)
-{
-   return ndr_size_struct(r, flags, 
(ndr_push_flags_fn_t)ndr_push_drsuapi_DsReplicaObjectIdentifier3Binary, ic);
-}
-
 _PUBLIC_ enum ndr_err_code ndr_push_drsuapi_DsReplicaAttribute(struct ndr_push 
*ndr, int ndr_flags, const struct drsuapi_DsReplicaAttribute *r)
 {
if (ndr_flags & NDR_SCALARS) {
diff --git a/librpc/gen_ndr/ndr_drsuapi.h b/librpc/gen_ndr/ndr_drsuapi.h
index bf82ab8..b03e761 100644
--- a/librpc/gen_ndr/ndr_drsuapi.h
+++ b/librpc/gen_ndr/ndr_drsuapi.h
@@ -121,7 +121,6 @@ size_t ndr_size_drsuapi_DsReplicaObjectIdentifier3(const 
struct drsuapi_DsReplic
 enum ndr_err_code ndr_push_drsuapi_DsReplicaObjectIdentifier3Binary(struct 
ndr_push *ndr, int ndr_flags, const struc

Re: [SCM] Samba Shared Repository - branch master updated

[Tim Prouty]

Hi Metze,

Thank you for the response!

On Nov 26, 2009, at 4:24 AM, Stefan (metze) Metzmacher wrote:


Hi Tim,
I would like to solicit some help from a selftest/samba 4 expert on  
how

to get selftest working with this recent commit.


The reason is that we use smbtorture --list in source4/selftest/ 
tests.sh

and --list only outputs the first 2 levels of torture suites nesting.

So we just pass RAW-SFILEINFO to smbtorture, which means it runs all
subtests.


Ok, if I'm understanding you correctly, there is no easy way to keep  
raw-sfileinfo
in the quick list and only run a subtest.  I wanted to avoid removing  
it, but it sounds

like it may be the best option at this point.


As we're getting this in make test now:

UNEXPECTED(failure): samba4.raw.sfileinfo (dc).END-OF-FILE
command: ./bin/smbtorture --configfile=$SMB_CONF_PATH
--maximum-runtime=1200 --target=samba4
--basedir=/home/metze/tmp/st-master4/s4client
--option=torture:progress=no --format=subunit //$SERVER/tmp
-U$USERNAME%$PASSWORD --option=torture:sharedelay=1
--option=torture:oplocktimeout=3
--option=torture:writetimeupdatedelay=5 RAW-SFILEINFO
ERROR: Testsuite[samba4.raw.sfileinfo (dc)]
REASON: Exit code was 1


we should add something like "raw.sfileinfo.*.END-OF-FILE" to
source4/selftest/knownfail



I've been attempting to do that with:

diff --git a/source4/selftest/knownfail b/source4/selftest/knownfail
index e2ae2cf..37c9f6a 100644
--- a/source4/selftest/knownfail
+++ b/source4/selftest/knownfail
@@ -10,9 +10,7 @@ base.delete.*.deltest20a
 base.delete.*.deltest20b
 raw.rename.*.osxrename
 raw.rename.*.directory rename
+raw.sfileinfo.*.END_OF_FILE
 rpc.winreg.*security
 samba4.local.registry.(dir|ldb).check hive security
 samba4.local.registry.local.security

Unfortunately, I'm still seeing failures in source4 'make test'.  Am I  
missing

something simple?

[SCM] SAMBA-CTDB repository - annotated tag v3-4-ctdb-latest-release updated - 3.4.2-ctdb-13

[Michael Adam]

The annotated tag, v3-4-ctdb-latest-release has been updated
to  16a6ee6e1ecbe0995ca1b81e0d4cd38dad12c88c (tag)
  from  eff8cfc29f70d38d8a5042e22d8f156ab7ffdde2 (which is now obsolete)
   tagging  ea9ae65c18b21efae0596795055127e3e04672c2 (commit)
  replaces  3.4.2-ctdb-12
 tagged by  Michael Adam
on  Mon Nov 30 23:56:03 2009 +0100

- Log -
v3-4-ctdb-latest-release - moving ta[r]g[et]
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAksUTYcACgkQyU9JOBhPkDSyyACeN0FwCCx3XL0NcCX4qdTog+PH
FSwAn1KSv4Fr+s6rv6lIIBTWuCv1r5FV
=Xhtf
-END PGP SIGNATURE-

Günther Deschner (1):
  s3-netlogon: setup NETLOGON credential chain in 
rpccli_netlogon_set_trust_password() only when needed.

Michael Adam (4):
  s3:torture: move the torture-specific headers to new torture/torture.h
  s3: add dbwrap_torture - a tool to stress test tdb transactions through 
dbwrap
  s3:fix the merged build of bin/smbtorture4
  v3-4-ctdb: bump ctdb vendor patch level to 13

Rusty Russell (1):
  gpfs: fix logic when gpfs:winattr is false (the default!)

Stefan Metzmacher (1):
  s3:dbwrap_torture: use timeval_current/timeval_elapsed instead of 
start_timer/end_timer

Volker Lendecke (9):
  s3: Factor timeval_string out of current_timestring()
  s3: Add some debugs to the winbind machine pwchange machinery
  s3: Re-check the timeout in machine_password_change_handler()
  s3: Deal with races for password changes
  s3: Protect against flooding the DC with pwchange requests
  s3: Avoid races to change the machine password in winbind
  s3: Always try SamLogonEx
  s3: Fix the winbind piece of 58045: Correctly time out client smb requests
  s3: Do not connect to ctdb if it is blocked for some reason

---


-- 
SAMBA-CTDB repository

[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 3.4.2-ctdb-13

[Michael Adam]

The branch, v3-4-ctdb has been updated
   via  ea9ae65c18b21efae0596795055127e3e04672c2 (commit)
  from  744e80a0933412c24bdebf88b400e576cbeffcab (commit)

http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb


- Log -
commit ea9ae65c18b21efae0596795055127e3e04672c2
Author: Michael Adam 
Date:   Mon Nov 30 14:52:53 2009 +0100

v3-4-ctdb: bump ctdb vendor patch level to 13

Michael

---

Summary of changes:
 source3/VERSION |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/VERSION b/source3/VERSION
index 9ff3a21..45c8277 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -85,7 +85,7 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=no
 #  #
 
 SAMBA_VERSION_VENDOR_SUFFIX="ctdb"
-SAMBA_VERSION_VENDOR_PATCH=12
+SAMBA_VERSION_VENDOR_PATCH=13
 
 
 # This can be set by vendors if they want..#


-- 
SAMBA-CTDB repository

[SCM] SAMBA-CTDB repository - annotated tag 3.4.2-ctdb-13 created - 3.4.2-ctdb-13

[Michael Adam]

The annotated tag, 3.4.2-ctdb-13 has been created
at  55181a1c8afa48965df8094cb6e4575e94890afc (tag)
   tagging  ea9ae65c18b21efae0596795055127e3e04672c2 (commit)
  replaces  3.4.2-ctdb-12
 tagged by  Michael Adam
on  Mon Nov 30 23:55:06 2009 +0100

- Log -
release 3.4.2-ctdb-13
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAksUTVIACgkQyU9JOBhPkDRjBACdFTAyLZCDhuKvf0uVRF/saA7S
I9sAn0IbAM0Tr+295qudC4CZd7jq/GyC
=WZ6i
-END PGP SIGNATURE-

Günther Deschner (1):
  s3-netlogon: setup NETLOGON credential chain in 
rpccli_netlogon_set_trust_password() only when needed.

Michael Adam (4):
  s3:torture: move the torture-specific headers to new torture/torture.h
  s3: add dbwrap_torture - a tool to stress test tdb transactions through 
dbwrap
  s3:fix the merged build of bin/smbtorture4
  v3-4-ctdb: bump ctdb vendor patch level to 13

Rusty Russell (1):
  gpfs: fix logic when gpfs:winattr is false (the default!)

Stefan Metzmacher (1):
  s3:dbwrap_torture: use timeval_current/timeval_elapsed instead of 
start_timer/end_timer

Volker Lendecke (9):
  s3: Factor timeval_string out of current_timestring()
  s3: Add some debugs to the winbind machine pwchange machinery
  s3: Re-check the timeout in machine_password_change_handler()
  s3: Deal with races for password changes
  s3: Protect against flooding the DC with pwchange requests
  s3: Avoid races to change the machine password in winbind
  s3: Always try SamLogonEx
  s3: Fix the winbind piece of 58045: Correctly time out client smb requests
  s3: Do not connect to ctdb if it is blocked for some reason

---


-- 
SAMBA-CTDB repository

[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
   via  753b9c6... s3-spoolss: fix fstrings in convert_devicemode() 
function.
  from  6aef5e5... Fix bug 6546: Avoid accessing buf[-1] if NUL byte comes 
from fgets

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 753b9c6d566fafee9724a84fbd91316767c1c7a2
Author: Günther Deschner 
Date:   Mon Nov 30 18:10:59 2009 +0100

s3-spoolss: fix fstrings in convert_devicemode() function.

Guenther

---

Summary of changes:
 source3/rpc_server/srv_spoolss_nt.c |7 +--
 1 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_spoolss_nt.c 
b/source3/rpc_server/srv_spoolss_nt.c
index 8d7973d..d742048 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -1484,8 +1484,11 @@ bool convert_devicemode(const char *printername,
return false;
}
 
-   rpcstr_push(nt_devmode->devicename, devmode->devicename, 31, 0);
-   rpcstr_push(nt_devmode->formname, devmode->formname, 31, 0);
+   fstrcpy(nt_devmode->devicename, devmode->devicename);
+   fstrcpy(nt_devmode->formname, devmode->formname);
+
+   nt_devmode->devicename[31] = '\0';
+   nt_devmode->formname[31] = '\0';
 
nt_devmode->specversion = devmode->specversion;
nt_devmode->driverversion   = devmode->driverversion;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-5-test updated

[Volker Lendecke]

The branch, v3-5-test has been updated
   via  c0282f8... Fix bug 6546: Avoid accessing buf[-1] if NUL byte comes 
from fgets
  from  f9651fc... Revert "s3: Fix commit 
9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6."

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


- Log -
commit c0282f8f7d40b893610fdc235cb130f1fedbeb13
Author: Volker Lendecke 
Date:   Mon Nov 30 21:48:33 2009 +0100

Fix bug 6546: Avoid accessing buf[-1] if NUL byte comes from fgets

---

Summary of changes:
 source3/utils/eventlogadm.c |5 -
 source3/utils/net_rpc.c |3 ++-
 source3/utils/smbget.c  |4 +++-
 source4/torture/nbench/nbench.c |4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/eventlogadm.c b/source3/utils/eventlogadm.c
index 7fc04b0..415330f 100644
--- a/source3/utils/eventlogadm.c
+++ b/source3/utils/eventlogadm.c
@@ -118,7 +118,10 @@ static int DoWriteCommand( int argc, char **argv, bool 
debugflag, char *exename
if (fgets( linein, sizeof( linein ) - 1, f1 ) == NULL) {
break;
}
-   linein[strlen( linein ) - 1] = 0;   /* whack the line 
delimiter */
+   if ((strlen(linein) > 0)
+   && (linein[strlen(linein)-1] == '\n')) {
+   linein[strlen(linein)-1] = 0;
+   }
 
if ( debugflag )
printf( "Read line [%s]\n", linein );
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index fdb11f3..5b3b1e3 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -4262,8 +4262,9 @@ static bool get_user_tokens_from_file(FILE *f,
return true;
}
 
-   if (line[strlen(line)-1] == '\n')
+   if ((strlen(line) > 0) && (line[strlen(line)-1] == '\n')) {
line[strlen(line)-1] = '\0';
+   }
 
if (line[0] == ' ') {
/* We have a SID */
diff --git a/source3/utils/smbget.c b/source3/utils/smbget.c
index b7d56cd..15fe1fd 100644
--- a/source3/utils/smbget.c
+++ b/source3/utils/smbget.c
@@ -94,7 +94,9 @@ static void get_auth_data(const char *srv, const char *shr, 
char *wg, int wglen,
if (fgets(tmp, sizeof(tmp), stdin) == NULL) {
return;
}
-   if(tmp[strlen(tmp)-1] == '\n')tmp[strlen(tmp)-1] = '\0';
+   if ((strlen(tmp) > 0) && (tmp[strlen(tmp)-1] == '\n')) {
+   tmp[strlen(tmp)-1] = '\0';
+   }
strncpy(un, tmp, unlen-1);
} else if(username) strncpy(un, username, unlen-1);
 
diff --git a/source4/torture/nbench/nbench.c b/source4/torture/nbench/nbench.c
index 5a4037f..05c889d 100644
--- a/source4/torture/nbench/nbench.c
+++ b/source4/torture/nbench/nbench.c
@@ -95,7 +95,9 @@ again:
 
nbench_line_count++;
 
-   line[strlen(line)-1] = 0;
+   if ((strlen(line) > 0) && line[strlen(line)-1] == '\n') {
+   line[strlen(line)-1] = 0;
+   }
 
all_string_sub(line,"client1", cname, sizeof(line));



-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
   via  6aef5e5... Fix bug 6546: Avoid accessing buf[-1] if NUL byte comes 
from fgets
  from  3b7f8a7... s3:docs: Fix typo in man mount.cifs.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 6aef5e591f3fa1ceeedb22273d2fe04298b6e3fb
Author: Volker Lendecke 
Date:   Mon Nov 30 21:48:33 2009 +0100

Fix bug 6546: Avoid accessing buf[-1] if NUL byte comes from fgets

---

Summary of changes:
 source3/utils/eventlogadm.c |5 -
 source3/utils/net_rpc.c |3 ++-
 source3/utils/smbget.c  |4 +++-
 source4/torture/nbench/nbench.c |4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/eventlogadm.c b/source3/utils/eventlogadm.c
index 7fc04b0..415330f 100644
--- a/source3/utils/eventlogadm.c
+++ b/source3/utils/eventlogadm.c
@@ -118,7 +118,10 @@ static int DoWriteCommand( int argc, char **argv, bool 
debugflag, char *exename
if (fgets( linein, sizeof( linein ) - 1, f1 ) == NULL) {
break;
}
-   linein[strlen( linein ) - 1] = 0;   /* whack the line 
delimiter */
+   if ((strlen(linein) > 0)
+   && (linein[strlen(linein)-1] == '\n')) {
+   linein[strlen(linein)-1] = 0;
+   }
 
if ( debugflag )
printf( "Read line [%s]\n", linein );
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index fdb11f3..5b3b1e3 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -4262,8 +4262,9 @@ static bool get_user_tokens_from_file(FILE *f,
return true;
}
 
-   if (line[strlen(line)-1] == '\n')
+   if ((strlen(line) > 0) && (line[strlen(line)-1] == '\n')) {
line[strlen(line)-1] = '\0';
+   }
 
if (line[0] == ' ') {
/* We have a SID */
diff --git a/source3/utils/smbget.c b/source3/utils/smbget.c
index b7d56cd..15fe1fd 100644
--- a/source3/utils/smbget.c
+++ b/source3/utils/smbget.c
@@ -94,7 +94,9 @@ static void get_auth_data(const char *srv, const char *shr, 
char *wg, int wglen,
if (fgets(tmp, sizeof(tmp), stdin) == NULL) {
return;
}
-   if(tmp[strlen(tmp)-1] == '\n')tmp[strlen(tmp)-1] = '\0';
+   if ((strlen(tmp) > 0) && (tmp[strlen(tmp)-1] == '\n')) {
+   tmp[strlen(tmp)-1] = '\0';
+   }
strncpy(un, tmp, unlen-1);
} else if(username) strncpy(un, username, unlen-1);
 
diff --git a/source4/torture/nbench/nbench.c b/source4/torture/nbench/nbench.c
index 5a4037f..05c889d 100644
--- a/source4/torture/nbench/nbench.c
+++ b/source4/torture/nbench/nbench.c
@@ -95,7 +95,9 @@ again:
 
nbench_line_count++;
 
-   line[strlen(line)-1] = 0;
+   if ((strlen(line) > 0) && line[strlen(line)-1] == '\n') {
+   line[strlen(line)-1] = 0;
+   }
 
all_string_sub(line,"client1", cname, sizeof(line));



-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-5-test updated

[Bo Yang]

The branch, v3-5-test has been updated
   via  f9651fc... Revert "s3: Fix commit 
9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6."
   via  cdbf770... Revert "s3: Fix crash in free_file_list()."
  from  54e2e0a... s3:docs: Fix typo in man mount.cifs.

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


- Log -
commit f9651fcd867293fb0364729e220ee81c3f7a72af
Author: Bo Yang 
Date:   Tue Dec 1 01:05:35 2009 +0800

Revert "s3: Fix commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6."

This reverts commit 509b42486e5f98343d95100c12969703398a248d.

commit cdbf7708c219f12432c8cac237dd9c1144b8ee22
Author: Bo Yang 
Date:   Tue Dec 1 01:05:10 2009 +0800

Revert "s3: Fix crash in free_file_list()."

This reverts commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6.

---

Summary of changes:
 source3/param/loadparm.c |   11 +--
 1 files changed, 5 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 641f7ad..9da853f 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -7016,7 +7016,6 @@ static void add_to_file_list(const char *fname, const 
char *subfname)
}
f->subfname = SMB_STRDUP(subfname);
if (!f->subfname) {
-   SAFE_FREE(f->name);
SAFE_FREE(f);
return;
}
@@ -7027,7 +7026,6 @@ static void add_to_file_list(const char *fname, const 
char *subfname)
if (t)
f->modtime = t;
}
-   return;
 }
 
 /**
@@ -7093,7 +7091,7 @@ bool lp_file_list_changed(void)
return true;
}
} else {
-   n2 = talloc_sub_basic(get_current_username(),
+   n2 = alloc_sub_basic(get_current_username(),
current_user_info.domain,
f->name);
if (!n2) {
@@ -7114,11 +7112,12 @@ bool lp_file_list_changed(void)
  ctime(&mod_time)));
f->modtime = mod_time;
SAFE_FREE(f->subfname);
-   f->subfname = SMB_STRDUP(n2);
-   TALLOC_FREE(n2);
+   f->subfname = n2; /* Passing ownership of
+return from alloc_sub_basic
+above. */
return true;
}
-   TALLOC_FREE(n2);
+   SAFE_FREE(n2);
}
f = f->next;
}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated

[Karolin Seeger]

The branch, v3-4-test has been updated
   via  ab9e7e9... s3-spoolss: simplify _spoolss_EnumPrinterKey a little 
more.
   via  29c22e1... s3-spoolss: fixes for _spoolss_EnumPrinterKey client and 
server.
   via  5b86641... s3-spoolss: fix spoolss_EnumPrinterKey client and server 
code.
   via  167a9ea... spoolss: fix spoolss_EnumPrinterKey IDL.
   via  560b7a4... s3-util: add pull_reg_sz() and pull_reg_multi_sz() 
convenience functions.
   via  20b4320... s3-util: add push_reg_sz() and push_reg_multi_sz() 
convenience functions.
   via  09d1d63... misc: mark winreg_Data little-endian except for a 
REG_DWORD_BIG_ENDIAN.
   via  a15f3cb... winreg: add winreg_Data union to IDL.
  from  2004627... s3-kerberos: fix the build on Mac OS X 10.6.2.

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


- Log -
commit ab9e7e9ac813f4bbadf1ebf86dfaac2f47e75de2
Author: Günther Deschner 
Date:   Thu Nov 26 19:01:54 2009 +0100

s3-spoolss: simplify _spoolss_EnumPrinterKey a little more.

Guenther
(cherry picked from commit e512ccb5b677fa7f285829ec645fc067837c0e11)

Part of a fix for bug #6883 (Add Printer fails with 0x06f7 on Windows 
7).

commit 29c22e159352bcb334dfb7c5846e865967d77cb0
Author: Günther Deschner 
Date:   Tue Nov 24 15:22:04 2009 +0100

s3-spoolss: fixes for _spoolss_EnumPrinterKey client and server.

Thanks Metze for review!

Guenther
(cherry picked from commit 846aa18648f3b34ab5cbc4dc4ba334bbedeab2f4)

commit 5b86641b5003379208d8d55f2d6eac6aac6e1488
Author: Günther Deschner 
Date:   Fri Nov 20 16:34:00 2009 +0100

s3-spoolss: fix spoolss_EnumPrinterKey client and server code.

Guenther
(cherry picked from commit d464151f3b47c675664f464b1645ca85de663655)

commit 167a9ea770a38ffbe121da522bfdab79aa60413d
Author: Günther Deschner 
Date:   Fri Nov 20 12:57:13 2009 +0100

spoolss: fix spoolss_EnumPrinterKey IDL.

Guenther

commit 560b7a45ff8257b7d9994199218edfa3ea4e8dae
Author: Günther Deschner 
Date:   Fri Sep 25 00:56:17 2009 +0200

s3-util: add pull_reg_sz() and pull_reg_multi_sz() convenience functions.

Guenther
(cherry picked from commit f8016cfee922cba97b70f56c752827e4584da6c6)

commit 20b43200885d7e4cef5e26ad249c9a4c6529dca5
Author: Günther Deschner 
Date:   Wed Sep 23 20:42:20 2009 +0200

s3-util: add push_reg_sz() and push_reg_multi_sz() convenience functions.

Guenther
(cherry picked from commit fcee9d2c97a673347baf58f749f35785a896e468)

commit 09d1d639da808b94c25749423675925fbe3b3660
Author: Günther Deschner 
Date:   Fri Nov 27 11:18:30 2009 +0100

misc: mark winreg_Data little-endian except for a REG_DWORD_BIG_ENDIAN.

Guenther

commit a15f3cb7c72eebecce48db83e045739f771ab4d7
Author: Günther Deschner 
Date:   Wed Sep 23 20:41:44 2009 +0200

winreg: add winreg_Data union to IDL.

Guenther

---

Summary of changes:
 librpc/gen_ndr/cli_spoolss.c|4 +-
 librpc/gen_ndr/cli_spoolss.h|2 +-
 librpc/gen_ndr/misc.h   |   41 +
 librpc/gen_ndr/ndr_misc.c   |  290 +++
 librpc/gen_ndr/ndr_misc.h   |6 +
 librpc/gen_ndr/ndr_spoolss.c|   80 --
 librpc/gen_ndr/ndr_winreg.c |   36 +-
 librpc/gen_ndr/ndr_winreg.h |3 -
 librpc/gen_ndr/spoolss.h|2 +-
 librpc/gen_ndr/srv_spoolss.c|4 +-
 librpc/gen_ndr/winreg.h |   34 +
 librpc/idl/misc.idl |   28 
 librpc/idl/spoolss.idl  |2 +-
 librpc/idl/winreg.idl   |   17 +--
 source3/include/proto.h |4 +
 source3/lib/util_reg.c  |   65 
 source3/rpc_client/cli_spoolss.c|   24 +++-
 source3/rpc_server/srv_spoolss_nt.c |   27 ++--
 18 files changed, 512 insertions(+), 157 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index 3dd73c6..b605f58 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -3811,7 +3811,7 @@ NTSTATUS rpccli_spoolss_EnumPrinterKey(struct 
rpc_pipe_client *cli,
   TALLOC_CTX *mem_ctx,
   struct policy_handle *handle /* [in] 
[ref] */,
   const char *key_name /* [in] 
[charset(UTF16)] */,
-  const char ** *key_buffer /* [out] 
[subcontext_size(offered),ref,subcontext(0),flag(LIBNDR_FLAG_STR_NULLTERM)] */,
+  uint16_t *key_buffer /* [out] 
[ref,size_is(offered/2)] */,
   uint32_t offered /* [in]  */,
   uint32_t *needed /* [out] [ref] */,
 

[SCM] Samba Shared Repository - branch v3-4-test updated

[Karolin Seeger]

The branch, v3-4-test has been updated
   via  2004627... s3-kerberos: fix the build on Mac OS X 10.6.2.
   via  a9a3504... s3-kerberos: add a missing reference to authdata headers.
   via  41fb263... s3-kerberos: only use krb5 headers where required.
   via  83ee139... s3-kerberos: Fix Bug #6929: build with recent heimdal.
   via  9ea9c20... s3-kerberos: next step to resolve Bug #6929: build with 
recent heimdal.
   via  124c695... s3-kerberos: add check for prerequisite krb5/krb5.h 
header while checking for krb5/locate_plugin.h.
   via  0d19596... nsswitch: fix compile of winbind_krb5_locator with 
recent Heimdal versions.
   via  e3a06f2... cifs.upcall: 2nd part of fix for Bug #6868: support 
building with Heimdal we well as with MIT.
   via  15832c2... s3-build: really fix build of winbind_krb5_locator.
   via  8900c0a... nsswitch: fix the build of the winbind krb5 locator 
plugin.
  from  dbe41dc... s3:docs: Fix typo in man mount.cifs.

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


- Log -
commit 200462730f39d7eaee3917801046b120bc807c3f
Author: Günther Deschner 
Date:   Fri Nov 27 20:08:44 2009 +0100

s3-kerberos: fix the build on Mac OS X 10.6.2.

Guenther
(cherry picked from commit 51328a7056918bc75a7c1c442f47cf0271075542)

commit a9a3504ede1306ceb86d99bceb5e8bf4d48f40c2
Author: Günther Deschner 
Date:   Fri Nov 27 18:51:56 2009 +0100

s3-kerberos: add a missing reference to authdata headers.

Guenther
(cherry picked from commit da79cbb0800dd647be864e8bbb5fe1132708174b)

commit 41fb263aacc5dce50d3554598d08cb497ffd929f
Author: Günther Deschner 
Date:   Fri Nov 27 15:52:57 2009 +0100

s3-kerberos: only use krb5 headers where required.

This seems to be the only way to deal with mixed heimdal/MIT setups during
merged build.

Guenther

commit 83ee139ddde91bffc7b5921eb5e6a4364a408d38
Author: Günther Deschner 
Date:   Fri Nov 27 01:06:36 2009 +0100

s3-kerberos: Fix Bug #6929: build with recent heimdal.

Heimdal changed the KRB5_DEPRECATED define (which now may not take an 
identifier
for activation) in new releases (like 1.3.1).

Guenther
(cherry picked from commit 1a8f8382740e352a83133b8c49aaedd4716210cd)

commit 9ea9c2089ed0835f4cf8f5fb6fecf4f156b19520
Author: Günther Deschner 
Date:   Thu Nov 26 10:15:45 2009 +0100

s3-kerberos: next step to resolve Bug #6929: build with recent heimdal.

Based on patch from Allan .

Also should fix the FreeBSD build on the buildfarm.

Guenther
(cherry picked from commit 5b3a32be97a37c119e837bdee8f049684565458c)

commit 124c695872a6630cc6670a0547e1c3e6507be748
Author: Günther Deschner 
Date:   Wed Nov 25 21:33:48 2009 +0100

s3-kerberos: add check for prerequisite krb5/krb5.h header while checking 
for krb5/locate_plugin.h.

(Needed for new Heimdal versions).

Guenther
(cherry picked from commit c438b2b3923db66672ec82e795eef543de5fcb8a)

commit 0d19596e123d63343d31ca1783cc1f56d4f21684
Author: Günther Deschner 
Date:   Wed Nov 25 15:21:54 2009 +0100

nsswitch: fix compile of winbind_krb5_locator with recent Heimdal versions.

Guenther
(cherry picked from commit 51864219cc12ceb66c281355f3e1191d5e32842d)

commit e3a06f282d5e5c06bd006497dd8736a531e6cb3b
Author: Günther Deschner 
Date:   Wed Nov 25 15:06:19 2009 +0100

cifs.upcall: 2nd part of fix for Bug #6868: support building with Heimdal 
we well as with MIT.

Guenther
(cherry picked from commit 660ee2e74523194e5f6b2b6428d76628beb74717)

commit 15832c25f0d252646045b292530556239805e737
Author: Günther Deschner 
Date:   Thu Nov 19 13:44:33 2009 +0100

s3-build: really fix build of winbind_krb5_locator.

Guenther
(cherry picked from commit fc9f199f2619635f73e8ee7f3b5359521d63f325)

commit 8900c0a1c8dd16cd98bfd219232d3bc57acb033a
Author: Günther Deschner 
Date:   Wed Oct 21 02:44:44 2009 +0200

nsswitch: fix the build of the winbind krb5 locator plugin.

Guenther
(cherry picked from commit b9d9353b548d9b2ab684aa171f511174e6414762)

---

Summary of changes:
 nsswitch/winbind_krb5_locator.c|5 +
 source3/Makefile.in|2 +-
 source3/client/cifs.upcall.c   |3 +
 source3/configure.in   |   23 +-
 source3/include/ads.h  |   71 ---
 source3/include/includes.h |  156 +---
 source3/include/krb5_protos.h  |  147 ++
 source3/include/proto.h|4 -
 source3/include/smb_krb5.h |   72 +++
 source3/libads/ads_status.c|1 +
 source3/libads/authdata.c  |1 +
 source3/libads/kerberos.c  |1 +

[SCM] Samba Shared Repository - branch v3-3-test updated

[Karolin Seeger]

The branch, v3-3-test has been updated
   via  04fa292... s3:docs: Fix typo in man mount.cifs.
  from  65a3f18... s3:docs: Document "aio write behind".

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


- Log -
commit 04fa292f6e7948c10da378ca4b8a741324478008
Author: Karolin Seeger 
Date:   Mon Nov 30 14:53:23 2009 +0100

s3:docs: Fix typo in man mount.cifs.

Fix bug #6844 (wrong credential file format in mount.cifs manpage).
Thanks to the Debian Samba package maintainers for reporting!

Karolin
(cherry picked from commit 3b7f8a759f57f32a8c1bc2db85236e88f616ffd9)
(cherry picked from commit 54e2e0ae51e2e126696570104ed64d0458beb4ce)
(cherry picked from commit dbe41dce7491df93a26bb0f4bd2a33b53fe90188)

---

Summary of changes:
 docs-xml/manpages-3/mount.cifs.8.xml |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/mount.cifs.8.xml 
b/docs-xml/manpages-3/mount.cifs.8.xml
index dae54e1..9e856ca 100644
--- a/docs-xml/manpages-3/mount.cifs.8.xml
+++ b/docs-xml/manpages-3/mount.cifs.8.xml
@@ -116,7 +116,7 @@ below) or entered at the password prompt will be read 
correctly.
 
username=value
password=value
-   workgroup=value
+   domain=value
 
 



-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated

[Karolin Seeger]

The branch, v3-4-test has been updated
   via  dbe41dc... s3:docs: Fix typo in man mount.cifs.
  from  b89d902... s3: re-run make samba3-idl.

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


- Log -
commit dbe41dce7491df93a26bb0f4bd2a33b53fe90188
Author: Karolin Seeger 
Date:   Mon Nov 30 14:53:23 2009 +0100

s3:docs: Fix typo in man mount.cifs.

Fix bug #6844 (wrong credential file format in mount.cifs manpage).
Thanks to the Debian Samba package maintainers for reporting!

Karolin
(cherry picked from commit 3b7f8a759f57f32a8c1bc2db85236e88f616ffd9)
(cherry picked from commit 54e2e0ae51e2e126696570104ed64d0458beb4ce)

---

Summary of changes:
 docs-xml/manpages-3/mount.cifs.8.xml |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/mount.cifs.8.xml 
b/docs-xml/manpages-3/mount.cifs.8.xml
index 9481458..db6028e 100644
--- a/docs-xml/manpages-3/mount.cifs.8.xml
+++ b/docs-xml/manpages-3/mount.cifs.8.xml
@@ -124,7 +124,7 @@ below) or entered at the password prompt will be read 
correctly.
 
username=value
password=value
-   workgroup=value
+   domain=value
 
 



-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
   via  54e2e0a... s3:docs: Fix typo in man mount.cifs.
  from  267ebc0... s3:docs: Document "aio write behind".

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


- Log -
commit 54e2e0ae51e2e126696570104ed64d0458beb4ce
Author: Karolin Seeger 
Date:   Mon Nov 30 14:53:23 2009 +0100

s3:docs: Fix typo in man mount.cifs.

Fix bug #6844 (wrong credential file format in mount.cifs manpage).
Thanks to the Debian Samba package maintainers for reporting!

Karolin
(cherry picked from commit 3b7f8a759f57f32a8c1bc2db85236e88f616ffd9)

---

Summary of changes:
 docs-xml/manpages-3/mount.cifs.8.xml |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/mount.cifs.8.xml 
b/docs-xml/manpages-3/mount.cifs.8.xml
index 4f775e8..0beb968 100644
--- a/docs-xml/manpages-3/mount.cifs.8.xml
+++ b/docs-xml/manpages-3/mount.cifs.8.xml
@@ -121,7 +121,7 @@ below) or entered at the password prompt will be read 
correctly.
 
username=value
password=value
-   workgroup=value
+   domain=value
 
 



-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

[Karolin Seeger]

The branch, master has been updated
   via  3b7f8a7... s3:docs: Fix typo in man mount.cifs.
  from  fde7c2a... s3:docs: Document "aio write behind".

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 3b7f8a759f57f32a8c1bc2db85236e88f616ffd9
Author: Karolin Seeger 
Date:   Mon Nov 30 14:53:23 2009 +0100

s3:docs: Fix typo in man mount.cifs.

Fix bug #6844 (wrong credential file format in mount.cifs manpage).
Thanks to the Debian Samba package maintainers for reporting!

Karolin

---

Summary of changes:
 docs-xml/manpages-3/mount.cifs.8.xml |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/mount.cifs.8.xml 
b/docs-xml/manpages-3/mount.cifs.8.xml
index d00c19b..372b477 100644
--- a/docs-xml/manpages-3/mount.cifs.8.xml
+++ b/docs-xml/manpages-3/mount.cifs.8.xml
@@ -121,7 +121,7 @@ below) or entered at the password prompt will be read 
correctly.
 
username=value
password=value
-   workgroup=value
+   domain=value
 
 



-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated

[Karolin Seeger]

The branch, v3-4-test has been updated
   via  b89d902... s3: re-run make samba3-idl.
   via  11f5df1... pidl: fix handling of output arguments in s3 client 
stubs.
   via  4f14da8... pidl:Samba3/ClientNDR: $size can be 'foo / 2' so we need 
to add '(' and ')'
   via  d0d77d8... pidl:NDR/Parser: $size can be 'foo / 2' so we need to 
add '(' and ')'
  from  93bbbd3... s3:docs: Document "aio write behind".

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


- Log -
commit b89d902b6ab0ab14c95cf7b7bbe37b3884fefea5
Author: Günther Deschner 
Date:   Fri Nov 27 16:49:48 2009 +0100

s3: re-run make samba3-idl.

Guenther

Fix bug #6934.

commit 11f5df11cc6998688cadc034b3e1e249d98bf3e1
Author: Günther Deschner 
Date:   Fri Nov 27 16:44:39 2009 +0100

pidl: fix handling of output arguments in s3 client stubs.

a20e095 used (uint8_t) instead of (uint8_t *).

Guenther

commit 4f14da8ddb1c903b75917cefaaea3e9b405a633a
Author: Günther Deschner 
Date:   Fri Nov 27 11:37:01 2009 +0100

pidl:Samba3/ClientNDR: $size can be 'foo / 2' so we need to add '(' and ')'

foo / 5 * sizeof(bar)' isn't the same as
'(foo / 2) * sizeof(bar)'.

metze

commit d0d77d830072fbb5bda1c45f9df0722718f89096
Author: Stefan Metzmacher 
Date:   Wed Nov 25 14:21:32 2009 +0100

pidl:NDR/Parser: $size can be 'foo / 2' so we need to add '(' and ')'

foo / 5 * sizeof(bar)' isn't the same as
'(foo / 2) * sizeof(bar)'.

metze
(cherry picked from commit ab1c92950f3cfdc8c52b772ecef23a5477f48f9d)

---

Summary of changes:
 librpc/gen_ndr/cli_echo.c|4 ++--
 librpc/gen_ndr/cli_epmapper.c|4 ++--
 librpc/gen_ndr/cli_eventlog.c|4 ++--
 librpc/gen_ndr/cli_ntsvcs.c  |4 ++--
 librpc/gen_ndr/cli_spoolss.c |   12 ++--
 librpc/gen_ndr/cli_srvsvc.c  |2 +-
 librpc/gen_ndr/cli_svcctl.c  |   20 ++--
 librpc/gen_ndr/cli_winreg.c  |8 
 librpc/gen_ndr/ndr_winreg.c  |4 ++--
 pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm  |4 ++--
 pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm |2 +-
 pidl/tests/samba3-cli.pl |2 +-
 source3/librpc/gen_ndr/messaging.h   |2 ++
 source3/librpc/gen_ndr/notify.h  |2 ++
 14 files changed, 39 insertions(+), 35 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/cli_echo.c b/librpc/gen_ndr/cli_echo.c
index ff369c7..48632a3 100644
--- a/librpc/gen_ndr/cli_echo.c
+++ b/librpc/gen_ndr/cli_echo.c
@@ -82,7 +82,7 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli,
}
 
/* Return variables */
-   memcpy(out_data, r.out.out_data, r.in.len * sizeof(*out_data));
+   memcpy(out_data, r.out.out_data, (r.in.len) * sizeof(*out_data));
 
/* Return result */
return NT_STATUS_OK;
@@ -162,7 +162,7 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli,
}
 
/* Return variables */
-   memcpy(data, r.out.data, r.in.len * sizeof(*data));
+   memcpy(data, r.out.data, (r.in.len) * sizeof(*data));
 
/* Return result */
return NT_STATUS_OK;
diff --git a/librpc/gen_ndr/cli_epmapper.c b/librpc/gen_ndr/cli_epmapper.c
index 0ccefa9..65621d3 100644
--- a/librpc/gen_ndr/cli_epmapper.c
+++ b/librpc/gen_ndr/cli_epmapper.c
@@ -135,7 +135,7 @@ NTSTATUS rpccli_epm_Lookup(struct rpc_pipe_client *cli,
/* Return variables */
*entry_handle = *r.out.entry_handle;
*num_ents = *r.out.num_ents;
-   memcpy(entries, r.out.entries, r.in.max_ents * sizeof(*entries));
+   memcpy(entries, r.out.entries, (r.in.max_ents) * sizeof(*entries));
 
/* Return result */
return NT_STATUS_OK;
@@ -184,7 +184,7 @@ NTSTATUS rpccli_epm_Map(struct rpc_pipe_client *cli,
/* Return variables */
*entry_handle = *r.out.entry_handle;
*num_towers = *r.out.num_towers;
-   memcpy(towers, r.out.towers, r.in.max_towers * sizeof(*towers));
+   memcpy(towers, r.out.towers, (r.in.max_towers) * sizeof(*towers));
 
/* Return result */
return NT_STATUS_OK;
diff --git a/librpc/gen_ndr/cli_eventlog.c b/librpc/gen_ndr/cli_eventlog.c
index b9cf39d..2480412 100644
--- a/librpc/gen_ndr/cli_eventlog.c
+++ b/librpc/gen_ndr/cli_eventlog.c
@@ -464,7 +464,7 @@ NTSTATUS rpccli_eventlog_ReadEventLogW(struct 
rpc_pipe_client *cli,
}
 
/* Return variables */
-   memcpy(data, r.out.data, r.in.number_of_bytes * sizeof(*data));
+   memcpy(data, r.out.data, (r.in.number_of_bytes) * sizeof(*data));
*sent_size = *r.out.sent_size;
*real_size = *r.out.real_size;
 
@@ -941,7 +941,7 @@ NTSTATUS rpccli_eventlog_GetLogInformation(struct 
rpc_pipe_client 

[SCM] Samba Shared Repository - branch v3-3-test updated

[Karolin Seeger]

The branch, v3-3-test has been updated
   via  65a3f18... s3:docs: Document "aio write behind".
   via  eeea76f... s3:docs: Document "ldap page size".
  from  f837338... s3:docs: Document "enable core files".

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


- Log -
commit 65a3f18ccd9aa8b4ec31e9e7e5465631ee53afca
Author: Karolin Seeger 
Date:   Mon Nov 30 13:34:34 2009 +0100

s3:docs: Document "aio write behind".

Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).

Karolin
(cherry picked from commit fde7c2ab19bc7442d8ee9d85ab2fe54e0cfb4782)
(cherry picked from commit 267ebc03b43dd8c11f5aebf341620b0d94d95135)
(cherry picked from commit 93bbbd3cc776e4aa69239cb086067ec953fc8c8e)

commit eeea76ff150964c7b6db87fb670dbfd1ae68608e
Author: Karolin Seeger 
Date:   Mon Nov 30 12:29:27 2009 +0100

s3:docs: Document "ldap page size".

Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).

Karolin
(cherry picked from commit 9478ec35b5349f50a61bbe2aa88af88577918e91)
(cherry picked from commit 940121d666b9e0645584c93db178b763ac5c8c04)
(cherry picked from commit a1d8a6127448fbdc25d1d87a2541a2ea8e430e17)

---

Summary of changes:
 docs-xml/smbdotconf/ldap/ldappagesize.xml |   18 ++
 docs-xml/smbdotconf/tuning/aiowritebehind.xml |   23 +++
 2 files changed, 41 insertions(+), 0 deletions(-)
 create mode 100644 docs-xml/smbdotconf/ldap/ldappagesize.xml
 create mode 100644 docs-xml/smbdotconf/tuning/aiowritebehind.xml


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/ldap/ldappagesize.xml 
b/docs-xml/smbdotconf/ldap/ldappagesize.xml
new file mode 100644
index 000..bc09b98
--- /dev/null
+++ b/docs-xml/smbdotconf/ldap/ldappagesize.xml
@@ -0,0 +1,18 @@
+http://www.samba.org/samba/DTD/samba-doc";>
+
+   
+   This parameter specifies the number of entries per page.
+   
+
+   If the LDAP server supports paged results, clients can
+   request subsets of search results (pages) instead of the entire list.
+   This parameter specifies the size of these pages.
+   
+
+1024
+512
+
diff --git a/docs-xml/smbdotconf/tuning/aiowritebehind.xml 
b/docs-xml/smbdotconf/tuning/aiowritebehind.xml
new file mode 100644
index 000..c88cd97
--- /dev/null
+++ b/docs-xml/smbdotconf/tuning/aiowritebehind.xml
@@ -0,0 +1,23 @@
+http://www.samba.org/samba/DTD/samba-doc";>
+
+   If Samba has been built with asynchronous I/O support,
+   Samba will not wait until write requests are finished before returning
+   the result to the client for files listed in this parameter.
+   Instead, Samba will immediately return that the write
+   request has been finished successfully, no matter if the
+   operation will succeed or not. This might speed up clients without
+   aio support, but is really dangerous, because data could be lost
+   and files could be damaged.
+   
+   
+   The syntax is identical to the 
+   parameter.
+   
+
+
+
+/*.tmp/
+


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated

[Karolin Seeger]

The branch, v3-4-test has been updated
   via  93bbbd3... s3:docs: Document "aio write behind".
   via  a1d8a61... s3:docs: Document "ldap page size".
  from  5832bc1... s3:docs: Document "enable core files".

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


- Log -
commit 93bbbd3cc776e4aa69239cb086067ec953fc8c8e
Author: Karolin Seeger 
Date:   Mon Nov 30 13:34:34 2009 +0100

s3:docs: Document "aio write behind".

Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).

Karolin
(cherry picked from commit fde7c2ab19bc7442d8ee9d85ab2fe54e0cfb4782)
(cherry picked from commit 267ebc03b43dd8c11f5aebf341620b0d94d95135)

commit a1d8a6127448fbdc25d1d87a2541a2ea8e430e17
Author: Karolin Seeger 
Date:   Mon Nov 30 12:29:27 2009 +0100

s3:docs: Document "ldap page size".

Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).

Karolin
(cherry picked from commit 9478ec35b5349f50a61bbe2aa88af88577918e91)
(cherry picked from commit 940121d666b9e0645584c93db178b763ac5c8c04)

---

Summary of changes:
 docs-xml/smbdotconf/ldap/ldappagesize.xml |   18 ++
 docs-xml/smbdotconf/tuning/aiowritebehind.xml |   23 +++
 2 files changed, 41 insertions(+), 0 deletions(-)
 create mode 100644 docs-xml/smbdotconf/ldap/ldappagesize.xml
 create mode 100644 docs-xml/smbdotconf/tuning/aiowritebehind.xml


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/ldap/ldappagesize.xml 
b/docs-xml/smbdotconf/ldap/ldappagesize.xml
new file mode 100644
index 000..bc09b98
--- /dev/null
+++ b/docs-xml/smbdotconf/ldap/ldappagesize.xml
@@ -0,0 +1,18 @@
+http://www.samba.org/samba/DTD/samba-doc";>
+
+   
+   This parameter specifies the number of entries per page.
+   
+
+   If the LDAP server supports paged results, clients can
+   request subsets of search results (pages) instead of the entire list.
+   This parameter specifies the size of these pages.
+   
+
+1024
+512
+
diff --git a/docs-xml/smbdotconf/tuning/aiowritebehind.xml 
b/docs-xml/smbdotconf/tuning/aiowritebehind.xml
new file mode 100644
index 000..c88cd97
--- /dev/null
+++ b/docs-xml/smbdotconf/tuning/aiowritebehind.xml
@@ -0,0 +1,23 @@
+http://www.samba.org/samba/DTD/samba-doc";>
+
+   If Samba has been built with asynchronous I/O support,
+   Samba will not wait until write requests are finished before returning
+   the result to the client for files listed in this parameter.
+   Instead, Samba will immediately return that the write
+   request has been finished successfully, no matter if the
+   operation will succeed or not. This might speed up clients without
+   aio support, but is really dangerous, because data could be lost
+   and files could be damaged.
+   
+   
+   The syntax is identical to the 
+   parameter.
+   
+
+
+
+/*.tmp/
+


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
   via  267ebc0... s3:docs: Document "aio write behind".
   via  940121d... s3:docs: Document "ldap page size".
  from  509b424... s3: Fix commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6.

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


- Log -
commit 267ebc03b43dd8c11f5aebf341620b0d94d95135
Author: Karolin Seeger 
Date:   Mon Nov 30 13:34:34 2009 +0100

s3:docs: Document "aio write behind".

Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).

Karolin
(cherry picked from commit fde7c2ab19bc7442d8ee9d85ab2fe54e0cfb4782)

commit 940121d666b9e0645584c93db178b763ac5c8c04
Author: Karolin Seeger 
Date:   Mon Nov 30 12:29:27 2009 +0100

s3:docs: Document "ldap page size".

Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).

Karolin
(cherry picked from commit 9478ec35b5349f50a61bbe2aa88af88577918e91)

---

Summary of changes:
 docs-xml/smbdotconf/ldap/ldappagesize.xml |   18 ++
 docs-xml/smbdotconf/tuning/aiowritebehind.xml |   23 +++
 2 files changed, 41 insertions(+), 0 deletions(-)
 create mode 100644 docs-xml/smbdotconf/ldap/ldappagesize.xml
 create mode 100644 docs-xml/smbdotconf/tuning/aiowritebehind.xml


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/ldap/ldappagesize.xml 
b/docs-xml/smbdotconf/ldap/ldappagesize.xml
new file mode 100644
index 000..bc09b98
--- /dev/null
+++ b/docs-xml/smbdotconf/ldap/ldappagesize.xml
@@ -0,0 +1,18 @@
+http://www.samba.org/samba/DTD/samba-doc";>
+
+   
+   This parameter specifies the number of entries per page.
+   
+
+   If the LDAP server supports paged results, clients can
+   request subsets of search results (pages) instead of the entire list.
+   This parameter specifies the size of these pages.
+   
+
+1024
+512
+
diff --git a/docs-xml/smbdotconf/tuning/aiowritebehind.xml 
b/docs-xml/smbdotconf/tuning/aiowritebehind.xml
new file mode 100644
index 000..c88cd97
--- /dev/null
+++ b/docs-xml/smbdotconf/tuning/aiowritebehind.xml
@@ -0,0 +1,23 @@
+http://www.samba.org/samba/DTD/samba-doc";>
+
+   If Samba has been built with asynchronous I/O support,
+   Samba will not wait until write requests are finished before returning
+   the result to the client for files listed in this parameter.
+   Instead, Samba will immediately return that the write
+   request has been finished successfully, no matter if the
+   operation will succeed or not. This might speed up clients without
+   aio support, but is really dangerous, because data could be lost
+   and files could be damaged.
+   
+   
+   The syntax is identical to the 
+   parameter.
+   
+
+
+
+/*.tmp/
+


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

[Karolin Seeger]

The branch, master has been updated
   via  fde7c2a... s3:docs: Document "aio write behind".
   via  9478ec3... s3:docs: Document "ldap page size".
  from  62a2732... s3: Fix crash in free_file_list().

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit fde7c2ab19bc7442d8ee9d85ab2fe54e0cfb4782
Author: Karolin Seeger 
Date:   Mon Nov 30 13:34:34 2009 +0100

s3:docs: Document "aio write behind".

Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).

Karolin

commit 9478ec35b5349f50a61bbe2aa88af88577918e91
Author: Karolin Seeger 
Date:   Mon Nov 30 12:29:27 2009 +0100

s3:docs: Document "ldap page size".

Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).

Karolin

---

Summary of changes:
 docs-xml/smbdotconf/ldap/ldappagesize.xml |   18 ++
 docs-xml/smbdotconf/tuning/aiowritebehind.xml |   23 +++
 2 files changed, 41 insertions(+), 0 deletions(-)
 create mode 100644 docs-xml/smbdotconf/ldap/ldappagesize.xml
 create mode 100644 docs-xml/smbdotconf/tuning/aiowritebehind.xml


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/ldap/ldappagesize.xml 
b/docs-xml/smbdotconf/ldap/ldappagesize.xml
new file mode 100644
index 000..bc09b98
--- /dev/null
+++ b/docs-xml/smbdotconf/ldap/ldappagesize.xml
@@ -0,0 +1,18 @@
+http://www.samba.org/samba/DTD/samba-doc";>
+
+   
+   This parameter specifies the number of entries per page.
+   
+
+   If the LDAP server supports paged results, clients can
+   request subsets of search results (pages) instead of the entire list.
+   This parameter specifies the size of these pages.
+   
+
+1024
+512
+
diff --git a/docs-xml/smbdotconf/tuning/aiowritebehind.xml 
b/docs-xml/smbdotconf/tuning/aiowritebehind.xml
new file mode 100644
index 000..c88cd97
--- /dev/null
+++ b/docs-xml/smbdotconf/tuning/aiowritebehind.xml
@@ -0,0 +1,23 @@
+http://www.samba.org/samba/DTD/samba-doc";>
+
+   If Samba has been built with asynchronous I/O support,
+   Samba will not wait until write requests are finished before returning
+   the result to the client for files listed in this parameter.
+   Instead, Samba will immediately return that the write
+   request has been finished successfully, no matter if the
+   operation will succeed or not. This might speed up clients without
+   aio support, but is really dangerous, because data could be lost
+   and files could be damaged.
+   
+   
+   The syntax is identical to the 
+   parameter.
+   
+
+
+
+/*.tmp/
+


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-5-test updated

[Bo Yang]

The branch, v3-5-test has been updated
   via  509b424... s3: Fix commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6.
  from  e1468d0... s4-smbtorture: more and stricter tests for printer and 
data keys in RPC-SPOOLSS.

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


- Log -
commit 509b42486e5f98343d95100c12969703398a248d
Author: Bo Yang 
Date:   Mon Nov 30 19:39:33 2009 +0800

s3: Fix commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6.

Signed-off-by: Bo Yang 

---

Summary of changes:
 source3/param/loadparm.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 1c79ff6..641f7ad 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -7093,7 +7093,7 @@ bool lp_file_list_changed(void)
return true;
}
} else {
-   n2 = alloc_sub_basic(get_current_username(),
+   n2 = talloc_sub_basic(get_current_username(),
current_user_info.domain,
f->name);
if (!n2) {
@@ -7118,7 +7118,7 @@ bool lp_file_list_changed(void)
TALLOC_FREE(n2);
return true;
}
-   SAFE_FREE(n2);
+   TALLOC_FREE(n2);
}
f = f->next;
}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-5-test updated

[Günther Deschner]

The branch, v3-5-test has been updated
   via  e1468d0... s4-smbtorture: more and stricter tests for printer and 
data keys in RPC-SPOOLSS.
   via  3788ac8... s3-kerberos: fix the build on Mac OS X 10.6.2.
   via  80da9b6... s3-kerberos: add a missing reference to authdata headers.
   via  15bc4a0... s3-kerberos: do not include authdata headers before 
including krb5 headers.
   via  281e098... s3-spoolss: simplify _spoolss_EnumPrinterKey a little 
more.
   via  da926c1... s3-kerberos: only use krb5 headers where required.
   via  a6d3e0e... misc: mark winreg_Data little-endian except for a 
REG_DWORD_BIG_ENDIAN.
   via  8f1361e... pidl: fix handling of output arguments in s3 client 
stubs.
   via  2b7e84f... s3-nsstest: drastically shrink size and dependencies of 
nsstest binary.
   via  b22a752... s3-kerberos: Fix Bug #6929: build with recent heimdal.
   via  f0d52b5... s3-spoolss: use macros to fillup driver levels.
  from  9b5f8eb... s3: Fix crash in free_file_list().

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


- Log -
commit e1468d0935140f99412dc92b32d38e64c21d6b75
Author: Günther Deschner 
Date:   Fri Nov 27 23:14:27 2009 +0100

s4-smbtorture: more and stricter tests for printer and data keys in 
RPC-SPOOLSS.

Guenther
(cherry picked from commit 8f6df5d3ec31a8c3dedfdfc506c44e03026d8485)

commit 3788ac88eff1b8912916d9f5f288545741c26f11
Author: Günther Deschner 
Date:   Fri Nov 27 20:08:44 2009 +0100

s3-kerberos: fix the build on Mac OS X 10.6.2.

Guenther
(cherry picked from commit 51328a7056918bc75a7c1c442f47cf0271075542)

commit 80da9b6fe45122f847bb3219779f4d4f59484398
Author: Günther Deschner 
Date:   Fri Nov 27 18:51:56 2009 +0100

s3-kerberos: add a missing reference to authdata headers.

Guenther
(cherry picked from commit da79cbb0800dd647be864e8bbb5fe1132708174b)

commit 15bc4a0a928a0b750e09be49455a831d607c449f
Author: Günther Deschner 
Date:   Fri Nov 27 18:30:18 2009 +0100

s3-kerberos: do not include authdata headers before including krb5 headers.

Guenther
(cherry picked from commit ae207370667a12db53362ee5dcdab8e6d4bb388f)

commit 281e09887cbca031600b52850b31e04bfa758e6e
Author: Günther Deschner 
Date:   Thu Nov 26 19:01:54 2009 +0100

s3-spoolss: simplify _spoolss_EnumPrinterKey a little more.

Guenther
(cherry picked from commit e512ccb5b677fa7f285829ec645fc067837c0e11)

commit da926c1249705b95344730539c64111876955151
Author: Günther Deschner 
Date:   Fri Nov 27 15:52:57 2009 +0100

s3-kerberos: only use krb5 headers where required.

This seems to be the only way to deal with mixed heimdal/MIT setups during
merged build.

Guenther
(cherry picked from commit 04f8c229de7ffad5f4ec1a0bb68c2c8b4ccf4e15)

commit a6d3e0e7f20f393f1040cca57b3a0a5b91f064c1
Author: Günther Deschner 
Date:   Fri Nov 27 11:18:30 2009 +0100

misc: mark winreg_Data little-endian except for a REG_DWORD_BIG_ENDIAN.

Guenther
(cherry picked from commit 23d77be6cb8847cbdad859269faf59fea30b27b8)

commit 8f1361e627aba9ef3f207cb9a38c4394bd55ccff
Author: Günther Deschner 
Date:   Fri Nov 27 16:06:40 2009 +0100

pidl: fix handling of output arguments in s3 client stubs.

a20e095 used (uint8_t) instead of (uint8_t *).

Guenther
(cherry picked from commit 79f82998b1aa8349f76a4c82c17daf7e03cdb41a)

commit 2b7e84f217b523aec81f160740f63d50e4f00a05
Author: Günther Deschner 
Date:   Thu Jun 25 18:18:50 2009 +0200

s3-nsstest: drastically shrink size and dependencies of nsstest binary.

The size went down from 6.4M to 104K on my box.

Guenther
(cherry picked from commit d6c60f8447ce92a15d48a35d3f21d881c4428663)

commit b22a7521f62c2ae0d4a8fca4c5b9985de7adee26
Author: Günther Deschner 
Date:   Fri Nov 27 01:06:36 2009 +0100

s3-kerberos: Fix Bug #6929: build with recent heimdal.

Heimdal changed the KRB5_DEPRECATED define (which now may not take an 
identifier
for activation) in new releases (like 1.3.1).

Guenther
(cherry picked from commit 1a8f8382740e352a83133b8c49aaedd4716210cd)

commit f0d52b55896fbb1802aa90fa5ec2b16438373ccf
Author: Günther Deschner 
Date:   Thu Nov 26 23:46:50 2009 +0100

s3-spoolss: use macros to fillup driver levels.

Guenther
(cherry picked from commit 49e464cef5ed75976fcd6c544bffbd4391f3a1b6)

---

Summary of changes:
 client/cifs.upcall.c|1 +
 librpc/gen_ndr/cli_spoolss.c|8 +-
 librpc/gen_ndr/misc.h   |2 +-
 librpc/gen_ndr/ndr_misc.c   |  357 ++
 librpc/idl/misc.idl |4 +-
 pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm |2 +-
 source3/Makefile.in |   1

[SCM] Samba Shared Repository - branch v3-5-test updated

[Bo Yang]

The branch, v3-5-test has been updated
   via  9b5f8eb... s3: Fix crash in free_file_list().
  from  15f7b70... s3:docs: Document "enable core files".

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


- Log -
commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6
Author: Bo Yang 
Date:   Mon Nov 30 17:30:25 2009 +0800

s3: Fix crash in free_file_list().

Signed-off-by: Bo Yang 
(cherry picked from commit 62a27325d99cf4371fe98d049110e585dd209c98)

---

Summary of changes:
 source3/param/loadparm.c |7 ---
 1 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 9da853f..1c79ff6 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -7016,6 +7016,7 @@ static void add_to_file_list(const char *fname, const 
char *subfname)
}
f->subfname = SMB_STRDUP(subfname);
if (!f->subfname) {
+   SAFE_FREE(f->name);
SAFE_FREE(f);
return;
}
@@ -7026,6 +7027,7 @@ static void add_to_file_list(const char *fname, const 
char *subfname)
if (t)
f->modtime = t;
}
+   return;
 }
 
 /**
@@ -7112,9 +7114,8 @@ bool lp_file_list_changed(void)
  ctime(&mod_time)));
f->modtime = mod_time;
SAFE_FREE(f->subfname);
-   f->subfname = n2; /* Passing ownership of
-return from alloc_sub_basic
-above. */
+   f->subfname = SMB_STRDUP(n2);
+   TALLOC_FREE(n2);
return true;
}
SAFE_FREE(n2);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

[Bo Yang]

The branch, master has been updated
   via  62a2732... s3: Fix crash in free_file_list().
  from  b03ad70... s3:docs: Document "enable core files".

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 62a27325d99cf4371fe98d049110e585dd209c98
Author: Bo Yang 
Date:   Mon Nov 30 17:30:25 2009 +0800

s3: Fix crash in free_file_list().

Signed-off-by: Bo Yang 

---

Summary of changes:
 source3/param/loadparm.c |7 ---
 1 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 29e3a25..a1f5328 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -7016,6 +7016,7 @@ static void add_to_file_list(const char *fname, const 
char *subfname)
}
f->subfname = SMB_STRDUP(subfname);
if (!f->subfname) {
+   SAFE_FREE(f->name);
SAFE_FREE(f);
return;
}
@@ -7026,6 +7027,7 @@ static void add_to_file_list(const char *fname, const 
char *subfname)
if (t)
f->modtime = t;
}
+   return;
 }
 
 /**
@@ -7113,9 +7115,8 @@ bool lp_file_list_changed(void)
  ctime(&mod_time)));
f->modtime = mod_time;
SAFE_FREE(f->subfname);
-   f->subfname = n2; /* Passing ownership of
-return from alloc_sub_basic
-above. */
+   f->subfname = SMB_STRDUP(n2);
+   TALLOC_FREE(n2);
return true;
}
TALLOC_FREE(n2);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-3-test updated

[Karolin Seeger]

The branch, v3-3-test has been updated
   via  f837338... s3:docs: Document "enable core files".
  from  ff9d209... s3: Fix bug 6338 -- net rpc trustdom list always display 
"none"

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


- Log -
commit f83733838bf94348c98dbc724d86c9021053639b
Author: Karolin Seeger 
Date:   Mon Nov 30 11:40:06 2009 +0100

s3:docs: Document "enable core files".

Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).

Karolin
(cherry picked from commit b03ad70848e6ea889f382c0cb9f21057370f1ab6)
(cherry picked from commit 15f7b70b0e6b6bd2604255cff1c351bb0425e9f3)
(cherry picked from commit 5832bc1c5896b391131952a06013154cbdafe3f9)

---

Summary of changes:
 docs-xml/smbdotconf/base/enablecorefiles.xml |   15 +++
 1 files changed, 15 insertions(+), 0 deletions(-)
 create mode 100644 docs-xml/smbdotconf/base/enablecorefiles.xml


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/base/enablecorefiles.xml 
b/docs-xml/smbdotconf/base/enablecorefiles.xml
new file mode 100644
index 000..8c8bacf
--- /dev/null
+++ b/docs-xml/smbdotconf/base/enablecorefiles.xml
@@ -0,0 +1,15 @@
+http://www.samba.org/samba/DTD/samba-doc";>
+
+
+This parameter specifies whether core dumps should be written
+   on internal exits. Normally set to yes.
+   You should never need to change this.
+   
+
+
+   yes
+   no
+


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-4-test updated

[Karolin Seeger]

The branch, v3-4-test has been updated
   via  5832bc1... s3:docs: Document "enable core files".
  from  7e95377... s3:docs: Document "cache directory" and "state 
directory".

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


- Log -
commit 5832bc1c5896b391131952a06013154cbdafe3f9
Author: Karolin Seeger 
Date:   Mon Nov 30 11:40:06 2009 +0100

s3:docs: Document "enable core files".

Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).

Karolin
(cherry picked from commit b03ad70848e6ea889f382c0cb9f21057370f1ab6)
(cherry picked from commit 15f7b70b0e6b6bd2604255cff1c351bb0425e9f3)

---

Summary of changes:
 docs-xml/smbdotconf/base/enablecorefiles.xml |   15 +++
 1 files changed, 15 insertions(+), 0 deletions(-)
 create mode 100644 docs-xml/smbdotconf/base/enablecorefiles.xml


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/base/enablecorefiles.xml 
b/docs-xml/smbdotconf/base/enablecorefiles.xml
new file mode 100644
index 000..8c8bacf
--- /dev/null
+++ b/docs-xml/smbdotconf/base/enablecorefiles.xml
@@ -0,0 +1,15 @@
+http://www.samba.org/samba/DTD/samba-doc";>
+
+
+This parameter specifies whether core dumps should be written
+   on internal exits. Normally set to yes.
+   You should never need to change this.
+   
+
+
+   yes
+   no
+


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
   via  15f7b70... s3:docs: Document "enable core files".
  from  d677cea... s3:docs: Document "cache directory" and "state 
directory".

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


- Log -
commit 15f7b70b0e6b6bd2604255cff1c351bb0425e9f3
Author: Karolin Seeger 
Date:   Mon Nov 30 11:40:06 2009 +0100

s3:docs: Document "enable core files".

Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).

Karolin
(cherry picked from commit b03ad70848e6ea889f382c0cb9f21057370f1ab6)

---

Summary of changes:
 docs-xml/smbdotconf/base/enablecorefiles.xml |   15 +++
 1 files changed, 15 insertions(+), 0 deletions(-)
 create mode 100644 docs-xml/smbdotconf/base/enablecorefiles.xml


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/base/enablecorefiles.xml 
b/docs-xml/smbdotconf/base/enablecorefiles.xml
new file mode 100644
index 000..8c8bacf
--- /dev/null
+++ b/docs-xml/smbdotconf/base/enablecorefiles.xml
@@ -0,0 +1,15 @@
+http://www.samba.org/samba/DTD/samba-doc";>
+
+
+This parameter specifies whether core dumps should be written
+   on internal exits. Normally set to yes.
+   You should never need to change this.
+   
+
+
+   yes
+   no
+


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

[Karolin Seeger]

The branch, master has been updated
   via  b03ad70... s3:docs: Document "enable core files".
  from  7399c04... s4-drs: Test situations for runtime constructed 
parentGUID

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit b03ad70848e6ea889f382c0cb9f21057370f1ab6
Author: Karolin Seeger 
Date:   Mon Nov 30 11:40:06 2009 +0100

s3:docs: Document "enable core files".

Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).

Karolin

---

Summary of changes:
 docs-xml/smbdotconf/base/enablecorefiles.xml |   15 +++
 1 files changed, 15 insertions(+), 0 deletions(-)
 create mode 100644 docs-xml/smbdotconf/base/enablecorefiles.xml


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/base/enablecorefiles.xml 
b/docs-xml/smbdotconf/base/enablecorefiles.xml
new file mode 100644
index 000..8c8bacf
--- /dev/null
+++ b/docs-xml/smbdotconf/base/enablecorefiles.xml
@@ -0,0 +1,15 @@
+http://www.samba.org/samba/DTD/samba-doc";>
+
+
+This parameter specifies whether core dumps should be written
+   on internal exits. Normally set to yes.
+   You should never need to change this.
+   
+
+
+   yes
+   no
+


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
   via  7399c04... s4-drs: Test situations for runtime constructed 
parentGUID
   via  71e29cb... s4-drs: Using dsdb_msg_add_guid() utility function
  from  0003b5f... s3:docs: Document "cache directory" and "state 
directory".

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 7399c04fd0b509079117426b28853a0aa3f87d2d
Author: Fernando J V da Silva 
Date:   Fri Nov 27 12:25:18 2009 -0200

s4-drs: Test situations for runtime constructed parentGUID

Includes the following verifications for the constructed parentGUID:
- Checks if it returns nothing when there is no parent object
- Ensures that attributes mentioned after the parentGUID
are returned correctly (this avoid a bug pointed out by Tridge
during sync constructed parentGUID development)

Signed-off-by: Andrew Tridgell 

commit 71e29cbf56048791057ccf07b859654312f3882e
Author: Fernando J V da Silva 
Date:   Wed Nov 25 17:01:55 2009 -0300

s4-drs: Using dsdb_msg_add_guid() utility function

Uses the dsdb_msg_add_guid() to add any kind of GUID attribute
to a ldb_message in several places of samba4 code.

Signed-off-by: Andrew Tridgell 

---

Summary of changes:
 source4/dsdb/samdb/ldb_modules/objectguid.c |   13 +-
 source4/dsdb/samdb/ldb_modules/repl_meta_data.c |   12 +-
 source4/dsdb/samdb/ldb_modules/samldb.c |   26 +-
 source4/lib/ldb/tests/python/ldap.py|   25 +-
 source4/utils/oLschema2ldif.c   |9 +---
 5 files changed, 30 insertions(+), 55 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/objectguid.c 
b/source4/dsdb/samdb/ldb_modules/objectguid.c
index 12dd402..bfbf2b4 100644
--- a/source4/dsdb/samdb/ldb_modules/objectguid.c
+++ b/source4/dsdb/samdb/ldb_modules/objectguid.c
@@ -31,6 +31,7 @@
 
 #include "includes.h"
 #include "ldb_module.h"
+#include "dsdb/samdb/samdb.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "param/param.h"
 
@@ -136,10 +137,8 @@ static int objectguid_add(struct ldb_module *module, 
struct ldb_request *req)
struct ldb_request *down_req;
struct ldb_message_element *attribute;
struct ldb_message *msg;
-   struct ldb_val v;
struct GUID guid;
uint64_t seq_num;
-   enum ndr_err_code ndr_err;
int ret;
time_t t = time(NULL);
struct og_context *ac;
@@ -174,15 +173,7 @@ static int objectguid_add(struct ldb_module *module, 
struct ldb_request *req)
/* a new GUID */
guid = GUID_random();
 
-   ndr_err = ndr_push_struct_blob(&v, msg, 
-  lp_iconv_convenience(ldb_get_opaque(ldb, 
"loadparm")),
-  &guid,
-  (ndr_push_flags_fn_t)ndr_push_GUID);
-   if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-   return LDB_ERR_OPERATIONS_ERROR;
-   }
-
-   ret = ldb_msg_add_value(msg, "objectGUID", &v, NULL);
+   ret = dsdb_msg_add_guid(msg, &guid, "objectGUID");
if (ret) {
return ret;
}
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c 
b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 37aa399..bfde2df 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -411,7 +411,6 @@ static int replmd_add(struct ldb_module *module, struct 
ldb_request *req)
struct ldb_message *msg;
 const DATA_BLOB *guid_blob;
struct GUID guid;
-   struct ldb_val guid_value;
struct replPropertyMetaDataBlob nmd;
struct ldb_val nmd_value;
const struct GUID *our_invocation_id;
@@ -580,15 +579,6 @@ static int replmd_add(struct ldb_module *module, struct 
ldb_request *req)
}
 
/* generated NDR encoded values */
-   ndr_err = ndr_push_struct_blob(&guid_value, msg, 
-  NULL,
-  &guid,
-  (ndr_push_flags_fn_t)ndr_push_GUID);
-   if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-   ldb_oom(ldb);
-   talloc_free(ac);
-   return LDB_ERR_OPERATIONS_ERROR;
-   }
ndr_err = ndr_push_struct_blob(&nmd_value, msg, 
   lp_iconv_convenience(ldb_get_opaque(ldb, 
"loadparm")),
   &nmd,
@@ -602,7 +592,7 @@ static int replmd_add(struct ldb_module *module, struct 
ldb_request *req)
/*
 * add the autogenerated values
 */
-   ret = ldb_msg_add_value(msg, "objectGUID", &guid_value, NULL);
+   ret = dsdb_msg_add_guid(msg, &guid, "objectGUID");

[SCM] Samba Shared Repository - branch v3-4-test updated

[Karolin Seeger]

The branch, v3-4-test has been updated
   via  7e95377... s3:docs: Document "cache directory" and "state 
directory".
  from  f35a774... create-tarball: Make it more comfortable to use the 
--copy-docs option.

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


- Log -
commit 7e9537792a8c5b8aad27a14ca5968aa8327a89bd
Author: Karolin Seeger 
Date:   Mon Nov 30 11:04:50 2009 +0100

s3:docs: Document "cache directory" and "state directory".

Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).

Karolin
(cherry picked from commit 0003b5fad1dee687bc15dfad9f71b6dfc40556d7)
(cherry picked from commit d677cea90f0b28d65ddba551acaed9157ea30c2e)

---

Summary of changes:
 docs-xml/smbdotconf/misc/cachedirectory.xml |   22 ++
 docs-xml/smbdotconf/misc/statedirectory.xml |   22 ++
 2 files changed, 44 insertions(+), 0 deletions(-)
 create mode 100644 docs-xml/smbdotconf/misc/cachedirectory.xml
 create mode 100644 docs-xml/smbdotconf/misc/statedirectory.xml


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/misc/cachedirectory.xml 
b/docs-xml/smbdotconf/misc/cachedirectory.xml
new file mode 100644
index 000..5216998
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/cachedirectory.xml
@@ -0,0 +1,22 @@
+http://www.samba.org/samba/DTD/samba-doc";>
+
+   Usually, most of the TDB files are stored in the lock directory. Since Samba 3.4.0, it is
+   possible to differentiate between TDB files with persistent data and
+   TDB files with non-persistent data using the
+   state directory and the
+   cache directory options.
+   
+
+This option specifies the directory where TDB files containing
+   non-persistent data will be stored.
+   
+
+
+${prefix}/var/locks
+/var/run/samba/locks/cache
+
diff --git a/docs-xml/smbdotconf/misc/statedirectory.xml 
b/docs-xml/smbdotconf/misc/statedirectory.xml
new file mode 100644
index 000..f8cfcdf
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/statedirectory.xml
@@ -0,0 +1,22 @@
+http://www.samba.org/samba/DTD/samba-doc";>
+
+   Usually, most of the TDB files are stored in the
+   lock directory. Since
+   Samba 3.4.0, it is possible to differentiate between TDB files
+   with persistent data and TDB files with non-persistent data using
+   the state directory and the
+   cache directory options.
+   
+
+This option specifies the directory where TDB files containing
+   persistent data will be stored.
+   
+
+
+${prefix}/var/locks
+/var/run/samba/locks/state
+


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
   via  d677cea... s3:docs: Document "cache directory" and "state 
directory".
  from  9038c6f... s3: Fix bug 6288

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


- Log -
commit d677cea90f0b28d65ddba551acaed9157ea30c2e
Author: Karolin Seeger 
Date:   Mon Nov 30 11:04:50 2009 +0100

s3:docs: Document "cache directory" and "state directory".

Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).

Karolin
(cherry picked from commit 0003b5fad1dee687bc15dfad9f71b6dfc40556d7)

---

Summary of changes:
 docs-xml/smbdotconf/misc/cachedirectory.xml |   22 ++
 docs-xml/smbdotconf/misc/statedirectory.xml |   22 ++
 2 files changed, 44 insertions(+), 0 deletions(-)
 create mode 100644 docs-xml/smbdotconf/misc/cachedirectory.xml
 create mode 100644 docs-xml/smbdotconf/misc/statedirectory.xml


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/misc/cachedirectory.xml 
b/docs-xml/smbdotconf/misc/cachedirectory.xml
new file mode 100644
index 000..5216998
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/cachedirectory.xml
@@ -0,0 +1,22 @@
+http://www.samba.org/samba/DTD/samba-doc";>
+
+   Usually, most of the TDB files are stored in the lock directory. Since Samba 3.4.0, it is
+   possible to differentiate between TDB files with persistent data and
+   TDB files with non-persistent data using the
+   state directory and the
+   cache directory options.
+   
+
+This option specifies the directory where TDB files containing
+   non-persistent data will be stored.
+   
+
+
+${prefix}/var/locks
+/var/run/samba/locks/cache
+
diff --git a/docs-xml/smbdotconf/misc/statedirectory.xml 
b/docs-xml/smbdotconf/misc/statedirectory.xml
new file mode 100644
index 000..f8cfcdf
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/statedirectory.xml
@@ -0,0 +1,22 @@
+http://www.samba.org/samba/DTD/samba-doc";>
+
+   Usually, most of the TDB files are stored in the
+   lock directory. Since
+   Samba 3.4.0, it is possible to differentiate between TDB files
+   with persistent data and TDB files with non-persistent data using
+   the state directory and the
+   cache directory options.
+   
+
+This option specifies the directory where TDB files containing
+   persistent data will be stored.
+   
+
+
+${prefix}/var/locks
+/var/run/samba/locks/state
+


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

[Karolin Seeger]

The branch, master has been updated
   via  0003b5f... s3:docs: Document "cache directory" and "state 
directory".
  from  b4bce76... s3: Fix bug 6288

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 0003b5fad1dee687bc15dfad9f71b6dfc40556d7
Author: Karolin Seeger 
Date:   Mon Nov 30 11:04:50 2009 +0100

s3:docs: Document "cache directory" and "state directory".

Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).

Karolin

---

Summary of changes:
 docs-xml/smbdotconf/misc/cachedirectory.xml |   22 ++
 docs-xml/smbdotconf/misc/statedirectory.xml |   22 ++
 2 files changed, 44 insertions(+), 0 deletions(-)
 create mode 100644 docs-xml/smbdotconf/misc/cachedirectory.xml
 create mode 100644 docs-xml/smbdotconf/misc/statedirectory.xml


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/misc/cachedirectory.xml 
b/docs-xml/smbdotconf/misc/cachedirectory.xml
new file mode 100644
index 000..5216998
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/cachedirectory.xml
@@ -0,0 +1,22 @@
+http://www.samba.org/samba/DTD/samba-doc";>
+
+   Usually, most of the TDB files are stored in the lock directory. Since Samba 3.4.0, it is
+   possible to differentiate between TDB files with persistent data and
+   TDB files with non-persistent data using the
+   state directory and the
+   cache directory options.
+   
+
+This option specifies the directory where TDB files containing
+   non-persistent data will be stored.
+   
+
+
+${prefix}/var/locks
+/var/run/samba/locks/cache
+
diff --git a/docs-xml/smbdotconf/misc/statedirectory.xml 
b/docs-xml/smbdotconf/misc/statedirectory.xml
new file mode 100644
index 000..f8cfcdf
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/statedirectory.xml
@@ -0,0 +1,22 @@
+http://www.samba.org/samba/DTD/samba-doc";>
+
+   Usually, most of the TDB files are stored in the
+   lock directory. Since
+   Samba 3.4.0, it is possible to differentiate between TDB files
+   with persistent data and TDB files with non-persistent data using
+   the state directory and the
+   cache directory options.
+   
+
+This option specifies the directory where TDB files containing
+   persistent data will be stored.
+   
+
+
+${prefix}/var/locks
+/var/run/samba/locks/state
+


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-5-test updated

[Volker Lendecke]

The branch, v3-5-test has been updated
   via  9038c6f... s3: Fix bug 6288
  from  dde5ac9... s3: Fix an uninitialized variable reference

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


- Log -
commit 9038c6f1a0779d59cd8f9125118b975071c8e68b
Author: Volker Lendecke 
Date:   Sun Nov 29 23:31:45 2009 +0100

s3: Fix bug 6288

---

Summary of changes:
 source3/web/swat.c |   16 
 1 files changed, 8 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 1d843a0..230b161 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -645,7 +645,7 @@ static void wizard_params_page(void)
 
if (cgi_variable("Commit")) {
commit_parameters(GLOBAL_SECTION_SNUM);
-   save_reload(0);
+   save_reload(-1);
}
 
printf("\n");
@@ -669,7 +669,7 @@ static void wizard_params_page(void)
 static void rewritecfg_file(void)
 {
commit_parameters(GLOBAL_SECTION_SNUM);
-   save_reload(0);
+   save_reload(-1);
printf("%s\n", _("Note: smb.conf file has been read and 
rewritten"));
 }
 
@@ -757,7 +757,7 @@ static void wizard_page(void)
}
 
commit_parameters(GLOBAL_SECTION_SNUM);
-   save_reload(0);
+   save_reload(-1);
}
else
{
@@ -851,7 +851,7 @@ static void globals_page(void)
 
if (cgi_variable("Commit")) {
commit_parameters(GLOBAL_SECTION_SNUM);
-   save_reload(0);
+   save_reload(-1);
}
 
if ( cgi_variable("ViewMode") )
@@ -909,13 +909,13 @@ static void shares_page(void)
 
if (cgi_variable("Commit") && snum >= 0) {
commit_parameters(snum);
-   save_reload(0);
+   save_reload(-1);
snum = lp_servicenumber(share);
}
 
if (cgi_variable("Delete") && snum >= 0) {
lp_remove_service(snum);
-   save_reload(0);
+   save_reload(-1);
share = NULL;
snum = -1;
}
@@ -1265,13 +1265,13 @@ static void printers_page(void)
if (snum >= iNumNonAutoPrintServices)
save_reload(snum);
else
-   save_reload(0);
+   save_reload(-1);
snum = lp_servicenumber(share);
}
 
if (cgi_variable("Delete") && snum >= 0) {
lp_remove_service(snum);
-   save_reload(0);
+   save_reload(-1);
share = NULL;
snum = -1;
}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
   via  b4bce76... s3: Fix bug 6288
  from  1cf4802... s4-drs: add deletion of old connections

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit b4bce76776714815874f78dbe1184072d3943741
Author: Volker Lendecke 
Date:   Sun Nov 29 23:31:45 2009 +0100

s3: Fix bug 6288

---

Summary of changes:
 source3/web/swat.c |   16 
 1 files changed, 8 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 8db175c..5e4b950 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -645,7 +645,7 @@ static void wizard_params_page(void)
 
if (cgi_variable("Commit")) {
commit_parameters(GLOBAL_SECTION_SNUM);
-   save_reload(0);
+   save_reload(-1);
}
 
printf("\n");
@@ -669,7 +669,7 @@ static void wizard_params_page(void)
 static void rewritecfg_file(void)
 {
commit_parameters(GLOBAL_SECTION_SNUM);
-   save_reload(0);
+   save_reload(-1);
printf("%s\n", _("Note: smb.conf file has been read and 
rewritten"));
 }
 
@@ -757,7 +757,7 @@ static void wizard_page(void)
}
 
commit_parameters(GLOBAL_SECTION_SNUM);
-   save_reload(0);
+   save_reload(-1);
}
else
{
@@ -851,7 +851,7 @@ static void globals_page(void)
 
if (cgi_variable("Commit")) {
commit_parameters(GLOBAL_SECTION_SNUM);
-   save_reload(0);
+   save_reload(-1);
}
 
if ( cgi_variable("ViewMode") )
@@ -909,13 +909,13 @@ static void shares_page(void)
 
if (cgi_variable("Commit") && snum >= 0) {
commit_parameters(snum);
-   save_reload(0);
+   save_reload(-1);
snum = lp_servicenumber(share);
}
 
if (cgi_variable("Delete") && snum >= 0) {
lp_remove_service(snum);
-   save_reload(0);
+   save_reload(-1);
share = NULL;
snum = -1;
}
@@ -1264,13 +1264,13 @@ static void printers_page(void)
if (snum >= iNumNonAutoPrintServices)
save_reload(snum);
else
-   save_reload(0);
+   save_reload(-1);
snum = lp_servicenumber(share);
}
 
if (cgi_variable("Delete") && snum >= 0) {
lp_remove_service(snum);
-   save_reload(0);
+   save_reload(-1);
share = NULL;
snum = -1;
}


-- 
Samba Shared Repository

[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 3.4.2-ctdb-12-15-g744e80a

[Michael Adam]

The branch, v3-4-ctdb has been updated
   via  744e80a0933412c24bdebf88b400e576cbeffcab (commit)
   via  d5c6f9f1f0ada80bb4b6557eb6be83d6e807aaf8 (commit)
  from  5fb50b51268e80ce755116b1c62957f6069c3741 (commit)

http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb


- Log -
commit 744e80a0933412c24bdebf88b400e576cbeffcab
Author: Volker Lendecke 
Date:   Mon Nov 16 12:03:24 2009 +0100

s3: Do not connect to ctdb if it is blocked for some reason

commit d5c6f9f1f0ada80bb4b6557eb6be83d6e807aaf8
Author: Volker Lendecke 
Date:   Thu Nov 26 17:58:01 2009 +0100

s3: Fix the winbind piece of 58045: Correctly time out client smb requests

---

Summary of changes:
 lib/async_req/async_req.c  |   25 +++
 lib/async_req/async_req.h  |8 ++
 source3/lib/ctdbd_conn.c   |   58 
 source3/libsmb/async_smb.c |9 +++
 4 files changed, 100 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/async_req/async_req.c b/lib/async_req/async_req.c
index 4dfe809..69c3ed6 100644
--- a/lib/async_req/async_req.c
+++ b/lib/async_req/async_req.c
@@ -78,6 +78,31 @@ static void async_req_finish(struct async_req *req, enum 
async_req_state state)
}
 }
 
+static void async_req_timedout(struct event_context *ev,
+  struct timed_event *te,
+  struct timeval now,
+  void *private_data)
+{
+   struct async_req *req = talloc_get_type_abort(
+   private_data, struct async_req);
+   TALLOC_FREE(req->timer);
+   async_req_finish(req, ASYNC_REQ_TIMED_OUT);
+}
+
+bool async_req_set_endtime(struct async_req *req, struct event_context *ev,
+  struct timeval endtime)
+{
+   struct timed_event *te;
+
+   te = event_add_timed(ev, req, endtime, async_req_timedout, req);
+   if (te == NULL) {
+   return false;
+   }
+   TALLOC_FREE(req->timer);
+   req->timer = te;
+   return true;
+}
+
 /**
  * @brief An async request has successfully finished
  * @param[in] req  The finished request
diff --git a/lib/async_req/async_req.h b/lib/async_req/async_req.h
index fdec1b7..7a9220b 100644
--- a/lib/async_req/async_req.h
+++ b/lib/async_req/async_req.h
@@ -121,10 +121,18 @@ struct async_req {
 */
void *priv;
} async;
+
+   /*
+* Individual timeout event for this async_req
+*/
+   struct timed_event *timer;
 };
 
 struct async_req *async_req_new(TALLOC_CTX *mem_ctx);
 
+bool async_req_set_endtime(struct async_req *req, struct event_context *ev,
+  struct timeval endtime);
+
 char *async_req_print(TALLOC_CTX *mem_ctx, struct async_req *req);
 
 void async_req_done(struct async_req *req);
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 291fa3c..9101bd4 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -104,6 +104,59 @@ static NTSTATUS get_cluster_vnn(struct ctdbd_connection 
*conn, uint32 *vnn)
return status;
 }
 
+/*
+ * Are we active (i.e. not banned or stopped?)
+ */
+static bool ctdbd_working(struct ctdbd_connection *conn, uint32_t vnn)
+{
+   int32_t cstatus=-1;
+   NTSTATUS status;
+   TDB_DATA outdata;
+   struct ctdb_node_map *m;
+   uint32_t failure_flags;
+   bool ret = false;
+   int i;
+
+   status = ctdbd_control(conn, CTDB_CURRENT_NODE,
+  CTDB_CONTROL_GET_NODEMAP, 0, 0,
+  tdb_null, talloc_tos(), &outdata, &cstatus);
+   if (!NT_STATUS_IS_OK(status)) {
+   cluster_fatal("ctdbd_control failed\n");
+   }
+   if ((cstatus != 0) || (outdata.dptr == NULL)) {
+   DEBUG(2, ("Received invalid ctdb data\n"));
+   return false;
+   }
+
+   m = (struct ctdb_node_map *)outdata.dptr;
+
+   for (i=0; inum; i++) {
+   if (vnn == m->nodes[i].pnn) {
+   break;
+   }
+   }
+
+   if (i == m->num) {
+   DEBUG(2, ("Did not find ourselves (node %d) in nodemap\n",
+ (int)vnn));
+   goto fail;
+   }
+
+   failure_flags = NODE_FLAGS_BANNED | NODE_FLAGS_DISCONNECTED
+   | NODE_FLAGS_PERMANENTLY_DISABLED | NODE_FLAGS_STOPPED;
+
+   if ((m->nodes[i].flags & failure_flags) != 0) {
+   DEBUG(2, ("Node has status %x, not active\n",
+ (int)m->nodes[i].flags));
+   goto fail;
+   }
+
+   ret = true;
+fail:
+   TALLOC_FREE(outdata.dptr);
+   return ret;;
+}
+
 uint32 ctdbd_vnn(const struct ctdbd_connection *conn)
 {
return conn->our_vnn;
@@ -448,6 +501,11 @@ NTSTA

[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
   via  1cf4802... s4-drs: add deletion of old connections
   via  bed9efa... s4-ldb: changed ldb_msg_add_dn() to 
ldb_msg_add_linearized_dn()
   via  7ca2ceb... s4-drs: Create connection obejct (nTDSConnection)
  from  8331b4c... s4-ldb: check for -ve value for page size

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 1cf48022afab79e1fc462b18032d0e497ed15ecf
Author: Crístian Deives 
Date:   Mon Nov 30 20:12:24 2009 +1100

s4-drs: add deletion of old connections

the nTDSConnection objects that are not needed anymore will be deleted.
the function kccsrv_delete_connection wasn't tested yet.

Signed-off-by: Andrew Tridgell 

commit bed9efa6cda17ecca91bdf71227ec656b94dcf94
Author: Crístian Deives 
Date:   Mon Nov 23 15:47:51 2009 -0200

s4-ldb: changed ldb_msg_add_dn() to ldb_msg_add_linearized_dn()

this makes the usage clearer

Signed-off-by: Andrew Tridgell 

commit 7ca2ceb333de6c4daad10890b3e3022e1930235c
Author: Crístian Deives 
Date:   Mon Nov 30 20:11:27 2009 +1100

s4-drs: Create connection obejct (nTDSConnection)

create nTDSConnection objects to match the list of servers

Signed-off-by: Andrew Tridgell 

---

Summary of changes:
 source4/dsdb/config.mk   |1 +
 source4/dsdb/kcc/kcc_connection.c|  227 ++
 source4/dsdb/kcc/kcc_connection.h|   38 
 source4/dsdb/kcc/kcc_periodic.c  |   17 ++
 source4/dsdb/samdb/ldb_modules/extended_dn_out.c |6 +-
 source4/lib/ldb/common/ldb_msg.c |7 +-
 source4/lib/ldb/include/ldb.h|4 +-
 source4/lib/ldb/ldb_map/ldb_map_inbound.c|9 +-
 8 files changed, 298 insertions(+), 11 deletions(-)
 create mode 100644 source4/dsdb/kcc/kcc_connection.c
 create mode 100644 source4/dsdb/kcc/kcc_connection.h


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk
index ac4096d..dfc5def 100644
--- a/source4/dsdb/config.mk
+++ b/source4/dsdb/config.mk
@@ -82,6 +82,7 @@ PRIVATE_DEPENDENCIES = \
 
 KCC_SRV_OBJ_FILES = $(addprefix $(dsdbsrcdir)/kcc/, \
kcc_service.o \
+   kcc_connection.o \
kcc_periodic.o)
 
 $(eval $(call 
proto_header_template,$(dsdbsrcdir)/kcc/kcc_service_proto.h,$(KCC_SRV_OBJ_FILES:.o=.c)))
diff --git a/source4/dsdb/kcc/kcc_connection.c 
b/source4/dsdb/kcc/kcc_connection.c
new file mode 100644
index 000..ee9a05a
--- /dev/null
+++ b/source4/dsdb/kcc/kcc_connection.c
@@ -0,0 +1,227 @@
+/*
+   Unix SMB/CIFS implementation.
+   KCC service periodic handling
+
+   Copyright (C) Crístian Deives
+
+   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 "dsdb/samdb/samdb.h"
+#include "auth/auth.h"
+#include "smbd/service.h"
+#include "lib/messaging/irpc.h"
+#include "dsdb/kcc/kcc_connection.h"
+#include "dsdb/kcc/kcc_service.h"
+#include "lib/ldb/include/ldb_errors.h"
+#include "../lib/util/dlinklist.h"
+#include "librpc/gen_ndr/ndr_misc.h"
+#include "librpc/gen_ndr/ndr_drsuapi.h"
+#include "librpc/gen_ndr/ndr_drsblobs.h"
+#include "param/param.h"
+
+static int kccsrv_add_connection(struct kccsrv_service *s,
+struct kcc_connection *conn)
+{
+   struct ldb_message *msg;
+   TALLOC_CTX *tmp_ctx;
+   struct ldb_dn *new_dn, *server_dn;
+   struct GUID guid;
+   /* struct ldb_val schedule_val; */
+   int ret;
+   bool ok;
+
+   tmp_ctx = talloc_new(s);
+   new_dn = samdb_ntds_settings_dn(s->samdb);
+   if (!new_dn) {
+   DEBUG(0, ("failed to find NTDS settings\n"));
+   ret = LDB_ERR_OPERATIONS_ERROR;
+   goto done;
+   }
+   new_dn = ldb_dn_copy(tmp_ctx, new_dn);
+   if (!new_dn) {
+   DEBUG(0, ("failed to copy NTDS settings\n"));
+   ret = LDB_ERR_OPERATIONS_ERROR;
+   goto done;
+   }
+   guid = GUID_random();
+   ok = ldb_dn_add_child_fmt(new_dn, "CN=%s", GUID_string(tmp_ctx, &guid));
+   if (!ok) {
+   DEBUG(0, ("failed t