[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Tue Jul 3 15:50:02 MDT 2012
The branch, master has been updated
via 0ed3433 doc: Remove references to deprecated 'share modes' parameter.
via d0878b3 s3-smbd: Remove deprecated 'share modes' option.
via 571a4b6 doc: Remove documentation for obsolete ldapsam_compat.
via 02c239c s3-passdb: Remove obsolte ldapsam_compat support.
via 3f14155 doc: Remove all references to 'printer admin' option.
via 98ab074 s3-printing: Remove deprecated lp_printer_admin().
via c87aceb doc: Remove documentation about idmap_adex.
via e0e55ca s3-winbind: Remove obsolte idmap_adex.
from a8acaee ldb: bump version due to header and internal implementation changes
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0ed343346993826ae1ea5292924a72eb5a3cb457
Author: Andreas Schneider <asn at samba.org>
Date: Fri Jun 22 16:41:37 2012 +0200
doc: Remove references to deprecated 'share modes' parameter.
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Tue Jul 3 23:49:18 CEST 2012 on sn-devel-104
commit d0878b3b8179b1cf061e1058bacbe670363b51c6
Author: Andreas Schneider <asn at samba.org>
Date: Fri Jun 22 16:37:26 2012 +0200
s3-smbd: Remove deprecated 'share modes' option.
commit 571a4b6cd29a38d90d269871d7c4698a2a0b1d38
Author: Andreas Schneider <asn at samba.org>
Date: Fri Jun 22 16:32:59 2012 +0200
doc: Remove documentation for obsolete ldapsam_compat.
commit 02c239c6d35f47f13143c66baffbd303373b8028
Author: Andreas Schneider <asn at samba.org>
Date: Fri Jun 22 16:27:56 2012 +0200
s3-passdb: Remove obsolte ldapsam_compat support.
commit 3f14155a9f409103fcfeea0df633e2700dd316f2
Author: Andreas Schneider <asn at samba.org>
Date: Fri Jun 22 16:00:26 2012 +0200
doc: Remove all references to 'printer admin' option.
commit 98ab0740946f8ffff72e96465270efaea01e9459
Author: Andreas Schneider <asn at samba.org>
Date: Fri Jun 22 15:38:25 2012 +0200
s3-printing: Remove deprecated lp_printer_admin().
commit c87acebd7e8d0a28064699564088fb558c34c4f2
Author: Andreas Schneider <asn at samba.org>
Date: Fri Jun 22 15:26:46 2012 +0200
doc: Remove documentation about idmap_adex.
commit e0e55ca166365783b88911db3affc4f97e5f4b56
Author: Andreas Schneider <asn at samba.org>
Date: Fri Jun 22 15:25:14 2012 +0200
s3-winbind: Remove obsolte idmap_adex.
-----------------------------------------------------------------------
Summary of changes:
docs-xml/Samba3-ByExample/SBE-2000UserNetwork.xml | 1 -
.../Samba3-ByExample/SBE-AddingUNIXClients.xml | 4 -
docs-xml/Samba3-ByExample/SBE-UpgradingSamba.xml | 62 -
docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml | 8 +-
docs-xml/Samba3-HOWTO/TOSHARG-FastStart.xml | 4 -
docs-xml/Samba3-HOWTO/TOSHARG-IDMAP.xml | 2 -
docs-xml/Samba3-HOWTO/TOSHARG-Passdb.xml | 23 -
docs-xml/Samba3-HOWTO/TOSHARG-Printing.xml | 60 +-
.../Samba3-HOWTO/TOSHARG-RightsAndPriviliges.xml | 10 +-
docs-xml/Samba3-HOWTO/TOSHARG-StandAloneServer.xml | 1 -
docs-xml/Samba3-HOWTO/TOSHARG-upgrading-to-3.0.xml | 967 ----------------
docs-xml/Samba3-HOWTO/index.xml | 2 -
docs-xml/manpages-3/idmap_adex.8.xml | 88 --
docs-xml/smbdotconf/locking/sharemodes.xml | 29 -
.../smbdotconf/printing/showaddprinterwizard.xml | 5 +-
docs-xml/smbdotconf/security/printeradmin.xml | 27 -
docs-xml/smbdotconf/winbind/idmapconfig.xml | 6 +-
docs-xml/using_samba/appc.xml | 14 -
docs-xml/using_samba/appf.xml | 1 -
docs-xml/using_samba/ch05.xml | 9 -
examples/printing/VampireDriversFunctions | 10 +-
examples/scripts/shares/python/smbparm.py | 1 -
packaging/SGI/smb.conf | 3 -
source3/Makefile.in | 15 -
source3/configure.in | 1 -
source3/include/proto.h | 2 -
source3/lib/smbldap.c | 6 -
source3/param/loadparm.c | 19 -
source3/passdb/pdb_ldap.c | 99 +--
source3/passdb/pdb_ldap.h | 1 -
source3/passdb/pdb_ldap_schema.c | 55 -
source3/passdb/pdb_ldap_schema.h | 10 +-
source3/passdb/pdb_nds.c | 20 -
source3/printing/nt_printing.c | 11 -
source3/rpc_server/spoolss/srv_spoolss_nt.c | 56 +-
source3/smbd/open.c | 4 -
source3/winbindd/idmap_adex/cell_util.c | 295 -----
source3/winbindd/idmap_adex/domain_util.c | 288 -----
source3/winbindd/idmap_adex/gc_util.c | 862 --------------
source3/winbindd/idmap_adex/idmap_adex.c | 407 -------
source3/winbindd/idmap_adex/idmap_adex.h | 254 -----
source3/winbindd/idmap_adex/likewise_cell.c | 447 --------
source3/winbindd/idmap_adex/provider_unified.c | 1198 --------------------
source3/winbindd/wscript_build | 30 -
44 files changed, 45 insertions(+), 5372 deletions(-)
delete mode 100644 docs-xml/Samba3-HOWTO/TOSHARG-upgrading-to-3.0.xml
delete mode 100644 docs-xml/manpages-3/idmap_adex.8.xml
delete mode 100644 docs-xml/smbdotconf/locking/sharemodes.xml
delete mode 100644 docs-xml/smbdotconf/security/printeradmin.xml
delete mode 100644 source3/winbindd/idmap_adex/cell_util.c
delete mode 100644 source3/winbindd/idmap_adex/domain_util.c
delete mode 100644 source3/winbindd/idmap_adex/gc_util.c
delete mode 100644 source3/winbindd/idmap_adex/idmap_adex.c
delete mode 100644 source3/winbindd/idmap_adex/idmap_adex.h
delete mode 100644 source3/winbindd/idmap_adex/likewise_cell.c
delete mode 100644 source3/winbindd/idmap_adex/provider_unified.c
Changeset truncated at 500 lines:
diff --git a/docs-xml/Samba3-ByExample/SBE-2000UserNetwork.xml b/docs-xml/Samba3-ByExample/SBE-2000UserNetwork.xml
index 3b9976e..e0c3c7c 100644
--- a/docs-xml/Samba3-ByExample/SBE-2000UserNetwork.xml
+++ b/docs-xml/Samba3-ByExample/SBE-2000UserNetwork.xml
@@ -1093,7 +1093,6 @@ index default sub
<smbconfoption name="idmap backend">ldap://massive.abmas.biz</smbconfoption>
<smbconfoption name="idmap uid">10000-20000</smbconfoption>
<smbconfoption name="idmap gid">10000-20000</smbconfoption>
-<smbconfoption name="printer admin">root</smbconfoption>
<smbconfoption name="printing">cups</smbconfoption>
</smbconfblock>
</example>
diff --git a/docs-xml/Samba3-ByExample/SBE-AddingUNIXClients.xml b/docs-xml/Samba3-ByExample/SBE-AddingUNIXClients.xml
index 23704fe..45a09a8 100644
--- a/docs-xml/Samba3-ByExample/SBE-AddingUNIXClients.xml
+++ b/docs-xml/Samba3-ByExample/SBE-AddingUNIXClients.xml
@@ -674,7 +674,6 @@ Join to 'MEGANET2' failed.
<smbconfoption name="idmap uid">10000-20000</smbconfoption>
<smbconfoption name="idmap gid">10000-20000</smbconfoption>
<smbconfoption name="winbind trusted domains only">Yes</smbconfoption>
-<smbconfoption name="printer admin">root</smbconfoption>
<smbconfoption name="printing">cups</smbconfoption>
<smbconfsection name="[homes]"/>
@@ -948,7 +947,6 @@ MEGANET2+PIOps:x:10005:
<smbconfoption name="template primary group">"Domain Users"</smbconfoption>
<smbconfoption name="template shell">/bin/bash</smbconfoption>
<smbconfoption name="winbind separator">+</smbconfoption>
-<smbconfoption name="printer admin">root</smbconfoption>
<smbconfoption name="hosts allow">192.168.2., 192.168.3., 127.</smbconfoption>
<smbconfoption name="printing">cups</smbconfoption>
@@ -1041,7 +1039,6 @@ Joined domain MEGANET2.
<smbconfoption name="name resolve order">wins bcast hosts</smbconfoption>
<smbconfoption name="printcap name">CUPS</smbconfoption>
<smbconfoption name="wins server">192.168.2.1</smbconfoption>
-<smbconfoption name="printer admin">root</smbconfoption>
<smbconfoption name="hosts allow">192.168.2., 192.168.3., 127.</smbconfoption>
<smbconfoption name="printing">cups</smbconfoption>
@@ -1723,7 +1720,6 @@ data = "\00\00\00\00bp\00\00\06krbtgt\06krbtgt-
<smbconfoption name="winbind enum users">No</smbconfoption>
<smbconfoption name="winbind enum groups">No</smbconfoption>
<smbconfoption name="winbind nested groups">Yes</smbconfoption>
-<smbconfoption name="printer admin">"KPAK\Domain Admins"</smbconfoption>
</smbconfblock>
</example>
diff --git a/docs-xml/Samba3-ByExample/SBE-UpgradingSamba.xml b/docs-xml/Samba3-ByExample/SBE-UpgradingSamba.xml
index b41cea9..239ad3e 100644
--- a/docs-xml/Samba3-ByExample/SBE-UpgradingSamba.xml
+++ b/docs-xml/Samba3-ByExample/SBE-UpgradingSamba.xml
@@ -827,73 +827,11 @@ The recommended passdb backends at this time are
replacement for stand alone servers
* ldapsam - attribute rich account storage and retrieval
backend utilizing an LDAP directory.
- * ldapsam_compat - a 2.2 backward compatible LDAP account
- backend
Certain functions of the smbpasswd(8) tool have been split between the
new smbpasswd(8) utility, the net(8) tool, and the new pdbedit(8)
utility. See the respective man pages for details.
-######################################################################
-LDAP
-####
-
-This section outlines the new features affecting Samba / LDAP
-integration.
-
-New Schema
-----------
-
-A new object class (sambaSamAccount) has been introduced to replace
-the old sambaAccount. This change aids us in the renaming of
-attributes to prevent clashes with attributes from other vendors.
-There is a conversion script (examples/LDAP/convertSambaAccount) to
-modify and LDIF file to the new schema.
-
-Example:
-
- $ ldapsearch .... -b "ou=people,dc=..." > sambaAcct.ldif
- $ convertSambaAccount --sid=<Domain SID> \
- --input=sambaAcct.ldif --output=sambaSamAcct.ldif \
- --changetype=[modify|add]
-
-The <DOM SID> can be obtained by running 'net getlocalsid
-<DOMAINNAME>' on the Samba PDC as root. The changetype determines
-the format of the generated LDIF output--either create new entries
-or modify existing entries.
-
-The old sambaAccount schema may still be used by specifying the
-"ldapsam_compat" passdb backend. However, the sambaAccount and
-associated attributes have been moved to the historical section of
-the schema file and must be uncommented before use if needed.
-The 2.2 object class declaration for a sambaAccount has not changed
-in the 3.0 samba.schema file.
-
-Other new object classes and their uses include:
-
- * sambaDomain - domain information used to allocate rids
- for users and groups as necessary. The attributes are added
- in 'ldap suffix' directory entry automatically if
- an idmap uid/gid range has been set and the 'ldapsam'
- passdb backend has been selected.
-
- * sambaGroupMapping - an object representing the
- relationship between a posixGroup and a Windows
- group/SID. These entries are stored in the 'ldap
- group suffix' and managed by the 'net groupmap' command.
-
- * sambaUnixIdPool - created in the 'ldap idmap suffix' entry
- automatically and contains the next available 'idmap uid' and
- 'idmap gid'
-
- * sambaIdmapEntry - object storing a mapping between a
- SID and a UNIX uid/gid. These objects are created by the
- idmap_ldap module as needed.
-
- * sambaSidEntry - object representing a SID alone, as a Structural
- class on which to build the sambaIdmapEntry.
-
-
New Suffix for Searching
------------------------
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml b/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml
index bb05de4..d0258fb 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml
@@ -188,7 +188,6 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000)
<smbconfoption name="guest ok">yes</smbconfoption>
<smbconfoption name="writable">no</smbconfoption>
<smbconfoption name="printable">yes</smbconfoption>
- <smbconfoption name="printer admin">root, @ntadmins, @smbprintadm</smbconfoption>
</smbconfblock>
</example>
@@ -232,7 +231,6 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000)
<smbconfoption name="guest ok">yes</smbconfoption>
<smbconfoption name="writable">no</smbconfoption>
<smbconfoption name="printable">yes</smbconfoption>
- <smbconfoption name="printer admin">root, @ntadmins, @smbprintadm</smbconfoption>
<smbconfsection name="[special_printer]"/>
<smbconfoption name="comment">A special printer with his own settings</smbconfoption>
@@ -243,7 +241,6 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000)
<smbconfoption name="guest ok">no</smbconfoption>
<smbconfoption name="writable">no</smbconfoption>
<smbconfoption name="printable">yes</smbconfoption>
- <smbconfoption name="printer admin">kurt</smbconfoption>
<smbconfoption name="hosts deny">0.0.0.0</smbconfoption>
<smbconfoption name="hosts allow">turbo_xp, 10.160.50.23, 10.160.51.60</smbconfoption>
</smbconfblock>
@@ -251,9 +248,8 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000)
<para>
This special share is only for testing purposes. It does not write the print job to a file. It just logs the job parameters
- known to Samba into the <filename>/tmp/smbprn.log</filename> file and deletes the job-file. Moreover, the
- <smbconfoption name="printer admin"/> of this share is <quote>kurt</quote> (not the <quote>@ntadmins</quote> group),
- guest access is not allowed, the share isn't published to the Network Neighborhood (so you need to know it is there), and it
+ known to Samba into the <filename>/tmp/smbprn.log</filename> file and deletes the job-file. Moreover, guest access is not
+ allowed, the share isn't published to the Network Neighborhood (so you need to know it is there), and it
allows access from only three hosts. To prevent CUPS from kicking in and taking over the print jobs for that share, we need to set
<smbconfoption name="printing">sysv</smbconfoption> and <smbconfoption name="printcap">lpstat</smbconfoption>.
</para>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-FastStart.xml b/docs-xml/Samba3-HOWTO/TOSHARG-FastStart.xml
index 517bb0f..08f6e49 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-FastStart.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-FastStart.xml
@@ -495,7 +495,6 @@ Added user jackb.
<smbconfsection name="[printers]"/>
<smbconfoption name="comment">All Printers</smbconfoption>
<smbconfoption name="path">/var/spool/samba</smbconfoption>
-<smbconfoption name="printer admin">root, maryo</smbconfoption>
<smbconfoption name="create mask">0600</smbconfoption>
<smbconfoption name="guest ok">Yes</smbconfoption>
<smbconfoption name="printable">Yes</smbconfoption>
@@ -729,7 +728,6 @@ smb: \> <userinput>q</userinput>
<smbconfsection name="[printers]"/>
<smbconfoption name="comment">All Printers</smbconfoption>
<smbconfoption name="path">/var/spool/samba</smbconfoption>
-<smbconfoption name="printer admin">root, maryo</smbconfoption>
<smbconfoption name="create mask">0600</smbconfoption>
<smbconfoption name="guest ok">Yes</smbconfoption>
<smbconfoption name="printable">Yes</smbconfoption>
@@ -961,7 +959,6 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false
<smbconfsection name="[printers]"/>
<smbconfoption name="comment">All Printers</smbconfoption>
<smbconfoption name="path">/var/spool/samba</smbconfoption>
-<smbconfoption name="printer admin">root, maryo</smbconfoption>
<smbconfoption name="create mask">0600</smbconfoption>
<smbconfoption name="guest ok">Yes</smbconfoption>
<smbconfoption name="printable">Yes</smbconfoption>
@@ -971,7 +968,6 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false
<smbconfoption name="comment">Printer Drivers Share</smbconfoption>
<smbconfoption name="path">/var/lib/samba/drivers</smbconfoption>
<smbconfoption name="write list">maryo, root</smbconfoption>
-<smbconfoption name="printer admin">maryo, root</smbconfoption>
<smbconfcomment>Needed to support domain logons</smbconfcomment>
<smbconfsection name="[netlogon]"/>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-IDMAP.xml b/docs-xml/Samba3-HOWTO/TOSHARG-IDMAP.xml
index f590334..89bdec7 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-IDMAP.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-IDMAP.xml
@@ -595,7 +595,6 @@ Join to domain 'MEGANET2' is not valid
<smbconfoption name="idmap gid">500-10000000</smbconfoption>
<smbconfoption name="winbind use default domain">Yes</smbconfoption>
<smbconfoption name="winbind nested groups">Yes</smbconfoption>
-<smbconfoption name="printer admin">"BUTTERNET\Domain Admins"</smbconfoption>
</smbconfblock>
</example>
@@ -728,7 +727,6 @@ Join to domain is not valid
<smbconfoption name="winbind enum users">No</smbconfoption>
<smbconfoption name="winbind enum groups">No</smbconfoption>
<smbconfoption name="winbind nested groups">Yes</smbconfoption>
-<smbconfoption name="printer admin">"Domain Admins"</smbconfoption>
</smbconfblock>
</example>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Passdb.xml b/docs-xml/Samba3-HOWTO/TOSHARG-Passdb.xml
index b3879c4..c1738e3 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Passdb.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Passdb.xml
@@ -67,14 +67,6 @@ entities.
<sect1>
<title>Features and Benefits</title>
-<para>
-Samba-3 provides for complete backward compatibility with Samba-2.2.x functionality
-as follows:
-<indexterm><primary>SAM backend</primary><secondary>smbpasswd</secondary></indexterm>
-<indexterm><primary>SAM backend</primary><secondary>ldapsam_compat</secondary></indexterm>
-<indexterm><primary>encrypted passwords</primary></indexterm>
-</para>
-
<sect2>
<title>Backward Compatibility Account Storage Systems</title>
@@ -120,21 +112,6 @@ as follows:
</para>
</listitem>
</varlistentry>
-
- <varlistentry><term>ldapsam_compat (Samba-2.2 LDAP Compatibility)</term>
- <listitem>
- <para>
-<indexterm><primary>ldapsam_compat</primary></indexterm>
-<indexterm><primary>Samba-2.2.x LDAP schema</primary></indexterm>
-<indexterm><primary>OpenLDAP backend</primary></indexterm>
- There is a password backend option that allows continued operation with
- an existing OpenLDAP backend that uses the Samba-2.2.x LDAP schema extension.
- This option is provided primarily as a migration tool, although there is
- no reason to force migration at this time. This tool will eventually
- be deprecated.
- </para>
- </listitem>
- </varlistentry>
</variablelist>
</sect2>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Printing.xml b/docs-xml/Samba3-HOWTO/TOSHARG-Printing.xml
index fff317b..6d4624c 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Printing.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Printing.xml
@@ -282,7 +282,6 @@ with settings shown in <link linkend="simpleprc">the example above</link>:
deleteprinter command =
show add printer wizard = Yes
os2 driver map =
- printer admin =
min print space = 0
max print jobs = 1000
printable = No
@@ -404,7 +403,6 @@ be if you used this minimalistic configuration. Here is what you can expect to f
deleteprinter command =
show add printer wizard = Yes
os2 driver map =
- printer admin =
min print space = 0
max print jobs = 1000
printable = No
@@ -480,7 +478,6 @@ are set by default. You could use a much leaner &smb.conf; file, or you can use
<smbconfoption name="load printers">yes</smbconfoption>
<smbconfoption name="show add printer wizard">yes</smbconfoption>
<smbconfoption name="printcap name">/etc/printcap</smbconfoption>
-<smbconfoption name="printer admin">@ntadmin, root</smbconfoption>
<smbconfoption name="max print jobs">100</smbconfoption>
<smbconfoption name="lpq cache time">20</smbconfoption>
<smbconfoption name="use client driver">no</smbconfoption>
@@ -498,7 +495,6 @@ are set by default. You could use a much leaner &smb.conf; file, or you can use
<smbconfsection name="[my_printer_name]"/>
<smbconfoption name="comment">Printer with Restricted Access</smbconfoption>
<smbconfoption name="path">/var/spool/samba_my_printer</smbconfoption>
-<smbconfoption name="printer admin">kurt</smbconfoption>
<smbconfoption name="browseable">yes</smbconfoption>
<smbconfoption name="printable">yes</smbconfoption>
<smbconfoption name="writable">no</smbconfoption>
@@ -624,21 +620,6 @@ globally set share settings and specify other values).
<filename>cupsd.conf</filename> file.
</para></listitem></varlistentry>
- <varlistentry><term><smbconfoption name="printer admin">@ntadmin </smbconfoption></term>
- <listitem><para>
-<indexterm><primary>add drivers</primary></indexterm>
-<indexterm><primary>/etc/group</primary></indexterm>
-<indexterm><primary>printer share</primary></indexterm>
-<indexterm><primary>set printer properties</primary></indexterm>
- Members of the ntadmin group should be able to add drivers and set printer properties
- (<constant>ntadmin</constant> is only an example name; it needs to be a valid UNIX group name); root is
- implicitly always a <smbconfoption name="printer admin"/>. The <literal>@</literal> sign precedes group names
- in the <filename>/etc/group</filename>. A printer admin can do anything to printers via the remote
- administration interfaces offered by MS-RPC (see <link linkend="cups-msrpc">Printing Developments Since
- Samba-2.2</link>). In larger installations, the <smbconfoption name="printer admin"/> parameter is normally a
- per-share parameter. This permits different groups to administer each printer share.
- </para></listitem></varlistentry>
-
<varlistentry><term><smbconfoption name="lpq cache time">20 </smbconfoption></term>
<listitem><para>
<indexterm><primary>lpq command</primary></indexterm>
@@ -789,13 +770,6 @@ finds one, it will connect to this and will not connect to a printer with the sa
</para></listitem>
</varlistentry>
- <varlistentry><term><smbconfoption name="printer admin">kurt </smbconfoption></term>
- <listitem><para>
- The printer admin definition is different for this explicitly defined printer share from the general
- <smbconfsection name="[printers]"/> share. It is not a requirement; we did it to show that it is possible.
- </para></listitem>
- </varlistentry>
-
<varlistentry><term><smbconfoption name="browseable">yes </smbconfoption></term>
<listitem><para>
This makes the printer browseable so the clients may conveniently find it when browsing the
@@ -1256,9 +1230,6 @@ site). See <link linkend="prtdollar">[print\$] Example</link>.
<title>[print$] Example</title>
<smbconfblock>
<smbconfsection name="[global]"/>
-<smbconfcomment>members of the ntadmin group should be able to add drivers and set</smbconfcomment>
-<smbconfcomment>printer properties. root is implicitly always a 'printer admin'.</smbconfcomment>
-<smbconfoption name="printer admin">@ntadmin</smbconfoption>
<smbconfcomment>...</smbconfcomment>
<smbconfsection name="[printers]"/>
@@ -1358,9 +1329,7 @@ The following parameters are frequently needed in this share section:
write-access (as an exception to the general public's read-only access), which they need to
update files on the share. Normally, you will want to name only administrative-level user
account in this setting. Check the file system permissions to make sure these accounts
- can copy files to the share. If this is a non-root account, then the account should also
- be mentioned in the global <smbconfoption name="printer admin"/>
- parameter. See the &smb.conf; man page for more information on configuring file shares.
+ can copy files to the share.
</para></listitem>
</varlistentry>
</variablelist>
@@ -1403,10 +1372,6 @@ to support like this:
<listitem><para>
The account used to connect to the Samba host must have a UID of 0 (i.e., a root account).
</para></listitem>
-
- <listitem><para>
- The account used to connect to the Samba host must be named in the <emphasis>printer admin</emphasis> list.
- </para></listitem>
</itemizedlist>
<para>
@@ -1495,15 +1460,14 @@ assign a driver to a printer is open. You now have the choice of:
<para>
Once the APW is started, the procedure is exactly the same as the one you are familiar with in Windows (we
assume here that you are familiar with the printer driver installations procedure on Windows NT). Make sure
-your connection is, in fact, set up as a user with <smbconfoption name="printer admin"/>
-privileges (if in doubt, use <command>smbstatus</command> to check for this). If you wish to install
+your connection is, in fact, set up as a user with printer administrator privileges
+(if in doubt, use <command>smbstatus</command> to check for this). If you wish to install
printer drivers for client operating systems other than <application>Windows NT x86</application>,
you will need to use the <guilabel>Sharing</guilabel> tab of the printer properties dialog.
</para>
<para>
-Assuming you have connected with an administrative (or root) account (as named by the
-<smbconfoption name="printer admin"/> parameter), you will also be able to modify
+Assuming you have connected with an administrative (or root) account, you will also be able to modify
other printer properties such as ACLs and default device settings using this dialog. For the default
device settings, please consider the advice given further in <link linkend="inst-rpc">Installing
Print Drivers Using <command>rpcclient</command></link>.
@@ -2104,7 +2068,7 @@ user</emphasis> nobody. In a DOS box type:
<para><userinput>net use \\<replaceable>SAMBA-SERVER</replaceable>\print$ /user:root</userinput></para>
<para>
-Replace root, if needed, by another valid <smbconfoption name="printer admin"/> user as given in
+Replace root, if needed, by another valid printer administrator user as given in
the definition. Should you already be connected as a different user, you will get an error message. There
is no easy way to get rid of that connection, because Windows does not seem to know a concept of logging
off from a share connection (do not confuse this with logging off from the local workstation; that is
@@ -2204,7 +2168,7 @@ in the following paragraphs.
</para>
<para>
-Be aware that a valid device mode can only be initiated by a <smbconfoption name="printer admin"/> or root
+Be aware that a valid device mode can only be initiated by a printer administrator or root
(the reason should be obvious). Device modes can be correctly set only by executing the printer driver program
itself. Since Samba cannot execute this Win32 platform driver code, it sets this field initially to NULL
(which is not a valid setting for clients to use). Fortunately, most drivers automatically generate the
@@ -2315,12 +2279,12 @@ command...</guimenuitem> field from the <guimenu>Start</guimenu> menu.
</sect2>
<sect2>
-<title>Always Make First Client Connection as root or <quote>printer admin</quote></title>
+<title>Always Make First Client Connection as root or printer administrator</title>
<para>
After you installed the driver on the Samba server (in its <smbconfsection name="[print$]"/> share), you
should always make sure that your first client installation completes correctly. Make it a habit for yourself
-to build the very first connection from a client as <smbconfoption name="printer admin"/>. This is to make
+to build the very first connection from a client as a printer administrator"/>. This is to make
sure that:
</para>
@@ -2354,8 +2318,8 @@ To connect as root to a Samba printer, try this command from a Windows 200x/XP D
<para>
You will be prompted for <constant>root</constant>'s Samba password; type it, wait a few seconds, click on
<guibutton>Printing Defaults</guibutton>, and proceed to set the job options that should be used as defaults
-by all clients. Alternatively, instead of root you can name one other member of the <smbconfoption
-name="printer admin"/> from the setting.
+by all clients. Alternatively, instead of root you can give one other member printer adminadministrator
+privileges.
</para>
<para>
@@ -2458,7 +2422,7 @@ is how I reproduce it in an XP Professional:
Do you see any difference in the two settings dialogs? I do not either. However, only the last one, which you
arrived at with steps C.1 through C.6 will permanently save any settings which will then become the defaults
for new users. If you want all clients to have the same defaults, you need to conduct these steps as
-administrator (<smbconfoption name="printer admin"/>) before a client downloads the driver (the clients can
+administrator before a client downloads the driver (the clients can
later set their own per-user defaults by following procedures A or B above). Windows 200x/XP allow per-user
default settings and the ones the administrator gives them before they set up their own. The parents of the
identical-looking dialogs have a slight difference in their window names; one is called
@@ -2602,7 +2566,7 @@ folder. Also located in this folder is the Windows NT Add Printer Wizard icon. T
<itemizedlist>
<listitem><para>
The connected user is able to successfully execute an <command>OpenPrinterEx(\\server)</command> with
- administrative privileges (i.e., root or <smbconfoption name="printer admin"/>).
+ administrative privileges (i.e., root or a printer administrator).
</para>
<tip><para> Try this from a Windows 200x/XP DOS box command prompt:
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-RightsAndPriviliges.xml b/docs-xml/Samba3-HOWTO/TOSHARG-RightsAndPriviliges.xml
index 07efc46..dc6125e 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-RightsAndPriviliges.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-RightsAndPriviliges.xml
@@ -333,13 +333,9 @@ mailing lists.
<indexterm><primary>global right</primary></indexterm>
<indexterm><primary>administrative rights</primary></indexterm>
<indexterm><primary>printers admin</primary></indexterm>
- This privilege operates identically to the <smbconfoption name="printer admin"/>
- option in the &smb.conf; file (see section 5 man page for &smb.conf;)
- except that it is a global right (not on a per-printer basis).
- Eventually the smb.conf option will be deprecated and administrative
- rights to printers will be controlled exclusively by this right and
- the security descriptor associated with the printer object in the
- <filename>ntprinters.tdb</filename> file.
+ Administrative rights to printers are only controlled exclusively
+ by this right and the security descriptor associated with the
+ printer object in the registry.
</para></listitem>
</varlistentry>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-StandAloneServer.xml b/docs-xml/Samba3-HOWTO/TOSHARG-StandAloneServer.xml
index 4c9a1f0..dfd4e7b 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-StandAloneServer.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-StandAloneServer.xml
@@ -287,7 +287,6 @@ The contents of the &smb.conf; file is shown in <link linkend="AnonPtrSvr">the A
<smbconfsection name="[printers]"/>
<smbconfoption name="comment">All Printers</smbconfoption>
<smbconfoption name="path">/var/spool/samba</smbconfoption>
-<smbconfoption name="printer admin">root</smbconfoption>
<smbconfoption name="guest ok">Yes</smbconfoption>
<smbconfoption name="printable">Yes</smbconfoption>
<smbconfoption name="use client driver">Yes</smbconfoption>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-upgrading-to-3.0.xml b/docs-xml/Samba3-HOWTO/TOSHARG-upgrading-to-3.0.xml
deleted file mode 100644
index 7ae6fd5..0000000
--- a/docs-xml/Samba3-HOWTO/TOSHARG-upgrading-to-3.0.xml
+++ /dev/null
@@ -1,967 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
-<chapter id="upgrading-to-3.0">
-<chapterinfo>
- &author.jelmer;
- &author.jht;
- &author.jerry;
- <pubdate>August 16, 2007</pubdate>
-</chapterinfo>
-
-<title>Updating and Upgrading Samba</title>
-<para>
-This chapter provides a detailed record of changes made during the 3.x series releases. At this time this
--
Samba Shared Repository
More information about the samba-cvs
mailing list