The branch, v4-0-test has been updated
via 121157a WHATSNEW: Update changes since RC5.
via 61afd00 docs: man oLschema2ldif: Add missing meta data.
via 68eff14 docs: man ntlm_auth4: Add missing meta data.
via 91c2674 docs: man smbtorture: Add missing meta data.
via fb6d779 docs: man masktest: Add missing meta data.
via 5a99e29 docs: man locktest: Add missing meta data.
via b1505ca docs: man gentest: Add missing meta data.
via 1bc9abe docs: man 8 samba: Add missing meta data.
via e7df1cc docs: man regtree: Add missing meta data.
via 52d7901 docs: man regshell: Add missing meta data.
via f540628 docs: man regpatch: Add missing meta data.
via 6d03994 docs: man regdiff: Add missing meta data.
via 71e6ce4 docs: man ndrdump: Add missing meta data.
via b0e45aa docs: man tdbtool: Add missing meta data.
via 63e77b0 docs: man talloc: Add missing meta data.
via 109deeb docs: man ldbsearch: Add missing meta data.
via d650a14 docs: man ldbrename: Add missing meta data.
via 60c8dfc docs: man ldbmodify: Add missing meta data.
via bb2c41e docs: man ldbedit: Add missing meta data.
via fa4051a docs: man ldbdel: Add missing meta data.
via 09e3bd9 docs: man ldbadd: Add missing meta data.
via 4fbde8f docs: man ldb.3: Add missing meta data.
via 5a5894c spoolss: fix segfault when "default devmode" is disabled
from 0fa3d75 WHATSNEW: Update changes since RC5.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 121157ac12db410f3283bc1cd4269328704002fa
Author: Karolin Seeger <[email protected]>
Date: Fri Nov 30 09:19:46 2012 +0100
WHATSNEW: Update changes since RC5.
Karolin
Autobuild-User(v4-0-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-0-test): Fri Nov 30 10:58:48 CET 2012 on sn-devel-104
commit 61afd00904f1af9b08de00eba2c0e9ca184a685d
Author: Karolin Seeger <[email protected]>
Date: Thu Nov 29 10:15:49 2012 +0100
docs: man oLschema2ldif: Add missing meta data.
This avoids warnings during the waf build and removes "FIXME" entries from
the
manpage.
Karolin
Reviewed-by: Andreas Schneider <[email protected]>
Autobuild-User(master): Andreas Schneider <[email protected]>
Autobuild-Date(master): Thu Nov 29 15:27:45 CET 2012 on sn-devel-104
(cherry picked from commit 26a0ee5a0d915961067050564197a3d44b22d1e3)
The last 21 commits fix bug #9437 - Warnings when building manpages with
waf.
commit 68eff142d055e7d9d38224dcac37eefdc23085ff
Author: Karolin Seeger <[email protected]>
Date: Thu Nov 29 10:15:07 2012 +0100
docs: man ntlm_auth4: Add missing meta data.
This avoids warnings during the waf build and removes "FIXME" entries from
the
manpage.
Karolin
Reviewed-by: Andreas Schneider <[email protected]>
(cherry picked from commit e9e9661b23cf8b9da48284bda4e41cd6d98a2050)
commit 91c2674a588d0ac923538bdef3069f51d152c4d5
Author: Karolin Seeger <[email protected]>
Date: Thu Nov 29 10:14:15 2012 +0100
docs: man smbtorture: Add missing meta data.
This avoids warnings during the waf build and removes "FIXME" entries from
the
manpage.
Karolin
Reviewed-by: Andreas Schneider <[email protected]>
(cherry picked from commit 6ba7a6686c1e535343aad7748a2338b1bc4a3a6f)
commit fb6d779433634fd4a5d0f925959e9d0720297212
Author: Karolin Seeger <[email protected]>
Date: Thu Nov 29 10:09:07 2012 +0100
docs: man masktest: Add missing meta data.
This avoids warnings during the waf build and removes "FIXME" entries from
the
manpage.
Karolin
Reviewed-by: Andreas Schneider <[email protected]>
(cherry picked from commit 122cc5b0230c0f99263ea1f156a34bbcf8b7664d)
commit 5a99e296315c371a20e9d9530bfee8fc1127eb2d
Author: Karolin Seeger <[email protected]>
Date: Thu Nov 29 10:04:43 2012 +0100
docs: man locktest: Add missing meta data.
This avoids warnings during the waf build and removes "FIXME" entries from
the
manpage.
Karolin
Reviewed-by: Andreas Schneider <[email protected]>
(cherry picked from commit cb501f99d26b638c6bf3ae431a2c31febd54c4f6)
commit b1505cabba32ba146e4d124a334cfe5ce483c273
Author: Karolin Seeger <[email protected]>
Date: Thu Nov 29 10:04:26 2012 +0100
docs: man gentest: Add missing meta data.
This avoids warnings during the waf build and removes "FIXME" entries from
the
manpage.
Karolin
Reviewed-by: Andreas Schneider <[email protected]>
(cherry picked from commit bd3ad42d07971496b6fd800b752eb0a1b07568e2)
commit 1bc9abeb96fe54f30010d2d759aad8f826ccd567
Author: Karolin Seeger <[email protected]>
Date: Thu Nov 29 10:03:52 2012 +0100
docs: man 8 samba: Add missing meta data.
This avoids warnings during the waf build and removes "FIXME" entries from
the
manpage.
Karolin
Reviewed-by: Andreas Schneider <[email protected]>
(cherry picked from commit 7b6186c18848675118b59bb33c2a7e41f60d4eb3)
commit e7df1cce2b8555e5b4f2165bbcb47f5f64c24cf9
Author: Karolin Seeger <[email protected]>
Date: Thu Nov 29 10:03:19 2012 +0100
docs: man regtree: Add missing meta data.
This avoids warnings during the waf build and removes "FIXME" entries from
the
manpage.
Karolin
Reviewed-by: Andreas Schneider <[email protected]>
(cherry picked from commit c86707973dc7b17651187ea59b102859fa6531f2)
commit 52d79012da387a99b5b39587a7e3ef81f8ec77fe
Author: Karolin Seeger <[email protected]>
Date: Thu Nov 29 10:02:51 2012 +0100
docs: man regshell: Add missing meta data.
This avoids warnings during the waf build and removes "FIXME" entries from
the
manpage.
Karolin
Reviewed-by: Andreas Schneider <[email protected]>
(cherry picked from commit 53b9e4ba6b76cc3282a6bd1be6fa1a98ababca96)
commit f540628cb6aa32e2e7345b45565e5c21c92ff4fe
Author: Karolin Seeger <[email protected]>
Date: Thu Nov 29 10:02:30 2012 +0100
docs: man regpatch: Add missing meta data.
This avoids warnings during the waf build and removes "FIXME" entries from
the
manpage.
Karolin
Reviewed-by: Andreas Schneider <[email protected]>
(cherry picked from commit 9678fca3c62a20b1bdef6b42a4449d23ed5dccc5)
commit 6d03994376bedd5dc5d09ec29617c17b1dadfd63
Author: Karolin Seeger <[email protected]>
Date: Thu Nov 29 10:02:12 2012 +0100
docs: man regdiff: Add missing meta data.
This avoids warnings during the waf build and removes "FIXME" entries from
the
manpage.
Karolin
Reviewed-by: Andreas Schneider <[email protected]>
(cherry picked from commit 1ad091296df5f96729e8c6a76a07538522fab2c6)
commit 71e6ce42b2299ef86b5a50242a89f307e5543ff6
Author: Karolin Seeger <[email protected]>
Date: Thu Nov 29 10:01:39 2012 +0100
docs: man ndrdump: Add missing meta data.
This avoids warnings during the waf build and removes "FIXME" entries from
the
manpage.
Karolin
Reviewed-by: Andreas Schneider <[email protected]>
(cherry picked from commit 83fdfe36ba8e0503a6d147f7945ea1f043078901)
commit b0e45aa523c8ddc0e9e2566f0351991a62516d80
Author: Karolin Seeger <[email protected]>
Date: Thu Nov 29 10:01:06 2012 +0100
docs: man tdbtool: Add missing meta data.
This avoids warnings during the waf build and removes "FIXME" entries from
the
manpage.
Karolin
Reviewed-by: Andreas Schneider <[email protected]>
(cherry picked from commit 68c6dcb0942244f542eec7bbe5fba78ef7f66051)
commit 63e77b0eda0fb9acc33699348ef241883f6f2335
Author: Karolin Seeger <[email protected]>
Date: Thu Nov 29 10:00:45 2012 +0100
docs: man talloc: Add missing meta data.
This avoids warnings during the waf build and removes "FIXME" entries from
the
manpage.
Karolin
Reviewed-by: Andreas Schneider <[email protected]>
(cherry picked from commit 174ab3542dcb49ae9bf827bea747a6135805ef04)
commit 109deebbb83d89447e97ac852910ee042ae0db9e
Author: Karolin Seeger <[email protected]>
Date: Thu Nov 29 10:00:10 2012 +0100
docs: man ldbsearch: Add missing meta data.
This avoids warnings during the waf build and removes "FIXME" entries from
the
manpage.
Karolin
Reviewed-by: Andreas Schneider <[email protected]>
(cherry picked from commit 0162dd55d3fc047333db79db7ebf37a8e6721c64)
commit d650a14b475f0095580aca849877d4b573401028
Author: Karolin Seeger <[email protected]>
Date: Thu Nov 29 09:59:52 2012 +0100
docs: man ldbrename: Add missing meta data.
This avoids warnings during the waf build and removes "FIXME" entries from
the
manpage.
Karolin
Reviewed-by: Andreas Schneider <[email protected]>
(cherry picked from commit 787a58b4a7500c8bedc177579926cd9453b26c4b)
commit 60c8dfcabb3141b4eb3eba2fc2f5ec203aaf53a3
Author: Karolin Seeger <[email protected]>
Date: Thu Nov 29 09:59:32 2012 +0100
docs: man ldbmodify: Add missing meta data.
This avoids warnings during the waf build and removes "FIXME" entries from
the
manpage.
Karolin
Reviewed-by: Andreas Schneider <[email protected]>
(cherry picked from commit 1404a24d3e92790d4306017ad08593d4b054eb53)
commit bb2c41e3acb1cf1f6fe5ddb9513c4e9a672e7e2d
Author: Karolin Seeger <[email protected]>
Date: Thu Nov 29 09:59:15 2012 +0100
docs: man ldbedit: Add missing meta data.
This avoids warnings during the waf build and removes "FIXME" entries from
the
manpage.
Karolin
Reviewed-by: Andreas Schneider <[email protected]>
(cherry picked from commit 0b900da6ace34d61adc13512a6b7b94e08719b69)
commit fa4051a0b2c9b6426f36dd72511b7d703de7d4ac
Author: Karolin Seeger <[email protected]>
Date: Thu Nov 29 09:58:52 2012 +0100
docs: man ldbdel: Add missing meta data.
This avoids warnings during the waf build and removes "FIXME" entries from
the
manpage.
Karolin
Reviewed-by: Andreas Schneider <[email protected]>
(cherry picked from commit 1d5ef8931c9e0179905de7dbcab020b4d5faa1c0)
commit 09e3bd9edb18dbc792da6e03dda71e401f49982f
Author: Karolin Seeger <[email protected]>
Date: Thu Nov 29 09:58:23 2012 +0100
docs: man ldbadd: Add missing meta data.
This avoids warnings during the waf build and removes "FIXME" entries from
the
manpage.
Karolin
Reviewed-by: Andreas Schneider <[email protected]>
(cherry picked from commit 08e63057de474441d06d6564e3c297aebb017a47)
commit 4fbde8fd0b4f954363f11db25fd4ff02f5ae0d6e
Author: Karolin Seeger <[email protected]>
Date: Thu Nov 29 09:56:25 2012 +0100
docs: man ldb.3: Add missing meta data.
This avoids warnings during the waf build and removes "FIXME" entries from
the
manpage.
Karolin
Reviewed-by: Andreas Schneider <[email protected]>
(cherry picked from commit ac4881bd0185f1d9b3f2df6e3ad3dc82bcb0e5d2)
commit 5a5894c05c07fd1b98d5346085c762642b471d58
Author: David Disseldorp <[email protected]>
Date: Tue Nov 27 16:10:28 2012 +0100
spoolss: fix segfault when "default devmode" is disabled
Currently when "default devmode" is explicitly disabled, and a printer
is added with a null device mode, spoolssd crashes in copy_devicemode().
Both construct_printer_info2() and construct_printer_info8() code paths
currently unconditionally attempt to copy a printers device mode,
without checking whether one is present.
This change fixes this regression such that construct_printer_info*()
functions check for a null device mode before copying.
https://bugzilla.samba.org/show_bug.cgi?id=9433
Reviewed-by: Andreas Schneider <[email protected]>
Autobuild-User(master): Andreas Schneider <[email protected]>
Autobuild-Date(master): Thu Nov 29 13:03:05 CET 2012 on sn-devel-104
(cherry picked from commit 2e12deedcfdc5ce3637a125b083b0f00b208bf61)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 5 +++
lib/ldb/man/ldb.3.xml | 3 ++
lib/ldb/man/ldbadd.1.xml | 3 ++
lib/ldb/man/ldbdel.1.xml | 3 ++
lib/ldb/man/ldbedit.1.xml | 3 ++
lib/ldb/man/ldbmodify.1.xml | 3 ++
lib/ldb/man/ldbrename.1.xml | 3 ++
lib/ldb/man/ldbsearch.1.xml | 3 ++
lib/talloc/talloc.3.xml | 12 ++++++
lib/tdb/manpages/tdbtool.8.xml | 2 +-
librpc/tools/ndrdump.1.xml | 3 ++
source3/rpc_server/spoolss/srv_spoolss_nt.c | 52 +++++++++++++++++---------
source4/lib/registry/man/regdiff.1.xml | 3 ++
source4/lib/registry/man/regpatch.1.xml | 3 ++
source4/lib/registry/man/regshell.1.xml | 3 ++
source4/lib/registry/man/regtree.1.xml | 3 ++
source4/smbd/samba.8.xml | 3 ++
source4/torture/man/gentest.1.xml | 3 ++
source4/torture/man/locktest.1.xml | 3 ++
source4/torture/man/masktest.1.xml | 3 ++
source4/torture/man/smbtorture.1.xml | 3 ++
source4/utils/man/ntlm_auth4.1.xml | 3 ++
source4/utils/man/oLschema2ldif.1.xml | 3 ++
23 files changed, 109 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 5313ffe..a08909a 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -192,6 +192,10 @@ o Günther Deschner <[email protected]>
* BUG 9426: rpc_client: lookup nametype 0x20 in rpc_pipe_open_tcp_port().
+o David Disseldorp <[email protected]>
+ * BUG 9433: spoolss: Fix segfault when "default devmode" is disabled.
+
+
o Amitay Isaacs <[email protected]>
* BUG 9354: Fix format string vulnerability in an error message.
@@ -224,6 +228,7 @@ o Andreas Schneider <[email protected]>
o Karolin Seeger <[email protected]>
* BUG 9425: Do not build ntdb by default.
+ * BUG 9437: Warnings when building manpages with waf.
CHANGES SINCE 4.0.0rc4
diff --git a/lib/ldb/man/ldb.3.xml b/lib/ldb/man/ldb.3.xml
index 19d9a89..37c4e80 100644
--- a/lib/ldb/man/ldb.3.xml
+++ b/lib/ldb/man/ldb.3.xml
@@ -5,6 +5,9 @@
<refmeta>
<refentrytitle>ldb</refentrytitle>
<manvolnum>3</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
<refnamediv>
diff --git a/lib/ldb/man/ldbadd.1.xml b/lib/ldb/man/ldbadd.1.xml
index b77b151..19d2171 100644
--- a/lib/ldb/man/ldbadd.1.xml
+++ b/lib/ldb/man/ldbadd.1.xml
@@ -5,6 +5,9 @@
<refmeta>
<refentrytitle>ldbadd</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
diff --git a/lib/ldb/man/ldbdel.1.xml b/lib/ldb/man/ldbdel.1.xml
index 41da3bc..e136955 100644
--- a/lib/ldb/man/ldbdel.1.xml
+++ b/lib/ldb/man/ldbdel.1.xml
@@ -5,6 +5,9 @@
<refmeta>
<refentrytitle>ldbdel</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
diff --git a/lib/ldb/man/ldbedit.1.xml b/lib/ldb/man/ldbedit.1.xml
index a2eec05..334a1a1 100644
--- a/lib/ldb/man/ldbedit.1.xml
+++ b/lib/ldb/man/ldbedit.1.xml
@@ -5,6 +5,9 @@
<refmeta>
<refentrytitle>ldbedit</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
diff --git a/lib/ldb/man/ldbmodify.1.xml b/lib/ldb/man/ldbmodify.1.xml
index 9bb492a..f7632b3 100644
--- a/lib/ldb/man/ldbmodify.1.xml
+++ b/lib/ldb/man/ldbmodify.1.xml
@@ -5,6 +5,9 @@
<refmeta>
<refentrytitle>ldbmodify</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
diff --git a/lib/ldb/man/ldbrename.1.xml b/lib/ldb/man/ldbrename.1.xml
index 3576bc2..e0436ab 100644
--- a/lib/ldb/man/ldbrename.1.xml
+++ b/lib/ldb/man/ldbrename.1.xml
@@ -5,6 +5,9 @@
<refmeta>
<refentrytitle>ldbrename</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
diff --git a/lib/ldb/man/ldbsearch.1.xml b/lib/ldb/man/ldbsearch.1.xml
index 623a599..4946cb2 100644
--- a/lib/ldb/man/ldbsearch.1.xml
+++ b/lib/ldb/man/ldbsearch.1.xml
@@ -5,6 +5,9 @@
<refmeta>
<refentrytitle>ldbsearch</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
diff --git a/lib/talloc/talloc.3.xml b/lib/talloc/talloc.3.xml
index 99e8bcd..85cd6c4 100644
--- a/lib/talloc/talloc.3.xml
+++ b/lib/talloc/talloc.3.xml
@@ -4,6 +4,9 @@
<refmeta>
<refentrytitle>talloc</refentrytitle>
<manvolnum>3</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
<refnamediv>
<refname>talloc</refname>
@@ -777,6 +780,15 @@ if (ptr) memcpy(ptr, p, strlen(p)+1);</programlisting>
<ulink url="http://talloc.samba.org/"/>
</para>
</refsect1>
+
+ <refsect1><title>AUTHOR</title>
+ <para> The original Samba software and related utilities were
+ created by Andrew Tridgell. Samba is now developed by the
+ Samba Team as an Open Source project similar to the way the
+ Linux kernel is developed.
+ </para>
+ </refsect1>
+
<refsect1><title>COPYRIGHT/LICENSE</title>
<para>
Copyright (C) Andrew Tridgell 2004
diff --git a/lib/tdb/manpages/tdbtool.8.xml b/lib/tdb/manpages/tdbtool.8.xml
index 9f96db2..c143b5c 100644
--- a/lib/tdb/manpages/tdbtool.8.xml
+++ b/lib/tdb/manpages/tdbtool.8.xml
@@ -7,7 +7,7 @@
<manvolnum>8</manvolnum>
<refmiscinfo class="source">Samba</refmiscinfo>
<refmiscinfo class="manual">System Administration tools</refmiscinfo>
- <refmiscinfo class="version">3.6</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
diff --git a/librpc/tools/ndrdump.1.xml b/librpc/tools/ndrdump.1.xml
index b7d2ee8..e148eee 100644
--- a/librpc/tools/ndrdump.1.xml
+++ b/librpc/tools/ndrdump.1.xml
@@ -5,6 +5,9 @@
<refmeta>
<refentrytitle>ndrdump</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c
b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index ff342de..b8ee9f4 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -1938,24 +1938,12 @@ WERROR _spoolss_OpenPrinterEx(struct pipes_struct *p,
* save it here in case we get a job submission on this handle
*/
- if ((Printer->printer_type != SPLHND_SERVER) &&
- r->in.devmode_ctr.devmode) {
+ if ((Printer->printer_type != SPLHND_SERVER)
+ && (r->in.devmode_ctr.devmode != NULL)) {
copy_devicemode(NULL, r->in.devmode_ctr.devmode,
&Printer->devmode);
}
-#if 0 /* JERRY -- I'm doubtful this is really effective */
- /* HACK ALERT!!! Sleep for 1/3 of a second to try trigger a LAN/WAN
- optimization in Windows 2000 clients --jerry */
-
- if ( (r->in.access_mask == PRINTER_ACCESS_ADMINISTER)
- && (RA_WIN2K == get_remote_arch()) )
- {
- DEBUG(10,("_spoolss_OpenPrinterEx: Enabling LAN/WAN hack for
Win2k clients.\n"));
- usleep( 500000 );
- }
-#endif
-
return WERR_OK;
}
@@ -4030,8 +4018,22 @@ static WERROR construct_printer_info2(TALLOC_CTX
*mem_ctx,
r->cjobs = count;
r->averageppm = info2->averageppm;
- copy_devicemode(mem_ctx, info2->devmode, &r->devmode);
- if (!r->devmode) {
+ if (info2->devmode != NULL) {
+ result = copy_devicemode(mem_ctx,
+ info2->devmode,
+ &r->devmode);
+ if (!W_ERROR_IS_OK(result)) {
+ return result;
+ }
+ } else if (lp_default_devmode(snum)) {
+ result = spoolss_create_default_devmode(mem_ctx,
+ info2->printername,
+ &r->devmode);
+ if (!W_ERROR_IS_OK(result)) {
+ return result;
+ }
+ } else {
+ r->devmode = NULL;
DEBUG(8,("Returning NULL Devicemode!\n"));
}
@@ -4201,8 +4203,22 @@ static WERROR construct_printer_info8(TALLOC_CTX
*mem_ctx,
return result;
}
- copy_devicemode(mem_ctx, info2->devmode, &r->devmode);
- if (!r->devmode) {
+ if (info2->devmode != NULL) {
+ result = copy_devicemode(mem_ctx,
+ info2->devmode,
+ &r->devmode);
+ if (!W_ERROR_IS_OK(result)) {
+ return result;
+ }
+ } else if (lp_default_devmode(snum)) {
+ result = spoolss_create_default_devmode(mem_ctx,
+ info2->printername,
+ &r->devmode);
+ if (!W_ERROR_IS_OK(result)) {
+ return result;
+ }
+ } else {
+ r->devmode = NULL;
DEBUG(8,("Returning NULL Devicemode!\n"));
}
diff --git a/source4/lib/registry/man/regdiff.1.xml
b/source4/lib/registry/man/regdiff.1.xml
index 59ef459..3fe965c 100644
--- a/source4/lib/registry/man/regdiff.1.xml
+++ b/source4/lib/registry/man/regdiff.1.xml
@@ -5,6 +5,9 @@
<refmeta>
<refentrytitle>regdiff</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
diff --git a/source4/lib/registry/man/regpatch.1.xml
b/source4/lib/registry/man/regpatch.1.xml
index 7293f5d..3a15082 100644
--- a/source4/lib/registry/man/regpatch.1.xml
+++ b/source4/lib/registry/man/regpatch.1.xml
@@ -5,6 +5,9 @@
<refmeta>
<refentrytitle>regpatch</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
diff --git a/source4/lib/registry/man/regshell.1.xml
b/source4/lib/registry/man/regshell.1.xml
index ed91b1b..4653fbb 100644
--- a/source4/lib/registry/man/regshell.1.xml
+++ b/source4/lib/registry/man/regshell.1.xml
@@ -5,6 +5,9 @@
<refmeta>
<refentrytitle>regshell</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
diff --git a/source4/lib/registry/man/regtree.1.xml
b/source4/lib/registry/man/regtree.1.xml
index 197091c..0d798e4 100644
--- a/source4/lib/registry/man/regtree.1.xml
+++ b/source4/lib/registry/man/regtree.1.xml
@@ -5,6 +5,9 @@
<refmeta>
<refentrytitle>regtree</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
diff --git a/source4/smbd/samba.8.xml b/source4/smbd/samba.8.xml
index 2fa126f..891c847 100644
--- a/source4/smbd/samba.8.xml
+++ b/source4/smbd/samba.8.xml
@@ -5,6 +5,9 @@
<refmeta>
<refentrytitle>samba</refentrytitle>
<manvolnum>8</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
diff --git a/source4/torture/man/gentest.1.xml
b/source4/torture/man/gentest.1.xml
index 729d318..65523f6 100644
--- a/source4/torture/man/gentest.1.xml
+++ b/source4/torture/man/gentest.1.xml
@@ -5,6 +5,9 @@
<refmeta>
<refentrytitle>gentest</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">Test Suite</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
diff --git a/source4/torture/man/locktest.1.xml
b/source4/torture/man/locktest.1.xml
index cfc18a4..3265823 100644
--- a/source4/torture/man/locktest.1.xml
+++ b/source4/torture/man/locktest.1.xml
@@ -5,6 +5,9 @@
<refmeta>
<refentrytitle>locktest</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">Test Suite</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
diff --git a/source4/torture/man/masktest.1.xml
b/source4/torture/man/masktest.1.xml
index 3abd5d4..9cd46e3 100644
--- a/source4/torture/man/masktest.1.xml
+++ b/source4/torture/man/masktest.1.xml
@@ -5,6 +5,9 @@
<refmeta>
<refentrytitle>masktest</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">Test Suite</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
diff --git a/source4/torture/man/smbtorture.1.xml
b/source4/torture/man/smbtorture.1.xml
index 10febf3..9b70b9b 100644
--- a/source4/torture/man/smbtorture.1.xml
+++ b/source4/torture/man/smbtorture.1.xml
@@ -5,6 +5,9 @@
<refmeta>
<refentrytitle>smbtorture</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">Test Suite</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
diff --git a/source4/utils/man/ntlm_auth4.1.xml
b/source4/utils/man/ntlm_auth4.1.xml
index da187d7..3e26e37 100644
--- a/source4/utils/man/ntlm_auth4.1.xml
+++ b/source4/utils/man/ntlm_auth4.1.xml
@@ -5,6 +5,9 @@
<refmeta>
<refentrytitle>ntlm_auth4</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">User Commands</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
diff --git a/source4/utils/man/oLschema2ldif.1.xml
b/source4/utils/man/oLschema2ldif.1.xml
index b1e681b..d62ab28 100644
--- a/source4/utils/man/oLschema2ldif.1.xml
+++ b/source4/utils/man/oLschema2ldif.1.xml
@@ -5,6 +5,9 @@
<refmeta>
<refentrytitle>oLschema2ldif</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
</refmeta>
--
Samba Shared Repository
