[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Mon Sep 17 15:48:02 MDT 2012
The branch, master has been updated
via ffd61e2 ldb: bump version to 1.1.13 so the 4.0 release can get the isprint fix
via 0eae4cd docs: Remove another reference to security=share
via 8e95dee docs: Remove references to specific windows versions, instead mention Home/Professional/Server
via 36bfb1e docs: Remove references to mulitple passdb backends
via e221985 docs: Remove references to sysv-style CUPS from TOSHARG-CUPS-printing
via d4efb94 docs: Remove very outdated TOSHARG-Other-Clients section
via cbfeba7 docs: Remove very outdated TOSHARG-Portability section
via 6786efa docs: Update FastStart: remove security=share, avoid disable spoolss
via 6bc8616 docs: Clarify TOSHARG-Bugs for 2012
via 27359ac docs: Remove reference to inetd startup, it is not recommended
via 64e3f1c docs: Update BDC docs to recognise the AD DC and to exclusivly recommend LDAP
via 4de3718 docs: Remove referenece to old Red Hat Linux habits on winbindd
via a5084a3 docs: Remove referenece to autogen.sh and document waf build instead
via f995749 docs: Remove out of date links to pserver.samba.org and old tarballs
via 0d73ce1 docs: Remove references to Subversion, replace with wiki link
via 2dcc4fe docs: Remove references to old kerberos behaviour
via 48e547c docs: Remove confusing reference to smb signing and client use spnego
from b06dbfb s3:libsmb fix a double free error
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ffd61e2bbf46ab8660c32b90c547beb8b77fcb9d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Sep 17 11:57:33 2012 -0700
ldb: bump version to 1.1.13 so the 4.0 release can get the isprint fix
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Mon Sep 17 23:47:57 CEST 2012 on sn-devel-104
commit 0eae4cd787179b40375e298cfd95df817c67a94f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Sep 17 11:56:28 2012 -0700
docs: Remove another reference to security=share
commit 8e95dee5cfc4175c7a93f1c55b08db8ab5f822c3
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Sep 17 11:56:08 2012 -0700
docs: Remove references to specific windows versions, instead mention Home/Professional/Server
The flavours of windows seem to last longer than the individual products.
Andrew Bartlett
commit 36bfb1e2282d24d2cc20f812bc59ea1ede0e660c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Sep 17 11:55:12 2012 -0700
docs: Remove references to mulitple passdb backends
These are long-gone and confusing.
Andrew Bartlett
commit e2219850d604470e484e9f8eb6e573c97d474298
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Sep 17 11:54:25 2012 -0700
docs: Remove references to sysv-style CUPS from TOSHARG-CUPS-printing
This also simplifies the cups config by not duplicating the printcap name parameter
that is already set by default when printing=cups is set.
Andrew Bartlett
commit d4efb94dbb3121ccaf17366585ba7ca325f8d699
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sat Sep 15 15:55:55 2012 -0700
docs: Remove very outdated TOSHARG-Other-Clients section
commit cbfeba71bcd2223c8e919c7d7d73597b03d12b99
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sat Sep 15 15:52:47 2012 -0700
docs: Remove very outdated TOSHARG-Portability section
commit 6786efa358b471956b017570938676e2306d29c5
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sat Sep 15 12:53:37 2012 -0700
docs: Update FastStart: remove security=share, avoid disable spoolss
As I understand it, all printing is via spoolss, so do not disable it!
Andrew Bartlett
commit 6bc861663526e1234899ca5815df7a3c122c2b2e
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Sep 14 23:13:33 2012 -0700
docs: Clarify TOSHARG-Bugs for 2012
commit 27359acf59cc7899e8de164f9311ef3b2b6db85a
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Sep 14 23:08:53 2012 -0700
docs: Remove reference to inetd startup, it is not recommended
commit 64e3f1c637b940e60d3d6988a033f4d391b7dab9
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Sep 14 23:06:59 2012 -0700
docs: Update BDC docs to recognise the AD DC and to exclusivly recommend LDAP
The confusing references to the not-recommended techniques and
outdated steps (like net rpc getsid, replaced by simply having the SID
just be in LDAP) just detract from the clarity of this document.
Andrew Bartlett
commit 4de371818504c522613845a1ae4fa97a69bcf412
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Sep 14 22:30:06 2012 -0700
docs: Remove referenece to old Red Hat Linux habits on winbindd
commit a5084a3077b0fecde0772e99302e0e7353c59da3
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Sep 14 22:29:39 2012 -0700
docs: Remove referenece to autogen.sh and document waf build instead
commit f99574905d66da771b6d37ef580165ca800ba70f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Sep 14 22:29:05 2012 -0700
docs: Remove out of date links to pserver.samba.org and old tarballs
commit 0d73ce12e751192ef6e3a8acdcf136a5a60c9439
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Sep 14 22:28:19 2012 -0700
docs: Remove references to Subversion, replace with wiki link
commit 2dcc4fec33a35e35dc9cced64e4ed61608f295c6
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Sep 14 12:06:40 2012 -0700
docs: Remove references to old kerberos behaviour
I have not seen any issues using the SRV records with windows, and this certainly
does not apply to current versions. Similarly, the need to change the admin password
does not apply now we require a krb5 lib with arcfour-hmac-md5 support.
Andrew Bartlett
commit 48e547c0734f9f646b7683059552c503c809b8ed
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Sep 14 12:04:00 2012 -0700
docs: Remove confusing reference to smb signing and client use spnego
This section is more confusing than helpful, as client support for both is on by default.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
docs-xml/Samba3-HOWTO/TOSHARG-BDC.xml | 179 +----------
docs-xml/Samba3-HOWTO/TOSHARG-Bugs.xml | 11 +-
docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml | 75 +----
docs-xml/Samba3-HOWTO/TOSHARG-Compiling.xml | 272 +--------------
docs-xml/Samba3-HOWTO/TOSHARG-DomainMember.xml | 40 ---
docs-xml/Samba3-HOWTO/TOSHARG-FastStart.xml | 22 +-
docs-xml/Samba3-HOWTO/TOSHARG-Other-Clients.xml | 351 --------------------
docs-xml/Samba3-HOWTO/TOSHARG-Passdb.xml | 40 +--
docs-xml/Samba3-HOWTO/TOSHARG-Portability.xml | 270 ---------------
docs-xml/Samba3-HOWTO/index.xml | 4 -
lib/ldb/ABI/{ldb-1.1.12.sigs => ldb-1.1.13.sigs} | 0
...ldb-util-1.1.10.sigs => pyldb-util-1.1.13.sigs} | 0
lib/ldb/wscript | 2 +-
13 files changed, 57 insertions(+), 1209 deletions(-)
delete mode 100644 docs-xml/Samba3-HOWTO/TOSHARG-Other-Clients.xml
delete mode 100644 docs-xml/Samba3-HOWTO/TOSHARG-Portability.xml
copy lib/ldb/ABI/{ldb-1.1.12.sigs => ldb-1.1.13.sigs} (100%)
copy lib/ldb/ABI/{pyldb-util-1.1.10.sigs => pyldb-util-1.1.13.sigs} (100%)
Changeset truncated at 500 lines:
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-BDC.xml b/docs-xml/Samba3-HOWTO/TOSHARG-BDC.xml
index 5aabb8b..9b69368 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-BDC.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-BDC.xml
@@ -47,96 +47,12 @@ you will have stability and operational problems.
<indexterm><primary>replication</primary><secondary>SAM</secondary></indexterm>
<indexterm><primary>non-LDAP</primary><secondary>backend</secondary></indexterm>
<indexterm><primary>propagate</primary></indexterm>
-While it is possible to run a Samba-3 BDC with a non-LDAP backend, that backend must allow some form of
+It is not possible to run a Samba-3 BDC with a non-LDAP backend, as that backend must allow some form of
"two-way" propagation of changes from the BDC to the master. At this time only LDAP delivers the capability
to propagate identity database changes from the BDC to the PDC. The BDC can use a slave LDAP server, while it
is preferable for the PDC to use as its primary an LDAP master server.
</para>
-<para>
-<indexterm><primary>non-LDAP</primary><secondary>backend</secondary></indexterm>
-<indexterm><primary>SAM backend</primary><secondary>non-LDAP</secondary></indexterm>
-<indexterm><primary>domain</primary><secondary>member</secondary><tertiary>server</tertiary></indexterm>
-<indexterm><primary>BDC</primary></indexterm>
-<indexterm><primary>PDC</primary></indexterm>
-<indexterm><primary>trust account password</primary></indexterm>
-<indexterm><primary>domain trust</primary></indexterm>
-The use of a non-LDAP backend SAM database is particularly problematic because domain member
-servers and workstations periodically change the Machine Trust Account password. The new
-password is then stored only locally. This means that in the absence of a centrally stored
-accounts database (such as that provided with an LDAP-based solution) if Samba-3 is running
-as a BDC, the BDC instance of the domain member trust account password will not reach the
-PDC (master) copy of the SAM. If the PDC SAM is then replicated to BDCs, this results in
-overwriting the SAM that contains the updated (changed) trust account password with resulting
-breakage of the domain trust.
-</para>
-
-<para>
-<indexterm><primary>net</primary><secondary>rpc</secondary></indexterm>
-<indexterm><primary>SAM backend</primary><secondary>ldapsam</secondary></indexterm>
-<indexterm><primary>SAM backend</primary><secondary>tdbsam</secondary></indexterm>
-<indexterm><primary>replication</primary><secondary>SAM</secondary></indexterm>
-Considering the number of comments and questions raised concerning how to configure a BDC,
-let's consider each possible option and look at the pros and cons for each possible solution.
-<link linkend="pdc-bdc-table">The Domain Backend Account Distribution Options table below</link> lists
-possible design configurations for a PDC/BDC infrastructure.
-</para>
-
-<table frame="all" id="pdc-bdc-table"><title>Domain Backend Account Distribution Options</title>
-<tgroup cols="3">
- <colspec align="center" colwidth="1*"/>
- <colspec align="center" colwidth="1*"/>
- <colspec align="left" colwidth="3*"/>
-
- <thead>
- <row><entry>PDC Backend</entry><entry>BDC Backend</entry><entry>Notes/Discussion</entry></row>
- </thead>
- <tbody>
- <row>
- <entry><para>Master LDAP Server</para></entry>
- <entry><para>Slave LDAP Server</para></entry>
- <entry><para>The optimal solution that provides high integrity. The SAM will be
- replicated to a common master LDAP server.</para></entry>
- </row>
- <row>
- <entry><para>Single Central LDAP Server</para></entry>
- <entry><para>Single Central LDAP Server</para></entry>
- <entry><para>
- A workable solution without failover ability. This is a usable solution, but not optimal.
- </para></entry>
- </row>
- <row>
- <entry><para>tdbsam</para></entry>
- <entry><para>tdbsam + <command>net rpc vampire</command></para></entry>
- <entry><para>
- Does not work with Samba-3.0; Samba does not implement the
- server-side protocols required.
- </para></entry>
- </row>
- <row>
- <entry><para>tdbsam</para></entry>
- <entry><para>tdbsam + <command>rsync</command></para></entry>
- <entry><para>
- Do not use this configuration.
- Does not work because the TDB files are live and data may not
- have been flushed to disk. Furthermore, this will cause
- domain trust breakdown.
- </para></entry>
- </row>
- <row>
- <entry><para>smbpasswd file</para></entry>
- <entry><para>smbpasswd file</para></entry>
- <entry><para>
- Do not use this configuration.
- Not an elegant solution due to the delays in synchronization
- and also suffers
- from the issue of domain trust breakdown.
- </para></entry>
- </row>
- </tbody>
-</tgroup>
-</table>
-
</sect1>
<sect1>
@@ -453,9 +369,12 @@ Servers in &smb.conf; example</link>.
<indexterm><primary>domain controller</primary></indexterm>
As of the release of MS Windows 2000 and Active Directory, this information is now stored
in a directory that can be replicated and for which partial or full administrative control
-can be delegated. Samba-3 is not able to be a domain controller within an Active Directory
-tree, and it cannot be an Active Directory server. This means that Samba-3 also cannot
-act as a BDC to an Active Directory domain controller.
+can be delegated. Samba-4.0 is able to be a domain controller within an Active Directory
+tree, and it can be an Active Directory server. The details for how
+this can be done are documented in the <ulink
+url="https://wiki.samba.org/index.php/Samba4/HOWTO">Samba 4.0 as an
+AD DC HOWTO</ulink>
+
</para>
</sect2>
@@ -554,35 +473,6 @@ The creation of a BDC requires some steps to prepare the Samba server before
<itemizedlist>
<listitem><para>
- <indexterm><primary>SID</primary></indexterm>
- <indexterm><primary>PDC</primary></indexterm>
- <indexterm><primary>BDC</primary></indexterm>
- <indexterm><primary>private/secrets.tdb</primary></indexterm>
- <indexterm><primary>private/MACHINE.SID</primary></indexterm>
- <indexterm><primary>domain SID</primary></indexterm>
- The domain SID has to be the same on the PDC and the BDC. In Samba versions pre-2.2.5, the domain SID was
- stored in the file <filename>private/MACHINE.SID</filename>. For all versions of Samba released since 2.2.5
- the domain SID is stored in the file <filename>private/secrets.tdb</filename>. This file is unique to each
- server and cannot be copied from a PDC to a BDC; the BDC will generate a new SID at startup. It will overwrite
- the PDC domain SID with the newly created BDC SID. There is a procedure that will allow the BDC to acquire the
- domain SID. This is described here.
- </para>
-
- <para>
- <indexterm><primary>domain SID</primary></indexterm>
- <indexterm><primary>PDC</primary></indexterm>
- <indexterm><primary>BDC</primary></indexterm>
- <indexterm><primary>secrets.tdb</primary></indexterm>
- <indexterm><primary>net</primary><secondary>rpc</secondary><tertiary>getsid</tertiary></indexterm>
- To retrieve the domain SID from the PDC or an existing BDC and store it in the
- <filename>secrets.tdb</filename>, execute:
- </para>
-<screen>
-&rootprompt;<userinput>net rpc getsid</userinput>
-</screen>
- </listitem>
-
- <listitem><para>
<indexterm><primary>secrets.tdb</primary></indexterm>
<indexterm><primary>smbpasswd</primary></indexterm>
<indexterm><primary>LDAP administration password</primary></indexterm>
@@ -623,9 +513,7 @@ The creation of a BDC requires some steps to prepare the Samba server before
<indexterm><primary>ssh</primary></indexterm>
<indexterm><primary>LDAP</primary></indexterm>
The Samba password database must be replicated from the PDC to the BDC.
- Although it is possible to synchronize the <filename>smbpasswd</filename>
- file with <command>rsync</command> and <command>ssh</command>, this method
- is broken and flawed, and is therefore not recommended. A better solution
+ The solution
is to set up slave LDAP servers for each BDC and a master LDAP server for the PDC.
The use of rsync is inherently flawed by the fact that the data will be replicated
at timed intervals. There is no guarantee that the BDC will be operating at all
@@ -804,7 +692,10 @@ No. The native NT4 SAM replication protocols have not yet been fully implemented
<indexterm><primary>BDC</primary></indexterm>
<indexterm><primary>PDC</primary></indexterm>
<indexterm><primary>logon requests</primary></indexterm>
-Can I get the benefits of a BDC with Samba? Yes, but only to a Samba PDC.The
+Can I get the benefits of a BDC with Samba? Yes, but only to a Samba
+PDC or as a <ulink
+url="https://wiki.samba.org/index.php/Samba4/HOWTO">Samba 4.0 Active
+Directory domain controller.</ulink> The
main reason for implementing a BDC is availability. If the PDC is a Samba
machine, a second Samba machine can be set up to service logon requests whenever
the PDC is down.
@@ -812,51 +703,5 @@ the PDC is down.
</sect2>
-<sect2>
-<title>How Do I Replicate the smbpasswd File?</title>
-
-<para>
-<indexterm><primary>replication</primary><secondary>SAM</secondary></indexterm>
-<indexterm><primary>smbpasswd</primary></indexterm>
-<indexterm><primary>SAM</primary></indexterm>
-Replication of the smbpasswd file is sensitive. It has to be done whenever changes
-to the SAM are made. Every user's password change is done in the smbpasswd file and
-has to be replicated to the BDC. So replicating the smbpasswd file very often is necessary.
-</para>
-
-<para>
-<indexterm><primary>plaintext password</primary></indexterm>
-<indexterm><primary>ssh</primary></indexterm>
-<indexterm><primary>rsync</primary></indexterm>
-As the smbpasswd file contains plaintext password equivalents, it must not be
-sent unencrypted over the wire. The best way to set up smbpasswd replication from
-the PDC to the BDC is to use the utility rsync. rsync can use ssh as a transport.
-<command>ssh</command> itself can be set up to accept <emphasis>only</emphasis>
-<command>rsync</command> transfer without requiring the user to type a password.
-</para>
-
-<para>
-<indexterm><primary>machine trust accounts</primary></indexterm>
-<indexterm><primary>LDAP</primary></indexterm>
-As said a few times before, use of this method is broken and flawed. Machine trust
-accounts will go out of sync, resulting in a broken domain. This method is
-<emphasis>not</emphasis> recommended. Try using LDAP instead.
-</para>
-
-</sect2>
-
-<sect2>
-<title>Can I Do This All with LDAP?</title>
-
-<para>
-<indexterm><primary>pdb_ldap</primary></indexterm>
-<indexterm><primary>LDAP</primary></indexterm>
-The simple answer is yes. Samba's pdb_ldap code supports binding to a replica
-LDAP server and will also follow referrals and rebind to the master if it ever
-needs to make a modification to the database. (Normally BDCs are read-only, so
-this will not occur often).
-</para>
-
-</sect2>
</sect1>
</chapter>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Bugs.xml b/docs-xml/Samba3-HOWTO/TOSHARG-Bugs.xml
index 0ef2c5c..f6d7ba4 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Bugs.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Bugs.xml
@@ -32,12 +32,9 @@ us fix it fast.
</para>
<para>
-<indexterm><primary>comp.protocols.smb</primary></indexterm>
-<indexterm><primary>newsgroup</primary></indexterm>
<indexterm><primary>configuration problem</primary></indexterm>
-If you post the bug to the comp.protocols.smb
-newsgroup or the mailing list, do not assume that we will read it. If you suspect that your
-problem is not a bug but a configuration problem, it is better to send
+If you suspect that your
+problem is not a bug but a configuration problem, it is best to send
it to the Samba mailing list, as there are thousands of other users on
that list who may be able to help you.
</para>
@@ -260,10 +257,10 @@ to catch any panics. If <command>smbd</command> seems to be frozen, look for any
processes. If it is not, and appears to be spinning, find the PID
of the spinning process and type:
<screen>
-&rootprompt; gdb /usr/local/samba/sbin/smbd
+&rootprompt; gdb -p PID
</screen>
<indexterm><primary>spinning process</primary></indexterm>
-then <quote>attach `pid'</quote> (of the spinning process), then type <quote>bt</quote> to
+then type <quote>bt full</quote> to
get a backtrace to see where the smbd is in the call path.
</para>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml b/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml
index d0258fb..807334e 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml
@@ -98,9 +98,7 @@
<indexterm><primary>/etc/printcap</primary></indexterm>
<indexterm><primary>Printcap</primary></indexterm>
<indexterm><primary>PrintcapFormat</primary></indexterm>
-Printing with CUPS in the most basic &smb.conf; setup in Samba-3.0 (as was true for 2.2.x) requires just two
-parameters: <smbconfoption name="printing">cups</smbconfoption> and <smbconfoption
-name="printcap">cups</smbconfoption>. CUPS does not need a printcap file. However, the
+Printing with CUPS in the most basic &smb.conf; setup in Samba requires just this parameter: <smbconfoption name="printing">cups</smbconfoption>. CUPS does not need a printcap file. However, the
<filename>cupsd.conf</filename> configuration file knows of two related directives that control how such a
file will be automatically created and maintained by CUPS for the convenience of third-party applications
(example: <parameter>Printcap /etc/printcap</parameter> and <parameter>PrintcapFormat BSD</parameter>).
@@ -116,52 +114,13 @@ url="http://localhost:631/documentation.html">CUPS</ulink> web site.
<para>
<indexterm><primary>libcups.so</primary></indexterm>
- Samba has a special relationship to CUPS. Samba can be compiled with CUPS library support.
+ Samba has a special relationship to CUPS, and to use CUPS Samba must be compiled with CUPS library support.
Most recent installations have this support enabled. By default, CUPS linking is compiled
- into smbd and other Samba binaries. Of course, you can use CUPS even
- if Samba is not linked against <filename>libcups.so</filename> &smbmdash; but
- there are some differences in required or supported configuration.
+ into smbd and other Samba binaries. The parameter
+ <smbconfoption name="printing">cups</smbconfoption> will only
+ be accepted if this is the case.
</para>
- <para>
-<indexterm><primary>libcups</primary></indexterm>
-<indexterm><primary>ldd</primary></indexterm>
- When Samba is compiled and linked with <filename>libcups</filename>, <smbconfoption name="printcap">cups</smbconfoption>
- uses the CUPS API to list printers, submit jobs, query queues, and so on. Otherwise it maps to the System V
- commands with an additional <command>-oraw</command> option for printing. On a Linux
- system, you can use the <command>ldd</command> utility to find out if smbd has been linked with the
- libcups library (<command>ldd</command> may not be present on other OS platforms, or its function may be embodied
- by a different command):
-<screen>
-&rootprompt;<userinput>ldd `which smbd`</userinput>
-libssl.so.0.9.6 => /usr/lib/libssl.so.0.9.6 (0x4002d000)
-libcrypto.so.0.9.6 => /usr/lib/libcrypto.so.0.9.6 (0x4005a000)
-libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000)
-[....]
-</screen>
- </para>
-
- <para>
-<indexterm><primary>libcups.so.2</primary></indexterm>
- The line <computeroutput>libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000)</computeroutput> shows
- there is CUPS support compiled into this version of Samba. If this is the case, and printing = cups
- is set, then <emphasis>any otherwise manually set print command in &smb.conf; is ignored</emphasis>.
- This is an important point to remember!
- </para>
-
- <tip><para> Should it be necessary, for any reason, to set your own print commands, you can do this by setting
- <smbconfoption name="printing">sysv</smbconfoption>. However, you will lose all the benefits
- of tight CUPS-Samba integration. When you do this, you must manually configure the printing system commands
- (most important:
- <smbconfoption name="print command"/>; other commands are
- <smbconfoption name="lppause command"/>,
- <smbconfoption name="lpresume command"/>,
- <smbconfoption name="lpq command"/>,
- <smbconfoption name="lprm command"/>,
- <smbconfoption name="queuepause command"/> and
- <smbconfoption name="queue resume command"/>).
- </para></tip>
-
</sect2>
<sect2>
@@ -179,7 +138,6 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000)
<smbconfsection name="[global]"/>
<smbconfoption name="load printers">yes</smbconfoption>
<smbconfoption name="printing">cups</smbconfoption>
- <smbconfoption name="printcap name">cups</smbconfoption>
<smbconfsection name="[printers]"/>
<smbconfoption name="comment">All Printers</smbconfoption>
@@ -222,7 +180,6 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000)
<smbconfblock>
<smbconfsection name="[global]"/>
<smbconfoption name="printing">cups</smbconfoption>
- <smbconfoption name="printcap name">cups</smbconfoption>
<smbconfoption name="load printers">yes</smbconfoption>
<smbconfsection name="[printers]"/>
@@ -2198,18 +2155,14 @@ file <parameter>[global]</parameter> section:
<smbconfblock>
<smbconfoption name="printing">cups</smbconfoption>
-<smbconfoption name="printcap">cups</smbconfoption>
</smbconfblock>
<para>
When these parameters are specified, all manually set print directives (like <smbconfoption name="print
command"/> or <smbconfoption name="lppause command"/>) in &smb.conf; (as well as in Samba itself) will be
-ignored. Instead, Samba will directly interface with CUPS through its application program interface (API), as
-long as Samba has been compiled with CUPS library (libcups) support. If Samba has not been compiled with CUPS
-support, and if no other print commands are set up, then printing will use the <emphasis>System V</emphasis>
-AT&T command set, with the -oraw option automatically passing through (if you want your own defined print
-commands to work with a Samba server that has CUPS support compiled in, simply use <smbconfoption
-name="classicalprinting">sysv</smbconfoption>). This is illustrated in <link linkend="f13small">the Printing via
+ignored. Instead, Samba will directly interface with CUPS through its
+application program interface (API).
+This is illustrated in <link linkend="f13small">the Printing via
CUPS/Samba Server diagram</link>.
</para>
@@ -4732,8 +4685,6 @@ For everything to work as it should, you need to have three things:
<listitem><para>A Samba-&smb.conf; setting of
<smbconfoption name="printing">cups</smbconfoption>.</para></listitem>
- <listitem><para>Another Samba &smb.conf; setting of
- <smbconfoption name="printcap">cups</smbconfoption>.</para></listitem>
</itemizedlist>
<note><para>
@@ -4747,16 +4698,6 @@ influence whatsoever on your printing.
</para></note>
</sect2>
-<sect2>
-<title>Manual Configuration</title>
-
-<para>
-If you want to do things manually, replace the <smbconfoption name="printing">cups</smbconfoption>
-by <smbconfoption name="printing">bsd</smbconfoption>. Then your manually set commands may work
-(I haven't tested this), and a <smbconfoption name="print command">lp -d %P %s; rm %s</smbconfoption>
-may do what you need.
-</para>
-</sect2>
</sect1>
<sect1>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Compiling.xml b/docs-xml/Samba3-HOWTO/TOSHARG-Compiling.xml
index e4baca4..ac866a8 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Compiling.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Compiling.xml
@@ -20,7 +20,7 @@ you can download Samba from Subversion or using <command>rsync</command>.
</para>
<sect1>
-<title>Access Samba Source Code via Subversion</title>
+<title>Access Samba Source Code via GIT</title>
<sect2>
@@ -28,115 +28,16 @@ you can download Samba from Subversion or using <command>rsync</command>.
<para>
<indexterm><primary>Subversion</primary></indexterm>
-Samba is developed in an open environment. Developers use a
-Subversion to <quote>checkin</quote> (also known as
-<quote>commit</quote>) new source code. Samba's various Subversion branches can
-be accessed via anonymous Subversion using the instructions
-detailed in this chapter.
-</para>
-
-<para>
-This chapter is a modified version of the instructions found at the
-<ulink noescape="1" url="http://samba.org/samba/subversion.html">Samba</ulink> Web site.
+Samba is developed in an open environment. Developers use
+GIT to <quote>checkin</quote> (also known as
+<quote>commit</quote>) new source code. See the
+<ulink noescape="1"
+ url="https://wiki.samba.org/index.php/Using_Git_for_Samba_Development">Using
+Git for Samba Development page</ulink> in the Samba wiki.
</para>
</sect2>
-<sect2>
-<title>Subversion Access to samba.org</title>
-
-<para>
-The machine samba.org runs a publicly accessible Subversion
-repository for access to the source code of several packages,
-including Samba, rsync, distcc, ccache, and jitterbug. There are two main ways
-of accessing the Subversion server on this host.
-</para>
-
-<sect3>
-<title>Access via ViewCVS</title>
-
-
-<para>
-<indexterm><primary>SVN</primary><secondary>web</secondary></indexterm>
-You can access the source code via your favorite WWW browser. This allows you to access
-the contents of individual files in the repository and also to look at the revision
-history and commit logs of individual files. You can also ask for a diff
-listing between any two versions on the repository.
-</para>
-
-<para>
-Use the URL
-<ulink noescape="1" url="http://viewcvs.samba.org/">http://viewcvs.samba.org/</ulink>.
-</para>
-</sect3>
-
-<sect3>
-<title>Access via Subversion</title>
-
-<para>
-<indexterm><primary>Subversion</primary></indexterm>
-You can also access the source code via a normal Subversion client. This gives you much more control over what
-you can do with the repository and allows you to check out whole source trees and keep them up to date via
-normal Subversion commands. This is the preferred method of access if you are a developer and not just a
-casual browser.
-</para>
-
-<para>In order to be able to download the Samba sources off Subversion, you need
-a Subversion client. Your distribution might include one, or you can download the
-sources from <ulink noescape="1" url="http://subversion.tigris.org/">http://subversion.tigris.org/</ulink>.
-</para>
-
-<para>
-To gain access via anonymous Subversion, use the following steps.
-</para>
-
-<procedure>
- <title>Retrieving Samba using Subversion</title>
-
- <step>
- <para>
- Install a recent copy of Subversion. All you really need is a
- copy of the Subversion client binary.
- </para>
- </step>
-
- <step>
- <para>
- Run the command
- <screen>
- <userinput>svn co svn://svnanon.samba.org/samba/trunk samba</userinput>.
- </screen>
- </para>
-
--
Samba Shared Repository
More information about the samba-cvs
mailing list