sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-21 18:04:06 +03:00
Code

docs: Show current system path for smb.conf in &smb.conf entity

Browse Source 
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Andrew Bartlett 2022-06-21 11:44:04 +12:00 committed by Andreas Schneider
parent 45094bd891
commit 6f96bb40e7
7 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs-xml/build/DTD/samba.entities
View File

@ -896,7 +896,7 @@
<!ENTITY smbd '<application>smbd</application>'> <!ENTITY smbd '<application>smbd</application>'>
<!ENTITY nmbd '<application>nmbd</application>'> <!ENTITY nmbd '<application>nmbd</application>'>
<!ENTITY testparm '<application>testparm</application>'> <!ENTITY testparm '<application>testparm</application>'>
<!ENTITY smb.conf '<filename>smb.conf</filename>'> <!ENTITY smb.conf '<filename>&pathconfig.CONFIGFILE;</filename>'>
<!ENTITY smbclient '<application>smbclient</application>'> <!ENTITY smbclient '<application>smbclient</application>'>
<!ENTITY winbindd '<application>winbindd</application>'> <!ENTITY winbindd '<application>winbindd</application>'>
<!ENTITY net '<application>net</application>'> <!ENTITY net '<application>net</application>'>

1
docs-xml/generate-pathconf-entities.sh
View File

@ -17,4 +17,5 @@ echo "
<!ENTITY pathconfig.NTP_SIGND_SOCKET_DIR '\${prefix}/var/lib/ntp_signd'> <!ENTITY pathconfig.NTP_SIGND_SOCKET_DIR '\${prefix}/var/lib/ntp_signd'>
<!ENTITY pathconfig.MITKDCPATH '\${prefix}/sbin/krb5kdc'> <!ENTITY pathconfig.MITKDCPATH '\${prefix}/sbin/krb5kdc'>
<!ENTITY pathconfig.SAMBA_DATADIR '\${prefix}/var/samba'> <!ENTITY pathconfig.SAMBA_DATADIR '\${prefix}/var/samba'>
<!ENTITY pathconfig.CONFIGFILE '\${prefix}/etc/smb.conf'>
" "

2
docs-xml/manpages/idmap_hash.8.xml
View File

@ -25,7 +25,7 @@
This plugin also implements the nss_info API and can be used This plugin also implements the nss_info API and can be used
to support a local name mapping files if enabled via the to support a local name mapping files if enabled via the
&quot;winbind normalize names&quot; and &quot;winbind nss info&quot; &quot;winbind normalize names&quot; and &quot;winbind nss info&quot;
parameters in smb.conf. parameters in &smb.conf;.
The module divides the range into subranges for each domain that is being The module divides the range into subranges for each domain that is being
handled by the idmap config. handled by the idmap config.

2
docs-xml/manpages/idmap_ldap.8.xml
View File

@ -41,7 +41,7 @@
<listitem><para> <listitem><para>
Defines the directory base suffix to use for Defines the directory base suffix to use for
SID/uid/gid mapping entries. If not defined, idmap_ldap will default SID/uid/gid mapping entries. If not defined, idmap_ldap will default
to using the &quot;ldap idmap suffix&quot; option from smb.conf. to using the &quot;ldap idmap suffix&quot; option from &smb.conf;.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>

2
docs-xml/manpages/idmap_script.8.xml
View File

@ -60,7 +60,7 @@
<para> <para>
The tdb2 idmap backend supports an external program for performing id mappings The tdb2 idmap backend supports an external program for performing id mappings
through the smb.conf option <parameter>idmap config * : script</parameter> or through the &smb.conf; option <parameter>idmap config * : script</parameter> or
its deprecated legacy form <parameter>idmap : script</parameter>. its deprecated legacy form <parameter>idmap : script</parameter>.
</para> </para>

2
docs-xml/manpages/libsmbclient.7.xml
View File

@ -93,7 +93,7 @@
When libsmbclient is invoked by an application it searches for a directory called When libsmbclient is invoked by an application it searches for a directory called
<filename>.smb</filename> in the $HOME directory that is specified in the users shell <filename>.smb</filename> in the $HOME directory that is specified in the users shell
environment. It then searches for a file called <filename>smb.conf</filename> which, environment. It then searches for a file called <filename>smb.conf</filename> which,
if present, will fully over-ride the system <filename>/etc/samba/smb.conf</filename> file. If if present, will fully over-ride the system &smb.conf; file. If
instead libsmbclient finds a file called <filename>~/.smb/smb.conf.append</filename>, instead libsmbclient finds a file called <filename>~/.smb/smb.conf.append</filename>,
it will read the system <filename>/etc/samba/smb.conf</filename> and then append the it will read the system <filename>/etc/samba/smb.conf</filename> and then append the
contents of the <filename>~/.smb/smb.conf.append</filename> to it. contents of the <filename>~/.smb/smb.conf.append</filename> to it.

20
docs-xml/manpages/net.8.xml
View File

