summaryrefslogtreecommitdiffstats
path: root/package/samba/Config.in
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2012-09-03 21:33:25 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2012-09-03 21:59:03 +0200
commit32a0454d3c495b12824ef4a0d0341237302d148a (patch)
tree9acc870d089b0028cecdfb1846b828ae4bd38910 /package/samba/Config.in
parentf9686563b4fd3eed22e26105f7c440f0b74fcac1 (diff)
parentdafa32b3bd75e9d155d075c796fa5b0ecbb9b11b (diff)
downloadbuildroot-novena-32a0454d3c495b12824ef4a0d0341237302d148a.tar.gz
buildroot-novena-32a0454d3c495b12824ef4a0d0341237302d148a.zip
Merge branch 'next'
Conflicts: package/e2fsprogs/e2fsprogs.mk package/libfuse/libfuse.mk package/multimedia/mpd/mpd.mk package/smartmontools/smartmontools.mk Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/samba/Config.in')
-rw-r--r--package/samba/Config.in7
1 files changed, 7 insertions, 0 deletions
diff --git a/package/samba/Config.in b/package/samba/Config.in
index e88b3609f..928b40bd3 100644
--- a/package/samba/Config.in
+++ b/package/samba/Config.in
@@ -168,6 +168,13 @@ config BR2_PACKAGE_SAMBA_SWAT
help
Samba Web Administration Tool
+config BR2_PACKAGE_SAMBA_SMBTA_UTIL
+ bool "smbta-util"
+ default y
+ help
+ Tool to ease the configuration of the vfs_smb_traffic_analyzer
+ module regarding data encryption.
+
config BR2_PACKAGE_SAMBA_SMBTAR
bool "smbtar"
default y