]> CyberLeo.Net >> Repos - FreeBSD/stable/10.git/commit
projects / FreeBSD / stable / 10.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 59385cf) | patch
Merge r257888, r258049 from head:
authorglebius <glebius@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Thu, 14 Nov 2013 09:25:29 +0000 (09:25 +0000)
committerglebius <glebius@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Thu, 14 Nov 2013 09:25:29 +0000 (09:25 +0000)
commitc24b4e0408a7b8d7822760449d26db8a575aa2ba
tree4eaf730fbe25cd1ee1015352a6d6155c595ba2a6tree | snapshot
parent59385cff3a89cebd0d52e17e0e2a1a2fbfc79fefcommit | diff
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)

git-svn-id: svn://svn.freebsd.org/base/stable/10@258125 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
contrib/smbfs/lib/smb/nls.c diff | blob | history
lib/libsmb/Makefile diff | blob | history
usr.sbin/mount_smbfs/Makefile diff | blob | history
10-STABLE