1 files changed, 65 insertions, 3 deletions

diff --git a/src/network/configure.json b/src/network/configure.json
index f74c481f38..f501465c91 100644
--- a/src/network/configure.json
+++ b/src/network/configure.json
@@ -98,6 +98,30 @@
                     "condition": "!config.msvc"
                 }
             ]
+        },
+        "gssapi": {
+            "label": "KRB5 GSSAPI Support",
+            "test": {
+                "head": [
+                    "#if defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__))",
+                    "#  include <TargetConditionals.h>",
+                    "#  if defined(TARGET_OS_MAC) && TARGET_OS_MAC",
+                    "#    include <GSS/GSS.h>",
+                    "#  endif",
+                    "#else",
+                    "#  include <gssapi/gssapi.h>",
+                    "#endif"
+                ],
+                "main": [
+                  "gss_ctx_id_t ctx;",
+                  "gss_context_time(nullptr, ctx, nullptr);"
+                ]
+            },
+            "sources": [
+                { "libs": "-framework GSS", "condition": "config.darwin" },
+                { "type": "pkgConfig", "args": "krb5-gssapi" },
+                "-lgssapi_krb5"
+            ]
         }
     },
 
@@ -199,6 +223,22 @@
                 ]
             },
             "use": "openssl"
+        },
+        "netlistmgr": {
+            "label": "Network List Manager",
+            "type": "compile",
+            "test": {
+                "include": [ "netlistmgr.h", "wrl/client.h" ],
+                "main": [
+                    "using namespace Microsoft::WRL;",
+                    "ComPtr<INetworkListManager> networkListManager;",
+                    "ComPtr<IConnectionPoint> connectionPoint;",
+                    "ComPtr<IConnectionPointContainer> connectionPointContainer;",
+                    "networkListManager.As(&connectionPointContainer);",
+                    "connectionPointContainer->FindConnectionPoint(IID_INetworkConnectionEvents, &connectionPoint);"
+                ],
+                "qmake": "LIBS += -lOle32"
+            }
         }
     },
 
@@ -261,7 +301,7 @@
             "disable": "input.securetransport == 'no' || input.ssl == 'no'",
             "condition": "config.darwin && (input.openssl == '' || input.openssl == 'no')",
             "output": [
-                "privateFeature",
+                "publicFeature",
                 { "type": "define", "name": "QT_SECURETRANSPORT" }
             ]
         },
@@ -283,7 +323,7 @@
             "label": "DTLS",
             "purpose": "Provides a DTLS implementation",
             "section": "Networking",
-            "condition": "features.openssl && tests.dtls",
+            "condition": "features.openssl && features.udpsocket && tests.dtls",
             "output": [ "publicFeature" ]
         },
         "ocsp": {
@@ -378,6 +418,27 @@
             "purpose": "Provides API for DNS lookups.",
             "section": "Networking",
             "output": [ "publicFeature" ]
+        },
+        "gssapi": {
+            "label": "GSSAPI",
+            "purpose": "Enable SPNEGO authentication through GSSAPI",
+            "section": "Networking",
+            "condition": "!config.win32 && libs.gssapi",
+            "output": [ "publicFeature", "feature" ]
+        },
+        "sspi": {
+            "label": "SSPI",
+            "purpose": "Enable NTLM/SPNEGO authentication through SSPI",
+            "section": "Networking",
+            "condition": "config.win32 && !config.winrt",
+            "output": [ "publicFeature", "feature" ]
+        },
+        "netlistmgr": {
+            "label": "Network List Manager",
+            "purpose": "Use Network List Manager to keep track of network connectivity",
+            "section": "Networking",
+            "condition": "config.win32 && tests.netlistmgr",
+            "output": [ "privateFeature" ]
         }
     },
 
@@ -437,7 +498,8 @@ For example:
                 "dtls",
                 "ocsp",
                 "sctp",
-                "system-proxies"
+                "system-proxies",
+                "gssapi"
             ]
         }
     ]