@ -2111,7 +2111,7 @@ commands.
</para> </para>
<para> <para>
To set this up, first set up your smb.conf by adding to the [global] section: To set this up, first set up your &smb.conf; by adding to the [global] section:
usershare path = /usr/local/samba/lib/usershares usershare path = /usr/local/samba/lib/usershares
@ -2126,7 +2126,7 @@ which means that a file in that directory can be renamed or deleted only
by the owner of the file). by the owner of the file).
Finally, tell smbd how many usershares you will allow by adding to the [global] Finally, tell smbd how many usershares you will allow by adding to the [global]
section of smb.conf a line such as : section of &smb.conf; a line such as :
usershare max shares = 100. usershare max shares = 100.
@ -2154,7 +2154,7 @@ Add or replace a new user defined share, with name "sharename".
<para> <para>
"path" specifies the absolute pathname on the system to be exported. "path" specifies the absolute pathname on the system to be exported.
Restrictions may be put on this, see the global smb.conf parameters: Restrictions may be put on this, see the global &smb.conf; parameters:
"usershare owner only", "usershare prefix allow list", and "usershare owner only", "usershare prefix allow list", and
"usershare prefix deny list". "usershare prefix deny list".
</para> </para>
@ -2166,7 +2166,7 @@ on the share when browsed to by a client.
<para>The optional "acl" field <para>The optional "acl" field
specifies which users have read and write access to the entire share. specifies which users have read and write access to the entire share.
Note that guest connections are not allowed unless the smb.conf parameter Note that guest connections are not allowed unless the &smb.conf; parameter
"usershare allow guests" has been set. The definition of a user "usershare allow guests" has been set. The definition of a user
defined share acl is: "user:permission", where user is a valid defined share acl is: "user:permission", where user is a valid
username on the system and permission can be "F", "R", or "D". username on the system and permission can be "F", "R", or "D".
@ -2184,9 +2184,9 @@ authenticated user has read-only access.
<para> <para>
The optional "guest_ok" has the same effect as the parameter of the The optional "guest_ok" has the same effect as the parameter of the
same name in smb.conf, in that it allows guest access to this user same name in &smb.conf;, in that it allows guest access to this user
defined share. This parameter is only allowed if the global parameter defined share. This parameter is only allowed if the global parameter
"usershare allow guests" has been set to true in the smb.conf. "usershare allow guests" has been set to true in the &smb.conf;.
</para> </para>
There is no separate command to modify an existing user defined share, There is no separate command to modify an existing user defined share,
@ -2268,7 +2268,7 @@ by enabling the RPC conf mode and specifying the address of the remote server.
<para> <para>
The deployment of this configuration data can be activated in two levels from the The deployment of this configuration data can be activated in two levels from the
<emphasis>smb.conf</emphasis> file: Share definitions from registry are <emphasis>&smb.conf;</emphasis> file: Share definitions from registry are
activated by setting <parameter>registry shares</parameter> to activated by setting <parameter>registry shares</parameter> to
<quote>yes</quote> in the [global] section and global configuration options are <quote>yes</quote> in the [global] section and global configuration options are
activated by setting <smbconfoption name="include">registry</smbconfoption> in activated by setting <smbconfoption name="include">registry</smbconfoption> in
@ -2721,7 +2721,7 @@ win32 eventlog files (usually *.evt). evt files are used by the native Windows e
<para> <para>
The import and export of evt files can only succeed when <parameter>eventlog list</parameter> is used in The import and export of evt files can only succeed when <parameter>eventlog list</parameter> is used in
<emphasis>smb.conf</emphasis> file. <emphasis>&smb.conf;</emphasis> file.
See the <citerefentry><refentrytitle>smb.conf</refentrytitle> <manvolnum>5</manvolnum></citerefentry> manpage for details. See the <citerefentry><refentrytitle>smb.conf</refentrytitle> <manvolnum>5</manvolnum></citerefentry> manpage for details.
</para> </para>
@ -2750,7 +2750,7 @@ Prints a eventlog *.evt file to standard output.
Imports a eventlog *.evt file defined by <replaceable>filename</replaceable> into the Imports a eventlog *.evt file defined by <replaceable>filename</replaceable> into the
samba internal tdb representation of eventlog defined by <replaceable>eventlog</replaceable>. samba internal tdb representation of eventlog defined by <replaceable>eventlog</replaceable>.
<replaceable>eventlog</replaceable> needs to part of the <parameter>eventlog list</parameter> <replaceable>eventlog</replaceable> needs to part of the <parameter>eventlog list</parameter>
defined in smb.conf. defined in &smb.conf;.
See the <citerefentry><refentrytitle>smb.conf</refentrytitle> <manvolnum>5</manvolnum></citerefentry> manpage for details. See the <citerefentry><refentrytitle>smb.conf</refentrytitle> <manvolnum>5</manvolnum></citerefentry> manpage for details.
</para> </para>
@ -2763,7 +2763,7 @@ See the <citerefentry><refentrytitle>smb.conf</refentrytitle> <manvolnum>5</manv
Exports the samba internal tdb representation of eventlog defined by <replaceable>eventlog</replaceable> Exports the samba internal tdb representation of eventlog defined by <replaceable>eventlog</replaceable>
to a eventlog *.evt file defined by <replaceable>filename</replaceable>. to a eventlog *.evt file defined by <replaceable>filename</replaceable>.
<replaceable>eventlog</replaceable> needs to part of the <parameter>eventlog list</parameter> <replaceable>eventlog</replaceable> needs to part of the <parameter>eventlog list</parameter>
defined in smb.conf. defined in &smb.conf;.
See the <citerefentry><refentrytitle>smb.conf</refentrytitle> <manvolnum>5</manvolnum></citerefentry> manpage for details. See the <citerefentry><refentrytitle>smb.conf</refentrytitle> <manvolnum>5</manvolnum></citerefentry> manpage for details.
</para> </para>