diff options
| author | Nicole Vreden <damba@slartibartfast.traut> | 2009-12-27 18:39:33 +0100 |
|---|---|---|
| committer | Nicole Vreden <damba@slartibartfast.traut> | 2009-12-27 18:39:33 +0100 |
| commit | 88eea903043e643204d1b9773ef40452fadfc56d (patch) | |
| tree | fa5aad2f4cea5889b67731c7299b401aa0a96f28 /server.policy | |
| parent | 4a1cbbae8c3362b35ef828179b36b6bb650ae1a5 (diff) | |
| parent | 718a520c0faa92a357d0fb11e89ff4ea28bc63a3 (diff) | |
Merge branch 'damba' of ssh://mecka.net/home/git/yalp into damba
Diffstat (limited to 'server.policy')
| -rw-r--r-- | server.policy | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/server.policy b/server.policy index e07e45d..224e0c6 100644 --- a/server.policy +++ b/server.policy @@ -1,8 +1,20 @@ -grant {
- permission java.io.FilePermission "<<ALL FILES>>","execute, read, write";
- permission java.io.FilePermission "C:\\Programme\\VideoLAN\\VLC\\vlc","execute";
- permission java.io.FilePermission "/Applications/VLC.app/Contents/MacOS/VLC","execute";
- permission java.net.SocketPermission "*:1024-","connect,accept,resolve";
- permission java.util.PropertyPermission "id3.default_language", "read";
- permission java.util.PropertyPermission "id3.default_encoding", "read";
-};
+<<<<<<< HEAD +grant { + permission java.io.FilePermission "<<ALL FILES>>","execute, read, write"; + permission java.io.FilePermission "C:\\Programme\\VideoLAN\\VLC\\vlc","execute"; + permission java.io.FilePermission "/Applications/VLC.app/Contents/MacOS/VLC","execute"; + permission java.net.SocketPermission "*:1024-","connect,accept,resolve"; + permission java.net.SocketPermission "localhost:1050","connect,accept,resolve"; + permission java.util.PropertyPermission "id3.default_language", "read"; + permission java.util.PropertyPermission "id3.default_encoding", "read"; +}; +======= +grant { + permission java.io.FilePermission "<<ALL FILES>>","execute, read, write"; + permission java.io.FilePermission "C:\\Programme\\VideoLAN\\VLC\\vlc","execute"; + permission java.io.FilePermission "/Applications/VLC.app/Contents/MacOS/VLC","execute"; + permission java.net.SocketPermission "*:1024-","connect,accept,resolve"; + permission java.util.PropertyPermission "id3.default_language", "read"; + permission java.util.PropertyPermission "id3.default_encoding", "read"; +}; +>>>>>>> c62ff958823168d7622b397609220db8b67fa731 |