Attachment 694 Details for Bug 5543 – Fix some problems found on bug 735

[patch] Fix some problems found on bug 735

bar.patch (text/plain), 6.28 KB, created by Peter Åstrand on 2016-05-25 13:41:04 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Åstrand

Created: 2016-05-25 13:41:04 CEST

Size: 6.28 KB

patch

obsolete

>Index: doc/external/configuration.xml
>===================================================================
>--- doc/external/configuration.xml	(revision 31450)
>+++ doc/external/configuration.xml	(arbetskopia)
>@@ -1517,7 +1517,7 @@
>               <varname>logging</varname>
>               folder. To turn off logging to file, set the parameter
>               <varname>log_to_file</varname>
>-              to 0. Note that the log file will still be created. If abnormal
>+              to false. Note that the log file will still be created. If abnormal
>               situations occur because of programming errors, data may appear
>               in the file.
>             </para>
>@@ -1541,7 +1541,7 @@
>               <varname>log_to_syslog</varname>
>               under the
>               <varname>logging</varname>
>-              folder to 1, logs will be written to syslog. Specify the syslog
>+              folder to true, logs will be written to syslog. Specify the syslog
>               facility in the parameter
>               <varname>syslog_facility</varname>
>               . The default behaviour is not to log to syslog.
>Index: printer/modules/thinlinc/tlprinter.py
>===================================================================
>--- printer/modules/thinlinc/tlprinter.py	(revision 31450)
>+++ printer/modules/thinlinc/tlprinter.py	(arbetskopia)
>@@ -375,7 +375,7 @@
> 
>     for location in hive.get_folders("/printing/nearest/locations"):
>         location2printer[location] = hive.get_string_list("/printing/nearest/locations/%s/printers" % location, [])
>-        if hive.get_bool("/printing/nearest/locations/%s/useforunknown" % location, 0):
>+        if hive.get_bool("/printing/nearest/locations/%s/useforunknown" % location, False):
>             hw2printers["unknown"] += hive.get_string_list("/printing/nearest/locations/%s/printers" % location, [])
> 
>     for printer in get_current_printerlist(username=None):
>@@ -457,7 +457,7 @@
>             # We store the usernames for all sessions with an hardware
>             # address that is unknown to the printer database under the key
>             # 'unknown'. It is later used to construct the list of printers
>-            # based on locations that has the useforunknown=1 setting.
>+            # based on locations that has the useforunknown=true setting.
>             if not hw2printer.has_key(hwaddr):
>                 hwaddr = "unknown"
> 
>@@ -539,7 +539,7 @@
>     #
>     # Hardware address might be 'unknown'. There is an entry for that
>     # as well in hw2printer, including any printers that are listed in
>-    # locations that have useforunknown=1
>+    # locations that have useforunknown=true
>     allowed_printers = {}
>     for hwaddr in hwaddrs:
>         for printer in hw2printer[hwaddr]:
>Index: vsm/vsmagent.hconf
>===================================================================
>--- vsm/vsmagent.hconf	(revision 31450)
>+++ vsm/vsmagent.hconf	(arbetskopia)
>@@ -36,7 +36,7 @@
> default_geometry=1024 768
> 
> # Save password for future logins?
>-single_signon=1
>+single_signon=true
> 
> # Extra arguments to pass to the Xserver Xvnc, for example:
> # xserver_args=-MaxIdleTime 60
>@@ -81,10 +86,10 @@
> LD_LIBRARY_PATH=/opt/thinlinc/lib64:/opt/thinlinc/lib
> 
> [/vsmagent/logging]
>-log_to_file=1
>+log_to_file=true
> logfile=/var/log/vsmagent.log
> 
>-log_to_syslog=0
>+log_to_syslog=false
> syslog_facility=local0
> syslog_socket=/dev/log
> syslog_host=
>Index: vsm/modules/thinlinc/vsm/loginhandler_common.py
>===================================================================
>--- vsm/modules/thinlinc/vsm/loginhandler_common.py	(revision 31450)
>+++ vsm/modules/thinlinc/vsm/loginhandler_common.py	(arbetskopia)
>@@ -51,7 +51,7 @@
>         raise NotImplementedError
> 
>     def unbind_ports(self):
>-        if self.parent.hive.get_bool("/vsmserver/unbind_ports_at_login", 1):
>+        if self.parent.hive.get_bool("/vsmserver/unbind_ports_at_login", True):
>             agenthost = self.sessinfo['agenthost']
>             display = self.sessinfo['display']
>             url = self.agenturl(agenthost)
>Index: vsm/modules/thinlinc/tllogger.py
>===================================================================
>--- vsm/modules/thinlinc/tllogger.py	(revision 31450)
>+++ vsm/modules/thinlinc/tllogger.py	(arbetskopia)
>@@ -54,8 +54,8 @@
>         logging.addLevelName(DEBUG-1, "DEBUG2")
>         logging.addLevelName(DEBUG-2, "DEBUG3")
> 
>-        self.log_to_file = self.get_bool("log_to_file", 1)
>-        self.log_to_syslog = self.get_bool("log_to_syslog", 0)
>+        self.log_to_file = self.get_bool("log_to_file", True)
>+        self.log_to_syslog = self.get_bool("log_to_syslog", False)
> 
>         # Set up file or stream logger.
>         if self.log_to_file:
>Index: vsm/vsmserver.hconf
>===================================================================
>--- vsm/vsmserver.hconf	(revision 31450)
>+++ vsm/vsmserver.hconf	(arbetskopia)
>@@ -71,10 +71,10 @@
> nodes=
> 
> [/vsmserver/logging]
>-log_to_file=1
>+log_to_file=true
> logfile=/var/log/vsmserver.log
> 
>-log_to_syslog=0
>+log_to_syslog=false
> syslog_facility=local0
> syslog_socket=/dev/log
> syslog_host=
>Index: autotests/license_system/logger.hconf
>===================================================================
>--- autotests/license_system/logger.hconf	(revision 31450)
>+++ autotests/license_system/logger.hconf	(arbetskopia)
>@@ -1,8 +1,8 @@
> [/autotests/logging]
>-log_to_file=1
>+log_to_file=true
> logfile=tmp/logfile
> 
>-log_to_syslog=0
>+log_to_syslog=false
> syslog_facility=local0
> syslog_socket=/dev/log
> syslog_host=
>Index: tladm/tlwebadm/tlwebadm.hconf
>===================================================================
>--- tladm/tlwebadm/tlwebadm.hconf	(revision 31450)
>+++ tladm/tlwebadm/tlwebadm.hconf	(arbetskopia)
>@@ -25,10 +25,10 @@
> gnutls_priority=NORMAL:-VERS-SSL3.0
> 
> [/tlwebadm/logging]
>-log_to_file=1
>+log_to_file=true
> logfile=/var/log/tlwebadm.log
> 
>-log_to_syslog=0
>+log_to_syslog=false
> syslog_facility=local0
> syslog_socket=/dev/log
> syslog_host=
>Index: webaccess/webaccess.hconf
>===================================================================
>--- webaccess/webaccess.hconf	(revision 31450)
>+++ webaccess/webaccess.hconf	(arbetskopia)
>@@ -22,10 +22,10 @@
> gnutls_priority=NORMAL:-VERS-SSL3.0
> 
> [/webaccess/logging]
>-log_to_file=1
>+log_to_file=true
> logfile=/var/log/tlwebaccess.log
> 
>-log_to_syslog=0
>+log_to_syslog=false
> syslog_facility=local0
> syslog_socket=/dev/log
> syslog_host=

Actions: View

Attachments on bug 5543: 694