Merge pull request #1321 from AudriusButkevicius/bitcheck

Refuse files with unknown bits set (fixes #1276)
2015-02-10 20:27:14 +01:00
parent c87a6c5969 b87ed97402
commit 6bbd74adcd
4 changed files with 72 additions and 3 deletions
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -31,7 +31,7 @@
 		},
 		{
 			"ImportPath": "github.com/syncthing/protocol",
-			"Rev": "442e93d3fc7728d7560c8d039a4199a77879b9f6"
+			"Rev": "4395711d26c61e7e422a8c8da43dda164f1820f4"
 		},
 		{
 			"ImportPath": "github.com/syndtr/goleveldb/leveldb",
--- a/Godeps/_workspace/src/github.com/syncthing/protocol/protocol.go
+++ b/Godeps/_workspace/src/github.com/syncthing/protocol/protocol.go
@@ -43,6 +43,8 @@ const (
 	FlagSymlink                     = 1 << 16
 	FlagSymlinkMissingTarget        = 1 << 17

+	FlagsAll = (1 << iota) - 1
+
 	SymlinkTypeMask = FlagDirectory | FlagSymlinkMissingTarget
 )