svn commit: r338824 - in head: etc lib/libsmb

[Brad Davis]

Author: brd
Date: Thu Sep 20 09:31:27 2018
New Revision: 338824
URL: https://svnweb.freebsd.org/changeset/base/338824

Log:
  Move nsmb.conf to lib/libsmb/
  
  This leverages CONFS to do the install
  
  Approved by:	re (pkgbase, blanket), bapt (mentor)
  Differential Revision:	https://reviews.freebsd.org/D17243

Added:
  head/lib/libsmb/nsmb.conf
     - copied unchanged from r338823, head/etc/nsmb.conf
Deleted:
  head/etc/nsmb.conf
Modified:
  head/etc/Makefile
  head/lib/libsmb/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Thu Sep 20 09:26:10 2018	(r338823)
+++ head/etc/Makefile	Thu Sep 20 09:31:27 2018	(r338824)
@@ -70,7 +70,7 @@ distribution:
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		${BIN1} ${DESTDIR}/etc; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
-		master.passwd nsmb.conf ${DESTDIR}/etc;
+		master.passwd ${DESTDIR}/etc;
 
 .if ${MK_TCSH} == "no"
 	sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
@@ -206,7 +206,7 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY
 
 etc-examples: ${META_DEPS}
 	cd ${.CURDIR}; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${BIN1} ${BIN2} nsmb.conf \
+	    ${BIN1} ${BIN2} \
 	    ${DESTDIR}${SHAREDIR}/examples/etc
 
 .include <bsd.prog.mk>

Modified: head/lib/libsmb/Makefile
==============================================================================
--- head/lib/libsmb/Makefile	Thu Sep 20 09:26:10 2018	(r338823)
+++ head/lib/libsmb/Makefile	Thu Sep 20 09:31:27 2018	(r338824)
@@ -2,6 +2,8 @@
 
 .include <src.opts.mk>
 
+CONFS=	nsmb.conf
+CONFSMODE=	600
 PACKAGE=lib${LIB}
 CONTRIBDIR=	${SRCTOP}/contrib/smbfs
 .PATH: ${CONTRIBDIR}/lib/smb

Copied: head/lib/libsmb/nsmb.conf (from r338823, head/etc/nsmb.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lib/libsmb/nsmb.conf	Thu Sep 20 09:31:27 2018	(r338824, copy of r338823, head/etc/nsmb.conf)
@@ -0,0 +1,56 @@
+# $FreeBSD$
+#
+# smbfs lookups configuration files in next order:
+#	1. ~/.nsmbrc
+#	2. /etc/nsmb.conf - if this file found it will
+#	   override values with same keys from user files.
+#
+#
+# This file consist from a set of sections. Each section started by section name
+# surrounded with square brackets:
+# [section_name]
+#
+# End of the section marked either by new section or by the end of file.
+# Each section can contain zero or more parameters:
+# [section_name]
+# key=value
+#
+# where 'key' represents parameter name and 'value' a value assigned
+# to this parameter.
+#
+# SMB library uses next forms of section names (please note that the section
+# name should be in upper case when it refers to server, user or share):
+# A) [default]
+# B) [SERVER]
+# C) [SERVER:USER]
+# D) [SERVER:USER:SHARE]
+#
+# Here is the map of possible keywords:
+#
+# keyword/section	A  B  C  D	Comment
+#
+# addr			-  +  -  -	IP address of SMB server
+# charsets		+  +  +  +	local:remote charset pair
+# nbns			+  +  -	 -	address of NetBIOS name server (WINS)
+# nbscope		+  +  -	 -	NetBIOS scope
+# nbtimeout		+  +  -	 -	timeout for NetBIOS name servers
+# password		-  -  +	 +	a plain text password used to access to the given share
+# retry_count		+  +  -	 -	number of retries before connection marked as broken
+# timeout		+  +  -	 -	SMB request timeout
+# workgroup		+  +  +  +	name of workgroup
+#
+
+# A simple configuration example:
+
+# First, define a workgroup.
+#[default]
+#workgroup=SALES
+
+# The 'FSERVER' is an NT server.
+#[FSERVER]
+#charsets=koi8-r:cp866
+#addr=fserv.coolcorp.com
+
+#[FSERVER:JOE]
+# use persistent password cache for user 'joe'
+#password=$$1767877DF