[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Wed Sep 12 06:06:02 MDT 2012
The branch, master has been updated
via 1f8c9ab s3-rap: Open printers with the right access mask.
via 937cdd1 docs: Build manpages correctly.
via 66a87d7 wafsamba: Add a SAMBAMANPAGES function.
via 66d926f docs: Bump version up to 4.0.
from 2eb429d docs: Fix typo.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1f8c9ab88e7a2e28e503e99baabb88c3cebbc4b6
Author: Andreas Schneider <asn at samba.org>
Date: Wed Sep 12 12:12:58 2012 +0200
s3-rap: Open printers with the right access mask.
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Wed Sep 12 14:05:42 CEST 2012 on sn-devel-104
commit 937cdd1e463b19bc2b99e51734cd811d78f3e1e5
Author: Andreas Schneider <asn at samba.org>
Date: Tue Sep 11 17:50:45 2012 +0200
docs: Build manpages correctly.
commit 66a87d7cbe193a0c1e1c62a39ebbfc88a318a79d
Author: Andreas Schneider <asn at samba.org>
Date: Tue Sep 11 17:50:26 2012 +0200
wafsamba: Add a SAMBAMANPAGES function.
commit 66d926fa2d09f06f561168f4516b3a6055d100f7
Author: Andreas Schneider <asn at samba.org>
Date: Tue Sep 11 14:47:06 2012 +0200
docs: Bump version up to 4.0.
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/wafsamba.py | 16 +++++++++++++++-
docs-xml/manpages/idmap_ad.8.xml | 4 +---
docs-xml/manpages/idmap_autorid.8.xml | 2 +-
docs-xml/manpages/idmap_hash.8.xml | 2 +-
docs-xml/manpages/idmap_ldap.8.xml | 2 +-
docs-xml/manpages/idmap_nss.8.xml | 2 +-
docs-xml/manpages/idmap_rid.8.xml | 2 +-
docs-xml/manpages/idmap_tdb.8.xml | 2 +-
docs-xml/manpages/idmap_tdb2.8.xml | 2 +-
docs-xml/wscript_build | 2 +-
source3/smbd/lanman.c | 6 +++---
11 files changed, 27 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 50c3f36..1f71bd3 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -774,7 +774,6 @@ Build.BuildContext.INSTALL_DIRS = INSTALL_DIRS
def MANPAGES(bld, manpages):
'''build and install manual pages'''
bld.env.MAN_XSL = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
- os.environ["XML_CATALOG_FILES"] = 'file:///etc/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
for m in manpages.split():
source = m + '.xml'
bld.SAMBA_GENERATOR(m,
@@ -786,6 +785,21 @@ def MANPAGES(bld, manpages):
bld.INSTALL_FILES('${MANDIR}/man%s' % m[-1], m, flat=True)
Build.BuildContext.MANPAGES = MANPAGES
+def SAMBAMANPAGES(bld, manpages):
+ '''build and install manual pages'''
+ bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/expand-sambadoc.xsl'
+ bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl'
+ os.environ["XML_CATALOG_FILES"] = 'file:///etc/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
+ for m in manpages.split():
+ source = m + '.xml'
+ bld.SAMBA_GENERATOR(m,
+ source=source,
+ target=m,
+ group='final',
+ rule='${XSLTPROC} --xinclude --stringparam noreference 0 -o ${TGT}.xml --nonet ${SAMBA_EXPAND_XSL} ${SRC} && ${XSLTPROC} --nonet -o ${TGT} ${SAMBA_MAN_XSL} ${TGT}.xml'
+ )
+ bld.INSTALL_FILES('${MANDIR}/man%s' % m[-1], m, flat=True)
+Build.BuildContext.SAMBAMANPAGES = SAMBAMANPAGES
#############################################################
# give a nicer display when building different types of files
diff --git a/docs-xml/manpages/idmap_ad.8.xml b/docs-xml/manpages/idmap_ad.8.xml
index 7319f91..2ae7fc8 100644
--- a/docs-xml/manpages/idmap_ad.8.xml
+++ b/docs-xml/manpages/idmap_ad.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>
@@ -27,8 +27,6 @@
group objects in the AD.</para>
<para>
- Note that the idmap_ad module has changed considerably since
- Samba versions 3.0 and 3.2.
Currently, the <parameter>ad</parameter> backend
does not work as the the default idmap backend, but one has
to configure it separately for each domain for which one wants
diff --git a/docs-xml/manpages/idmap_autorid.8.xml b/docs-xml/manpages/idmap_autorid.8.xml
index 3b93861..ed698e9 100644
--- a/docs-xml/manpages/idmap_autorid.8.xml
+++ b/docs-xml/manpages/idmap_autorid.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/docs-xml/manpages/idmap_hash.8.xml b/docs-xml/manpages/idmap_hash.8.xml
index f3ec6a7..9dc6147 100644
--- a/docs-xml/manpages/idmap_hash.8.xml
+++ b/docs-xml/manpages/idmap_hash.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/docs-xml/manpages/idmap_ldap.8.xml b/docs-xml/manpages/idmap_ldap.8.xml
index e68f278..10bc6be 100644
--- a/docs-xml/manpages/idmap_ldap.8.xml
+++ b/docs-xml/manpages/idmap_ldap.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/docs-xml/manpages/idmap_nss.8.xml b/docs-xml/manpages/idmap_nss.8.xml
index 565019c..a2b7dc3 100644
--- a/docs-xml/manpages/idmap_nss.8.xml
+++ b/docs-xml/manpages/idmap_nss.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/docs-xml/manpages/idmap_rid.8.xml b/docs-xml/manpages/idmap_rid.8.xml
index 3f87352..9b96b8e 100644
--- a/docs-xml/manpages/idmap_rid.8.xml
+++ b/docs-xml/manpages/idmap_rid.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/docs-xml/manpages/idmap_tdb.8.xml b/docs-xml/manpages/idmap_tdb.8.xml
index c67d6cb..5c3a6ed 100644
--- a/docs-xml/manpages/idmap_tdb.8.xml
+++ b/docs-xml/manpages/idmap_tdb.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/docs-xml/manpages/idmap_tdb2.8.xml b/docs-xml/manpages/idmap_tdb2.8.xml
index 1faf590..a1989c0 100644
--- a/docs-xml/manpages/idmap_tdb2.8.xml
+++ b/docs-xml/manpages/idmap_tdb2.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/docs-xml/wscript_build b/docs-xml/wscript_build
index 56d795f..14fa152 100644
--- a/docs-xml/wscript_build
+++ b/docs-xml/wscript_build
@@ -81,7 +81,7 @@ krb5_locator_manpages = 'manpages/winbind_krb5_locator.7'
if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
- bld.MANPAGES(manpages)
+ bld.SAMBAMANPAGES(manpages)
if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
bld.MANPAGES(pam_winbind_manpages)
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index b22619f..d54e1d5 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -3525,7 +3525,7 @@ static bool api_WPrintQueueCtrl(struct smbd_server_connection *sconn,
QueueName,
NULL,
devmode_ctr,
- SEC_FLAG_MAXIMUM_ALLOWED,
+ PRINTER_ACCESS_ADMINISTER,
&handle,
&werr);
if (!NT_STATUS_IS_OK(status)) {
@@ -4986,7 +4986,7 @@ static bool api_WPrintJobEnumerate(struct smbd_server_connection *sconn,
name,
NULL,
devmode_ctr,
- SEC_FLAG_MAXIMUM_ALLOWED,
+ PRINTER_ACCESS_USE,
&handle,
&werr);
if (!NT_STATUS_IS_OK(status)) {
@@ -5186,7 +5186,7 @@ static bool api_WPrintDestGetInfo(struct smbd_server_connection *sconn,
PrinterName,
NULL,
devmode_ctr,
- SEC_FLAG_MAXIMUM_ALLOWED,
+ PRINTER_ACCESS_USE,
&handle,
&werr);
if (!NT_STATUS_IS_OK(status)) {
--
Samba Shared Repository
More information about the samba-cvs
mailing list