[CalendarServer-changes] [14912] CalDAVTester/trunk/odsetup.py

[source_changes at macosforge.org]

Revision: 14912
          http://trac.calendarserver.org//changeset/14912
Author:   cdaboo at apple.com
Date:     2015-06-24 10:08:11 -0700 (Wed, 24 Jun 2015)
Log Message:
-----------
Prefer digest over basic.

Modified Paths:
--------------
    CalDAVTester/trunk/odsetup.py

Modified: CalDAVTester/trunk/odsetup.py
===================================================================
--- CalDAVTester/trunk/odsetup.py	2015-06-24 17:00:15 UTC (rev 14911)
+++ CalDAVTester/trunk/odsetup.py	2015-06-24 17:08:11 UTC (rev 14912)
@@ -428,15 +428,15 @@
     try:
         basic_ok = currentConfig["Authentication.Basic.Enabled"]
     except KeyError:
-        pass
+        basic_ok = False
     try:
         digest_ok = currentConfig["Authentication.Digest.Enabled"]
     except KeyError:
-        pass
-    if basic_ok:
+        digest_ok = False
+    if digest_ok:
+        authtype = "digest"
+    elif basic_ok:
         authtype = "basic"
-    elif digest_ok:
-        authtype = "digest"
 
     return (
         currentConfig["ServerHostName"],
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150624/471167b1/attachment.html>