diff options
| author | Nicole Vreden <damba@slartibartfast.traut> | 2009-12-30 19:20:54 +0100 |
|---|---|---|
| committer | Nicole Vreden <damba@slartibartfast.traut> | 2009-12-30 19:20:54 +0100 |
| commit | a02ae21955b5fbc6e1922debb514392739790628 (patch) | |
| tree | 3090475c0ec91d98ab6ec9b03e72eacce511c3d4 /server.policy | |
| parent | 97ecea2efaff1daa73492ecbc56835f985be62f3 (diff) | |
| parent | 662d4edc187427bbabb75bad3daa3a02007f783c (diff) | |
Merge branch 'damba' of ssh://mecka.net/home/git/yalp into damba
Conflicts:
src/YalpClients/EflClient/list_test.edc
src/YalpClients/EflClient/list_test_elem.py
Signed-off-by: Nicole Vreden <damba@slartibartfast.traut>
Diffstat (limited to 'server.policy')
| -rw-r--r-- | server.policy | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/server.policy b/server.policy index 224e0c6..e07e45d 100644 --- a/server.policy +++ b/server.policy @@ -1,20 +1,8 @@ -<<<<<<< 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 +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";
+};
|