Remove svn:mergeinfo from the releng/10.0 branch.

After branch creation from stable/10, the stable/10 branch mergeinfo
was moved to the root of the branch.

Since there have not been any merges from stable/10 to releng/10.0
yet, we do not need to track any of the existing mergeinfo here.

Merges to releng/10.0 should now be done to the root of the branch.

For future branches during the release cycle, unless otherwise noted,
this change will be done as part of the stable/ and releng/ branch
creation.

Discussed with: peter
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

- Copy stable/10 (r259064) to releng/10.0 as part of the
10.0-RELEASE cycle.
- Update __FreeBSD_version [1]
- Set branch name to -RC1

[1] 10.0-CURRENT __FreeBSD_version value ended at '55', so
start releng/10.0 at '100' so the branch is started with
a value ending in zero.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Merge r257888, r258049 from head:

- Use system libiconv, instead of trying to dlopen() it.
- Just disable recoding support in libsmb if built WITHOUT_ICONV.

PR: 183153
Approved by: re (kib)

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

- Trim an unused and bogus Makefile for mount_smbfs.
- Reconnect with some minor modifications, in particular now selsocket()
internals are adapted to use sbintime units after recent'ish calloutng
switch.

Completely rewrite the interface to smbdev switching from dev_clone
to cdevpriv(9). This commit changes the semantic of mount_smbfs
in userland as well, which now passes file descriptor in order to
to mount a specific filesystem istance.

Reviewed by: attilio, ed
Tested by: martymac

Bump .Dd date for previous revision.

Approved by: re (follow up commit fixing trivial issue)

Change the example of using smbfs in fstab to a password-less one,
which is less likely to block a remote system from boot.

Submitted by: Garrett Cooper <yanegomi@gmail.com>
PR: doc/160775
MFC after: 1 month
Approved by: re (kib)

shi1_remark is in little endian format, convert it to host ordering.
Also remove upper 16bits which always seem to be 0xFFFF. We don't
allocate more than 64KB buffer anyway.
This change make smbutil work on sparc64.

Reviewed by: marius, bp
Approved by: bp

Document the "-U" option. While it is not part of the
getopt(), it is accepted through smb_ctx_init() in
lib/smb/ctx.c.

PR: 117013
Submitted by: Tom Evans <tevans.uk@googlemail.com> (original version)

When encoding an smb name, truncate one byte earlier in order than we did
previously in order to ensure it fit properly in the bufer when encoded.
This prevents a debugging printf from firing if a source or destination
host name for an smb mount exceeds 15 characters.

MFC after: 3 days
Obtained from: Apple, Inc.

Document default values for timeout and retry count.

Approved by: fjoe

Spell 'connection options' correctly.

Submitted by: Leonidas Tsampros <ltsampros@upnet.gr>

-mdoc sweep.

Unbreak on amd64.

Convert mount_smbfs to use nmount().

Reviewed by: bp (smbfs maintainer)

Quick kill links to the nsmb(8) manual page, there is no such
utility that I can find.

Allow user to override default port numbers used by communication
protocols. This is very useful for tunneled SMB connections.

MFC after: 4 weeks

Fix get{w,d}{l,b}e, set{w,d}{l,b}e macros on big endian systems.

Obtained from: NetBSD

Remove macros
htole{s,l,q}, letoh{s,l,q}, htobe{s,l,q}, betoh{s,l,q}
and replace it with more standard byteorder macros in our system.

- Fix checking range of strings of struct iconv_add_in in libsmb and libkiconv,
- Add checking range of strings to iconv_sysctl_add().

Submitted by: Rudolf Cejka

Tell nls_setlocale() the very locale name from command line option,
rather than using optarg variable which would be allways NULL.

Correct argument order of kiconv_add_xlat16_cspairs().

Security:

Fix core dump when "smbutil lc".

OK'ed by: bp

Make smbfs capable to use 16bit char set in filenames.

PR:78110

+ Get prototypes for libc functions.
+ Use the correct printf format for size_t.

Size matters. Correctly use a size_t so 64-bit hosts can mount SMB FS's
when using character set conversions.
Also include POSIX <string.h> vs. BSD <strings.h> now that we've broken
traditional BSD behavior [and compatibility with our BSD brethren].

PR: 72445
Submitted by: Vladimir Nechitailo <nechit@lpi.ru>
Patch by: Stasys Smailys <ssmailys@komvista.lt>

Correctly check the return value of kldload() to determine whether an
error occurred.

Do not use casts as lvalues.

Use correct location for nsmb.conf file.

PR: misc/45273

Re-add the code to automatically load the smbfs.ko module if necessary.
We can't realy on the mount(2) system call to do it for us here because
smb_lib_init() needs the module and we call it before mount(). The old
code has been slightly modified to not use the getvfsent(3) API which
is now retired.

Noticed by: many

Fine-tune the last change even more and use the return value as error
indicator, as it is expected.

Spotted by: Christoph Mallon <christoph.mallon@gmx.de>

Don't return NULL when the function is defined to return an integer.

OK'ed by: tjr

Sync with other mount_*fs(8) utilities; we don't need to try to
load the smbfs module because the mount(2) syscall will do it
if it's needed.

Merge from NetBSD rev. 1.3 (drochner): Use getifaddrs(3) instead of
SIOCGIFCONF.

Merge from NetBSD rev. 1.2 (drochner): Do the address calculations inside
the data delivered by SIOCGIFCONF correctly (this isn't a plain array!),
and sort the checks a bit to avoid duplicates in the interface list.

Remove the # ("stringify") operator from the printf() arguments in
the iprintf macro. It was causing the actual format string and
variable names to be written out, instead of substituting the values
of the variables into the format string.

- Correct the path to the dot.nsmbrc sample file.
- Add FreeBSD CVS tag.

PR: docs/35649
Submitted by: roam
Approved by: ceri (mentor)

Fix some off-by-one errors dealing with limits of server names,
usernames, workgroup names and passwords. We can now connect to
servers with 15-character NetBIOS names. (Some versions of Windows
use semi-random 15-char names by default.)

PR: 46902

Fixes for 64 bit cleanliness. The length arg to sysctl is a pointer to
size_t not int.

Reviewed by: bp

Use #include <string.h> rather than <strings.h> so that the strdup()
prototype gets brought into scope. This is a big deal for 64 bit
systems where the default return value of 'int' is != pointer.

Reviewed by: bp

Pass getvfsbyname() the address of a struct xvfsconf instead of
struct vfsconf. This silences a warning, but could also prevent
stack corruption problems if xvfsconf ever became larger than vfsconf.

PR: 53863
Submitted by: Lukas Ertl

The author wanted stringification, not concatenation.

Fix a typo in the -O parsing code that caused a crash when the -O option
is used without supplying "sowner:sgroup".

Obtained from: NetBSD (jdolecek)
PR: 37171

This commit was generated by cvs2svn to compensate for changes in r100490,
which included commits to RCS files with non-trunk default branches.

This commit was generated by cvs2svn to compensate for changes in r95267,
which included commits to RCS files with non-trunk default branches.

This commit was generated by cvs2svn to compensate for changes in r88492,
which included commits to RCS files with non-trunk default branches.

This commit was generated by cvs2svn to compensate for changes in r88282,
which included commits to RCS files with non-trunk default branches.

Detail the smbfs-1.4.1 import.

This commit was generated by cvs2svn to compensate for changes in r87866,
which included commits to RCS files with non-trunk default branches.