Page MenuHomeFreeBSD
Files F172013711

D24057.id69468.diff
No OneTemporary
Actions

D24057.id69468.diff
View Options

Index: stable/12/contrib/smbfs/mount_smbfs/mount_smbfs.8
===================================================================
--- stable/12/contrib/smbfs/mount_smbfs/mount_smbfs.8
+++ stable/12/contrib/smbfs/mount_smbfs/mount_smbfs.8
@@ -136,12 +136,14 @@
Path to mount point.
.El
.Sh FILES
-.Bl -tag -width ".Pa ~/.nsmbrc" -compact
+.Bl -tag -width ".Pa /etc/nsmb.conf" -compact
.It Pa ~/.nsmbrc
-Keeps static parameters for connections and other information.
+Keeps user-specific static parameters for connections and other information.
See
.Pa /usr/share/examples/smbfs/dot.nsmbrc
for details.
+.It Pa /etc/nsmb.conf
+Keeps system-wide static parameters for connections and other information.
.El
.Sh EXAMPLES
The following example illustrates how to connect to SMB server
@@ -163,7 +165,11 @@
.Pp
.Dl "//guest@samba/public /smb/public smbfs rw,noauto,-N 0 0"
.Sh SEE ALSO
-.Bl -dash
+.Xr smbutil 1 ,
+.Xr nsmb.conf 5
+.Pp
+Other resources:
+.Bl -dash -compact
.It
Chapter dedicated to Samba configuration in the
.Fx
Index: stable/12/contrib/smbfs/smbutil/smbutil.1
===================================================================
--- stable/12/contrib/smbfs/smbutil/smbutil.1
+++ stable/12/contrib/smbfs/smbutil/smbutil.1
@@ -1,5 +1,5 @@
.\" $Id: smbutil.1,v 1.5 2002/04/16 02:48:16 bp Exp $
-.Dd February 14, 2000
+.Dd November 1, 2018
.Dt SMBUTIL 1
.Os
.Sh NAME
@@ -127,6 +127,9 @@
.Pa ./examples/dot.nsmbrc
for details.
.El
+.Sh SEE ALSO
+.Xr nsmb.conf 5 ,
+.Xr mount_smbfs 8
.Sh AUTHORS
.An Boris Popov Aq bp@butya.kz ,
.Aq bp@FreeBSD.org
Index: stable/12/share/man/man5/nsmb.conf.5
===================================================================
--- stable/12/share/man/man5/nsmb.conf.5
+++ stable/12/share/man/man5/nsmb.conf.5
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd November 24, 2016
+.Dd November 2, 2018
.Dt NSMB.CONF 5
.Os
.Sh NAME
@@ -40,6 +40,21 @@
or mount points for the
.Tn SMB
network protocol.
+.Pp
+The configuration files are loaded in the following order:
+.Pp
+.Bl -enum -offset indent -width "" -compact
+.It
+.Pa ~/.nsmbrc
+.It
+.Pa /etc/nsmb.conf
+.El
+.Pp
+As a result,
+.Pa /etc/nsmb.conf
+settings
+override those in
+.Pa ~/.nsmbrc .
.Pp
The configuration hierarchy is made up of several sections,
each section containing a few or several lines of parameters

File Metadata

Mime Type
text/plain
Expires
Wed, Sep 16, 9:42 AM (13 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
39008934
Default Alt Text
D24057.id69468.diff (2 KB)

Event Timeline