The branch, v3-5-stable has been updated
via b097212... WHATSNEW: Update changes.
via a3ae5f4... tdb: fix standalone 'make installdocs'
via 357eae5... tdb: create symbol links to shared libraries see
https://bugzilla.samba.org/show_bug.cgi?id=6991 for details
via a1fb214... talloc: create symbol links to shared libraries see
https://bugzilla.samba.org/show_bug.cgi?id=6991 for details
via 1c1b3aa... tevent: create symbol links to shared libraries see
https://bugzilla.samba.org/show_bug.cgi?id=6991 for details
via f8c058d... tdb: Also build and install tdb manpages from standalone
tdb. (cherry picked from commit 0110990f01390c80b8db423ba7eed486883219de)
via a3ebe54... s4: Fix result check for getaddrinfo()
via 25e126d... WHATSNEW: Update changes since 3.5.0pre2.
via d335029... s4-smbtorture: add test_ChangeID to RPC-SPOOLSS.
via 95a8b65... s4-smbtorture: add test_SetPrinter to RPC-SPOOLSS.
via 534ddef... s4-smbtorture: refactor test_GetPrinter in RPC-SPOOLSS.
via cf00de2... s3-net: use generated krb5.conf in 'net ads testjoin'
via 52eb403... s3-docs: mention -M option and remove nonexisting -G
option in pdbedit manpage.
via 71f3b8d... Second part of the fix for bug #7020 - smbd using 2G
memory.
from 4e8c70e... Fix bug #7020 - smbd using 2G memory.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable
- Log -----------------------------------------------------------------
commit b0972122102ea7163af5e2798be0127ab0c8b11c
Author: Karolin Seeger <ksee...@samba.org>
Date: Thu Jan 7 11:01:17 2010 +0100
WHATSNEW: Update changes.
Karolin
(cherry picked from commit 22ee5d4921f28a4cba176ca629cf32f35b5956d6)
commit a3ae5f4094693ec126e45afa110ce65ef4b94c05
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Jan 6 14:39:43 2010 +0100
tdb: fix standalone 'make installdocs'
metze
(cherry picked from commit c01f443ebca5e0b6f65fe8b3ab031da51dce2e89)
(cherry picked from commit 6a1786aaf88bbc38eebbd489cfe582602bd034e2)
commit 357eae56f1a4745ab605ad58e50bd89d8a351c20
Author: Brian Lu <brian...@sun.com>
Date: Thu Dec 17 14:39:09 2009 +0800
tdb: create symbol links to shared libraries see
https://bugzilla.samba.org/show_bug.cgi?id=6991 for details
Signed-off-by: Stefan Metzmacher <me...@samba.org>
(cherry picked from commit 0a3a6bb8f910df02cb429fdeacf0ab8d683e0b89)
(cherry picked from commit 3c5de3c3f8fb665a0e1e9c1982a6f98d8ae9a1ff)
commit a1fb214c503c5235eb838911ea8ba78b55b1ef74
Author: Brian Lu <brian...@sun.com>
Date: Thu Dec 17 14:48:59 2009 +0800
talloc: create symbol links to shared libraries see
https://bugzilla.samba.org/show_bug.cgi?id=6991 for details
Signed-off-by: Stefan Metzmacher <me...@samba.org>
(cherry picked from commit eff6022d51f578dfc48f1d66dd8ec1e860dfd7b3)
(cherry picked from commit d3e8baf29756c7af38841b290ad67eb06a474bb3)
commit 1c1b3aa1725d3bf0120ae52f79d311eeb0deef18
Author: Brian Lu <brian...@sun.com>
Date: Thu Dec 17 14:55:57 2009 +0800
tevent: create symbol links to shared libraries see
https://bugzilla.samba.org/show_bug.cgi?id=6991 for details
Signed-off-by: Stefan Metzmacher <me...@samba.org>
(cherry picked from commit f408d58d95f5ac10849742fdcdf7e6160196e8e0)
(cherry picked from commit b4f95b214cf7a328f2656fa81395566e9905ff6e)
commit f8c058d26b1533f9080991ef2104278641268c6f
Author: Jelmer Vernooij <jel...@samba.org>
Date: Sun Dec 20 18:01:24 2009 +0100
tdb: Also build and install tdb manpages from standalone tdb.
(cherry picked from commit 0110990f01390c80b8db423ba7eed486883219de)
(Version changed to 3.5)
Signed-off-by: Stefan Metzmacher <me...@samba.org>
(cherry picked from commit 2e0df7c8ee5615cb8b1ea3abe727ab59c4bf1f95)
commit a3ebe54761d1c0d1c99edaf6e221612c23280bf2
Author: Kamen Mazdrashki <kamen.mazdras...@postpath.com>
Date: Wed Jan 6 13:40:33 2010 +0200
s4: Fix result check for getaddrinfo()
I think this completes commit 50feca550eed7828198b7c0fc5f0e5ddc863313d.
Now result should be handled correctly both for systems that
support EAI_NODATA but returns EAI_NONAME (as my Ubuntu 9.x)
and systems that doesn't support EAI_NODATA at all.
Signed-off-by: Stefan Metzmacher <me...@samba.org>
(cherry picked from commit a2044b9a61d9c8ca66067b286ad9bc01cf0490b9)
(cherry picked from commit dd35252f4dbe3dc36b35c21915bf959524dc4930)
commit 25e126d6b462672d1150d2de25355d7e5f328492
Author: Karolin Seeger <ksee...@samba.org>
Date: Thu Jan 7 10:24:28 2010 +0100
WHATSNEW: Update changes since 3.5.0pre2.
Karolin
(cherry picked from commit c330ae920ac86a6a9cc7fac129be62756b2da7c0)
commit d33502936793baa8c660d7399752af322414a5a3
Author: Günther Deschner <g...@samba.org>
Date: Wed Jan 6 19:34:33 2010 +0100
s4-smbtorture: add test_ChangeID to RPC-SPOOLSS.
This tests ChangeID consistency between spoolss_GetPrinterData,
spoolss_GetPrinterDataEx and spoolss_GetPrinter (level 0).
Guenther
(cherry picked from commit 3dbe8603d967d9d1b13290ec0f0556c7323a7692)
(cherry picked from commit 066094537420c70e453462407c751c9ae863ae01)
commit 95a8b65efcfda5f8509857f12ad14bc70636fa01
Author: Günther Deschner <g...@samba.org>
Date: Wed Jan 6 19:33:39 2010 +0100
s4-smbtorture: add test_SetPrinter to RPC-SPOOLSS.
Guenther
(cherry picked from commit 7568f49134c548c470e99c51e237ad3e225d6488)
(cherry picked from commit d7375656d058cef1a47158132eb0599becb1a779)
commit 534ddef376b9fffe42fa5a10b5f0f529d04a057b
Author: Günther Deschner <g...@samba.org>
Date: Wed Jan 6 17:51:34 2010 +0100
s4-smbtorture: refactor test_GetPrinter in RPC-SPOOLSS.
Guenther
(cherry picked from commit 0457cf915b724e3afd54ab1b5c8b96dcb5b7550a)
(cherry picked from commit d5eac5b8dccd2d940044c3d06603554740dd3ac3)
commit cf00de230b2ed21caaf2a814310b962be7b64e1b
Author: Günther Deschner <g...@samba.org>
Date: Wed Dec 16 21:22:50 2009 +0100
s3-net: use generated krb5.conf in 'net ads testjoin'
Guenther
(cherry picked from commit 475d296065d57f9b38b109203b40ed0b47a2ac7e)
(cherry picked from commit f5af157fc004d210e9740491fcce84bbd1b1ebfa)
commit 52eb4038e593e8e141c7e7e52771a4be0d2a8396
Author: Günther Deschner <g...@samba.org>
Date: Wed Dec 23 10:33:13 2009 +0100
s3-docs: mention -M option and remove nonexisting -G option in pdbedit
manpage.
Guenther
(cherry picked from commit 3b40ec83705f7ea61f4d4b88438493b6c197f222)
(cherry picked from commit 79f92a10a8a25c0f162b0b4707e90f9ab01b540f)
commit 71f3b8d8da3e195549c3aee133c78a92826e9742
Author: Jeremy Allison <j...@samba.org>
Date: Wed Jan 6 13:11:00 2010 -0800
Second part of the fix for bug #7020 - smbd using 2G memory.
There was a second leak in the processing of the out_data.frag
prs_struct. It needs freeing once the current pdu has been returned
asynchronously.
Jeremy.
(cherry picked from commit d5995eec7e5fd487b57b8805095ffbc74796411a)
(cherry picked from commit 80b5f95b7d05955943c33968b4f0742581b00480)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 36 +++-
docs-xml/manpages-3/pdbedit.8.xml | 10 +-
docs-xml/manpages-3/tdbbackup.8.xml | 2 +-
docs-xml/manpages-3/tdbdump.8.xml | 2 +-
docs-xml/manpages-3/tdbtool.8.xml | 2 +-
lib/talloc/talloc.mk | 5 +
lib/tdb/Makefile.in | 7 +-
lib/tdb/configure.ac | 7 +
lib/tdb/include/tdb.h | 2 +-
.../tdb/manpages}/tdbbackup.8.xml | 0
.../manpages-3 => lib/tdb/manpages}/tdbdump.8.xml | 0
.../manpages-3 => lib/tdb/manpages}/tdbtool.8.xml | 0
lib/tdb/tdb.mk | 19 ++-
lib/tevent/tevent.mk | 4 +
source3/rpc_server/srv_pipe_hnd.c | 7 +
source3/utils/net_ads.c | 4 +
source4/libcli/resolve/dns_ex.c | 17 +-
source4/torture/rpc/spoolss.c | 283 ++++++++++++++++++--
18 files changed, 358 insertions(+), 49 deletions(-)
copy {docs-xml/manpages-3 => lib/tdb/manpages}/tdbbackup.8.xml (100%)
copy {docs-xml/manpages-3 => lib/tdb/manpages}/tdbdump.8.xml (100%)
copy {docs-xml/manpages-3 => lib/tdb/manpages}/tdbtool.8.xml (100%)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index eb0c8f3..26205e5 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -104,22 +104,33 @@ o Jeremy Allison <j...@samba.org>
* BUG 6837: Fix "Too many open files" when trying to access large number of
files with Windows 7.
* BUG 6939: Fix long filenames when "mangling method" is set to "hash".
+ * BUG 7020: Fix smbd using 2G memory.
* Ensure dos_mode can return FILE_ATTRIBUTE_NORMAL, then filter the
returned
attributes by protocol level.
* Vector correctly through reply_openerror() (which uses the same logic).
* Fix bugs with the full Windows ACL support.
+o Kai Blin <k...@samba.org>
+ * Add a few missing gettext calls to the 'net' command.
+ * Fix up a share type translation and translate some more strings in 'net'.
+
+
o Günther Deschner <g...@samba.org>
* Allow to call "pdbedit -N description -u user" without specifiyng "-r".
* Add spoolss_DriverInfo7.
* Fix rpcclient after setprinter IDL fixes.
+ * Use generated krb5.conf in 'net ads testjoin'.
o Jonas Gorski <jonas.gorski+sa...@gmail.com>
* BUG 6992: make test for getgrouplist cacheable.
+o André Hentschel <n...@dawncrow.de>
+ * Add some German translations for the 'net' command.
+
+
o Suresh Jayaraman <sjayara...@suse.de>
* Update mount.cifs man page with nounix option.
@@ -136,21 +147,23 @@ o Volker Lendecke <v...@samba.org>
o Kamen Mazdrashki <kamen.mazdras...@postpath.com>
* Fix write behind memory block in libtalloc.
-
-
-o Simo Sorce <i...@samba.org>
- * Change the way mksysms work in libtalloc.
+ * Fix result check for getaddrinfo().
o Jim McDonough <j...@samba.org>
* BUG 7014: Fix Winbind crash when retrieving empty group members.
+o Brian Lu <brian...@sun.com>
+ * BUG 6991: Create symbol links to shared libraries.
+
+
o Stefan Metzmacher <me...@samba.org>
* Add tsocket_address_bsd_sockaddr() and
tsocket_address_bsd_from_sockaddr()
to tsocket.
* Always set tdb->tracefd to -1 to be safe on goto fail in libtdb.
* Add TDB_DISALLOW_NESTING and make TDB_ALLOW_NESTING the default behavior.
+ * Fix standalone 'make installdocs'.
o Peter Rosin <p...@lysator.liu.se>
@@ -166,6 +179,21 @@ o Kirill Smelkov <k...@mns.spb.ru>
* Reset tdb->fd to -1 in tdb_close() in libtdb.
+o Simo Sorce <i...@samba.org>
+ * Change the way mksysms work in libtalloc.
+
+
+o Jelmer Vernooij <jel...@samba.org>
+ * Also build and install tdb manpages from standalone tdb.
+
+
+o Bo Yang <boy...@samba.org>
+ * Fix infinite loop in NCACN_IP_TCP as there is no timeout.
+ * Make winbindd_cache.c aware of domain offline to avoid unnecessary
backend
+ query.
+ * List trusted domains from wcache when domain is offline.
+
+
Changes since 3.5.0pre1
-----------------------
diff --git a/docs-xml/manpages-3/pdbedit.8.xml
b/docs-xml/manpages-3/pdbedit.8.xml
index dbce28f..eaafb97 100644
--- a/docs-xml/manpages-3/pdbedit.8.xml
+++ b/docs-xml/manpages-3/pdbedit.8.xml
@@ -29,12 +29,12 @@
<arg choice="opt">-f fullname</arg>
<arg choice="opt">--force-initialized-passwords</arg>
<arg choice="opt">-g</arg>
- <arg choice="opt">-G SID|RID</arg>
<arg choice="opt">-h homedir</arg>
<arg choice="opt">-i passdb-backend</arg>
<arg choice="opt">-I domain</arg>
<arg choice="opt">-L </arg>
<arg choice="opt">-m</arg>
+ <arg choice="opt">-M SID|RID</arg>
<arg choice="opt">-N description</arg>
<arg choice="opt">-P account-policy</arg>
<arg choice="opt">-p profile</arg>
@@ -215,13 +215,13 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
</varlistentry>
<varlistentry>
- <term>-G|'--group SID' SID|rid</term>
+ <term>-M|'--machine SID' SID|rid</term>
<listitem><para>
- This option can be used while adding or modifying a user
account. It
- will specify the users' new primary group SID (Security
Identifier) or
+ This option can be used while adding or modifying a machine
account. It
+ will specify the machines' new primary group SID (Security
Identifier) or
rid. </para>
- <para>Example: <command>-G
S-1-5-21-2447931902-1787058256-3961074038-1201</command></para>
+ <para>Example: <command>-M
S-1-5-21-2447931902-1787058256-3961074038-1201</command></para>
</listitem>
</varlistentry>
diff --git a/docs-xml/manpages-3/tdbbackup.8.xml
b/docs-xml/manpages-3/tdbbackup.8.xml
index c3a6e2b..aaf46ac 100644
--- a/docs-xml/manpages-3/tdbbackup.8.xml
+++ b/docs-xml/manpages-3/tdbbackup.8.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant
V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc";>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd";>
<refentry id="tdbbackup.8">
<refmeta>
diff --git a/docs-xml/manpages-3/tdbdump.8.xml
b/docs-xml/manpages-3/tdbdump.8.xml
index 5c0028d..719e436 100644
--- a/docs-xml/manpages-3/tdbdump.8.xml
+++ b/docs-xml/manpages-3/tdbdump.8.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant
V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc";>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd";>
<refentry id="tdbdump.8">
<refmeta>
diff --git a/docs-xml/manpages-3/tdbtool.8.xml
b/docs-xml/manpages-3/tdbtool.8.xml
index a755653..05d2ecb 100644
--- a/docs-xml/manpages-3/tdbtool.8.xml
+++ b/docs-xml/manpages-3/tdbtool.8.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant
V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc";>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd";>
<refentry id="tdbtool.8">
<refmeta>
diff --git a/lib/talloc/talloc.mk b/lib/talloc/talloc.mk
index a563d61..fc90f4d 100644
--- a/lib/talloc/talloc.mk
+++ b/lib/talloc/talloc.mk
@@ -1,5 +1,6 @@
TALLOC_OBJ = $(tallocdir)/talloc.o
+TALLOC_SHLIB = libtalloc.$(SHLIBEXT)
TALLOC_SOLIB = libtalloc.$(SHLIBEXT).$(TALLOC_VERSION)
TALLOC_SONAME = libtalloc.$(SHLIBEXT).$(TALLOC_VERSION_MAJOR)
TALLOC_STLIB = libtalloc.a
@@ -25,6 +26,10 @@ install:: all
if [ -f talloc.3 ];then ${INSTALLCMD} -m 644 talloc.3
$(DESTDIR)$(mandir)/man3; fi
which swig >/dev/null 2>&1 && ${INSTALLCMD} -d $(DESTDIR)`swig
-swiglib` || true
which swig >/dev/null 2>&1 && ${INSTALLCMD} -m 644 talloc.i
$(DESTDIR)`swig -swiglib` || true
+ rm -f $(DESTDIR)$(libdir)/$(TALLOC_SONAME)
+ ln -s $(TALLOC_SOLIB) $(DESTDIR)$(libdir)/$(TALLOC_SONAME)
+ rm -f $(DESTDIR)$(libdir)/$(TALLOC_SHLIB)
+ ln -s $(TALLOC_SOLIB) $(DESTDIR)$(libdir)/$(TALLOC_SHLIB)
doc:: talloc.3 talloc.3.html
diff --git a/lib/tdb/Makefile.in b/lib/tdb/Makefile.in
index 93bfe37..dc22ee3 100644
--- a/lib/tdb/Makefile.in
+++ b/lib/tdb/Makefile.in
@@ -9,6 +9,7 @@ exec_prefix = @exec_prefix@
bindir = @bindir@
includedir = @includedir@
libdir = @libdir@
+mandir = @mandir@
VPATH = @srcdir@:@libreplacedir@
srcdir = @srcdir@
builddir = @builddir@
@@ -31,18 +32,22 @@ PYTHON_CHECK_TARGET = @PYTHON_CHECK_TARGET@
LIB_PATH_VAR = @LIB_PATH_VAR@
tdbdir = @tdbdir@
+EXTRA_TARGETS = @DOC_TARGET@
+
TDB_OBJ = @TDB_OBJ@ @LIBREPLACEOBJ@
SONAMEFLAG = @SONAMEFLAG@
VERSIONSCRIPT = @VERSIONSCRIPT@
EXPORTSFILE = @EXPORTSFILE@
+XSLTPROC = @XSLTPROC@
+
default: all
include $(tdbdir)/tdb.mk
include $(tdbdir)/rules.mk
-all:: showflags dirs $(PROGS) $(TDB_SOLIB) libtdb.a $(PYTHON_BUILD_TARGET)
+all:: showflags dirs $(PROGS) $(TDB_SOLIB) libtdb.a $(PYTHON_BUILD_TARGET)
$(EXTRA_TARGETS)
install:: all
$(TDB_SOLIB): $(TDB_OBJ)
diff --git a/lib/tdb/configure.ac b/lib/tdb/configure.ac
index 779f596..dac7bb2 100644
--- a/lib/tdb/configure.ac
+++ b/lib/tdb/configure.ac
@@ -38,6 +38,13 @@ AC_ARG_ENABLE(python,
fi
])
+AC_PATH_PROG(XSLTPROC,xsltproc)
+DOC_TARGET=""
+if test -n "$XSLTPROC"; then
+ DOC_TARGET=doc
+fi
+AC_SUBST(DOC_TARGET)
+
m4_include(build_macros.m4)
BUILD_WITH_SHARED_BUILD_DIR
diff --git a/lib/tdb/include/tdb.h b/lib/tdb/include/tdb.h
index db9ce4a..c9e946a 100644
--- a/lib/tdb/include/tdb.h
+++ b/lib/tdb/include/tdb.h
@@ -143,7 +143,7 @@ void tdb_remove_flags(struct tdb_context *tdb, unsigned
flag);
void tdb_enable_seqnum(struct tdb_context *tdb);
void tdb_increment_seqnum_nonblock(struct tdb_context *tdb);
int tdb_check(struct tdb_context *tdb,
- int (*check)(TDB_DATA key, TDB_DATA data, void *private_data),
+ int (*check) (TDB_DATA key, TDB_DATA data, void *private_data),
void *private_data);
/* Low level locking functions: use with care */
diff --git a/docs-xml/manpages-3/tdbbackup.8.xml
b/lib/tdb/manpages/tdbbackup.8.xml
similarity index 100%
copy from docs-xml/manpages-3/tdbbackup.8.xml
copy to lib/tdb/manpages/tdbbackup.8.xml
diff --git a/docs-xml/manpages-3/tdbdump.8.xml b/lib/tdb/manpages/tdbdump.8.xml
similarity index 100%
copy from docs-xml/manpages-3/tdbdump.8.xml
copy to lib/tdb/manpages/tdbdump.8.xml
diff --git a/docs-xml/manpages-3/tdbtool.8.xml b/lib/tdb/manpages/tdbtool.8.xml
similarity index 100%
copy from docs-xml/manpages-3/tdbtool.8.xml
copy to lib/tdb/manpages/tdbtool.8.xml
diff --git a/lib/tdb/tdb.mk b/lib/tdb/tdb.mk
index 267c2d1..ecc6f9f 100644
--- a/lib/tdb/tdb.mk
+++ b/lib/tdb/tdb.mk
@@ -51,7 +51,20 @@ tdb.$(SHLIBEXT): libtdb.$(SHLIBEXT) pytdb.o
$(SHLD) $(SHLD_FLAGS) -o $@ pytdb.o -L. -ltdb `$(PYTHON_CONFIG)
--ldflags`
install:: installdirs installbin installheaders installlibs \
- $(PYTHON_INSTALL_TARGET)
+ $(PYTHON_INSTALL_TARGET) installdocs
+
+doc:: manpages/tdbbackup.8 manpages/tdbdump.8 manpages/tdbtool.8
+
+.SUFFIXES: .8.xml .8
+
+.8.xml.8:
+ -test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+installdocs::
+ ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man8
+ for I in manpages/*.8; do \
+ ${INSTALLCMD} -m 644 $$I $(DESTDIR)$(mandir)/man8; \
+ done
install-python:: build-python
mkdir -p $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print
distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"`
@@ -78,6 +91,10 @@ installheaders:: installdirs
installlibs:: all installdirs
cp tdb.pc $(DESTDIR)$(libdir)/pkgconfig
cp $(TDB_STLIB) $(TDB_SOLIB) $(DESTDIR)$(libdir)
+ rm -f $(DESTDIR)$(libdir)/libtdb.$(SHLIBEXT)
+ ln -s $(TDB_SOLIB) $(DESTDIR)$(libdir)/libtdb.$(SHLIBEXT)
+ rm -f $(DESTDIR)$(libdir)/$(TDB_SONAME)
+ ln -s $(TDB_SOLIB) $(DESTDIR)$(libdir)/$(TDB_SONAME)
$(TDB_STLIB): $(TDB_OBJ)
ar -rv $(TDB_STLIB) $(TDB_OBJ)
diff --git a/lib/tevent/tevent.mk b/lib/tevent/tevent.mk
index 694d082..57bfd81 100644
--- a/lib/tevent/tevent.mk
+++ b/lib/tevent/tevent.mk
@@ -26,6 +26,10 @@ installheaders:: installdirs
installlibs:: installdirs
cp tevent.pc $(DESTDIR)$(libdir)/pkgconfig
cp $(TEVENT_STLIB) $(TEVENT_SOLIB) $(DESTDIR)$(libdir)
+ rm -f $(DESTDIR)$(libdir)/$(TEVENT_SONAME)
+ ln -s $(TEVENT_SOLIB) $(DESTDIR)$(libdir)/$(TEVENT_SONAME)
+ rm -f $(DESTDIR)$(libdir)/$(TEVENT_SOBASE)
+ ln -s $(TEVENT_SOLIB) $(DESTDIR)$(libdir)/$(TEVENT_SOBASE)
install:: all installdirs installheaders installlibs $(PYTHON_INSTALL_TARGET)
diff --git a/source3/rpc_server/srv_pipe_hnd.c
b/source3/rpc_server/srv_pipe_hnd.c
index 5d5eb0e..83f27fe 100644
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -903,6 +903,13 @@ static ssize_t read_from_internal_pipe(struct pipes_struct
*p, char *data, size_
out:
(*is_data_outstanding) = prs_offset(&p->out_data.frag) > n;
+ if (p->out_data.current_pdu_sent == prs_offset(&p->out_data.frag)) {
+ /* We've returned everything in the out_data.frag
+ * so we're done with this pdu. Free it and reset
+ * current_pdu_sent. */
+ p->out_data.current_pdu_sent = 0;
+ prs_mem_free(&p->out_data.frag);
+ }
return data_returned;
}
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index f133eec..8e644bb 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -1007,6 +1007,8 @@ static NTSTATUS net_ads_join_ok(struct net_context *c)
{
ADS_STRUCT *ads = NULL;
ADS_STATUS status;
+ fstring dc_name;
+ struct sockaddr_storage dcip;
if (!secrets_init()) {
DEBUG(1,("Failed to initialise secrets database\n"));
@@ -1015,6 +1017,8 @@ static NTSTATUS net_ads_join_ok(struct net_context *c)
net_use_krb_machine_account(c);
+ get_dc_name(lp_workgroup(), lp_realm(), dc_name, &dcip);
+
status = ads_startup(c, true, &ads);
if (!ADS_ERR_OK(status)) {
return ads_ntstatus(status);
diff --git a/source4/libcli/resolve/dns_ex.c b/source4/libcli/resolve/dns_ex.c
index 1b50372..79ed783 100644
--- a/source4/libcli/resolve/dns_ex.c
+++ b/source4/libcli/resolve/dns_ex.c
@@ -283,14 +283,19 @@ static void run_child_getaddrinfo(struct dns_ex_state
*state, int fd)
hints.ai_flags = AI_ADDRCONFIG | AI_NUMERICSERV;
ret = getaddrinfo(state->name.name, "0", &hints, &res_list);
+ /* try to fallback in case of error */
+ if (state->do_fallback) {
+ switch (ret) {
#ifdef EAI_NODATA
- if (ret == EAI_NODATA && state->do_fallback) {
-#else
- if (ret == EAI_NONAME && state->do_fallback) {
+ case EAI_NODATA:
#endif
- /* getaddrinfo() doesn't handle CNAME records */
- run_child_dns_lookup(state, fd);
- return;
+ case EAI_NONAME:
+ /* getaddrinfo() doesn't handle CNAME records */
+ run_child_dns_lookup(state, fd);
+ return;
+ default:
+ break;
+ }
}
if (ret != 0) {
goto done;
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 65bc361..489174b 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -5,7 +5,7 @@
Copyright (C) Tim Potter 2003
Copyright (C) Stefan Metzmacher 2005
Copyright (C) Jelmer Vernooij 2007
- Copyright (C) Guenther Deschner 2009
+ Copyright (C) Guenther Deschner 2009-2010
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
@@ -865,45 +865,67 @@ static bool test_GetPrinterDriver2(struct torture_context
*tctx,
struct policy_handle *handle,
const char *driver_name);
-static bool test_GetPrinter(struct torture_context *tctx,
- struct dcerpc_pipe *p,
- struct policy_handle *handle)
+static bool test_GetPrinter_level(struct torture_context *tctx,
+ struct dcerpc_pipe *p,
+ struct policy_handle *handle,
+ uint32_t level,
+ union spoolss_PrinterInfo *info)
{
- NTSTATUS status;
struct spoolss_GetPrinter r;
- uint16_t levels[] = {0, 1, 2, 3, 4, 5, 6, 7, 8};
- int i;
uint32_t needed;
- for (i=0;i<ARRAY_SIZE(levels);i++) {
- r.in.handle = handle;
- r.in.level = levels[i];
- r.in.buffer = NULL;
- r.in.offered = 0;
- r.out.needed = &needed;
+ r.in.handle = handle;
+ r.in.level = level;
+ r.in.buffer = NULL;
+ r.in.offered = 0;
+ r.out.needed = &needed;
- torture_comment(tctx, "Testing GetPrinter level %u\n",
r.in.level);
+ torture_comment(tctx, "Testing GetPrinter level %u\n", r.in.level);
- status = dcerpc_spoolss_GetPrinter(p, tctx, &r);
- torture_assert_ntstatus_ok(tctx, status, "GetPrinter failed");
+ torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_GetPrinter(p, tctx, &r),
+ "GetPrinter failed");
- if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
- DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
- data_blob_clear(&blob);
- r.in.buffer = &blob;
- r.in.offered = needed;
- status = dcerpc_spoolss_GetPrinter(p, tctx, &r);
- }
+ if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
+ DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
+ data_blob_clear(&blob);
+ r.in.buffer = &blob;
+ r.in.offered = needed;
+
+ torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_GetPrinter(p,
tctx, &r),
+ "GetPrinter failed");
+ }
+
+ torture_assert_werr_ok(tctx, r.out.result, "GetPrinter failed");
- torture_assert_ntstatus_ok(tctx, status, "GetPrinter failed");
+ CHECK_NEEDED_SIZE_LEVEL(spoolss_PrinterInfo, r.out.info, r.in.level,
lp_iconv_convenience(tctx->lp_ctx), needed, 4);
- torture_assert_werr_ok(tctx, r.out.result, "GetPrinter failed");
+ if (info && r.out.info) {
+ *info = *r.out.info;
+ }
+
+ return true;
+}
+
+
+static bool test_GetPrinter(struct torture_context *tctx,
+ struct dcerpc_pipe *p,
+ struct policy_handle *handle)
+{
+ uint32_t levels[] = {0, 1, 2, 3, 4, 5, 6, 7, 8};
+ int i;
+
+ for (i=0;i<ARRAY_SIZE(levels);i++) {
- CHECK_NEEDED_SIZE_LEVEL(spoolss_PrinterInfo, r.out.info,
r.in.level, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+ union spoolss_PrinterInfo info;
- if ((r.in.level == 2) && r.out.info->info2.drivername &&
strlen(r.out.info->info2.drivername)) {
+ ZERO_STRUCT(info);
+
+ torture_assert(tctx, test_GetPrinter_level(tctx, p, handle,
levels[i], &info),
+ "failed to call GetPrinter");
+
+ if ((levels[i] == 2) && info.info2.drivername &&
strlen(info.info2.drivername)) {
torture_assert(tctx,
- test_GetPrinterDriver2(tctx, p, handle,
r.out.info->info2.drivername),
+ test_GetPrinterDriver2(tctx, p, handle,
info.info2.drivername),
"failed to call test_GetPrinterDriver2");
}
}
@@ -911,6 +933,32 @@ static bool test_GetPrinter(struct torture_context *tctx,
return true;
}
+static bool test_SetPrinter(struct torture_context *tctx,
+ struct dcerpc_pipe *p,
+ struct policy_handle *handle,
+ struct spoolss_SetPrinterInfoCtr *info_ctr,
+ struct spoolss_DevmodeContainer *devmode_ctr,
+ struct sec_desc_buf *secdesc_ctr,
+ enum spoolss_PrinterControl command)
+{
--
Samba Shared Repository
