1.1 --- a/OpenSecurity/bin/proxy_getter.py	Thu Oct 02 13:08:09 2014 +0100
     1.2 +++ b/OpenSecurity/bin/proxy_getter.py	Wed Oct 29 15:18:22 2014 +0100
     1.3 @@ -1,3 +1,39 @@
     1.4 +# ------------------------------------------------------------
     1.5 +# proxy_getter
     1.6 +#   
     1.7 +# Aquire the correct proxy settings of the current machine
     1.8 +#
     1.9 +# Autor: Mihai Bartha, <mihai.bartha@ait.ac.at>       
    1.10 +#
    1.11 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
    1.12 +# 
    1.13 +# 
    1.14 +#     X-Net Services GmbH
    1.15 +#     Elisabethstrasse 1
    1.16 +#     4020 Linz
    1.17 +#     AUSTRIA
    1.18 +#     https://www.x-net.at
    1.19 +# 
    1.20 +#     AIT Austrian Institute of Technology
    1.21 +#     Donau City Strasse 1
    1.22 +#     1220 Wien
    1.23 +#     AUSTRIA
    1.24 +#     http://www.ait.ac.at
    1.25 +# 
    1.26 +# 
    1.27 +# Licensed under the Apache License, Version 2.0 (the "License");
    1.28 +# you may not use this file except in compliance with the License.
    1.29 +# You may obtain a copy of the License at
    1.30 +# 
    1.31 +#    http://www.apache.org/licenses/LICENSE-2.0
    1.32 +# 
    1.33 +# Unless required by applicable law or agreed to in writing, software
    1.34 +# distributed under the License is distributed on an "AS IS" BASIS,
    1.35 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    1.36 +# See the License for the specific language governing permissions and
    1.37 +# limitations under the License.
    1.38 +# ------------------------------------------------------------
    1.39 +
    1.40  import socket
    1.41  import os
    1.42  import httplib
    1.43 @@ -102,4 +138,4 @@
    1.44                  return {'ProxyServer': proxies['ProxyServer']}  
    1.45          return {'ProxyServer': reg_entries['ProxyServer']}
    1.46          
    1.47 -    return None
    1.48 \ No newline at end of file
    1.49 +    return None