Mercurial > hg > orthanc

comparison Core/WebServiceParameters.cpp @ 2146:68557554348f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 09 Nov 2016 17:12:11 +0100
parents 39f4207727db
children 4e8e0ad2001c
comparison
equal deleted inserted replaced
2145:39f4207727db 2146:68557554348f
175 SetUrl(url); 175 SetUrl(url);
176 176
177 SetUsername(GetStringMember(peer, "Username", "")); 177 SetUsername(GetStringMember(peer, "Username", ""));
178 SetPassword(GetStringMember(peer, "Password", "")); 178 SetPassword(GetStringMember(peer, "Password", ""));
179 179
180 #if ORTHANC_SANDBOXED == 0
180 if (peer.isMember("CertificateFile")) 181 if (peer.isMember("CertificateFile"))
181 { 182 {
182 SetClientCertificate(GetStringMember(peer, "CertificateFile", ""), 183 SetClientCertificate(GetStringMember(peer, "CertificateFile", ""),
183 GetStringMember(peer, "CertificateKeyFile", ""), 184 GetStringMember(peer, "CertificateKeyFile", ""),
184 GetStringMember(peer, "CertificateKeyPassword", "")); 185 GetStringMember(peer, "CertificateKeyPassword", ""));
185 } 186 }
187 #endif
186 188
187 if (peer.isMember("Pkcs11")) 189 if (peer.isMember("Pkcs11"))
188 { 190 {
189 if (peer["Pkcs11"].type() == Json::booleanValue) 191 if (peer["Pkcs11"].type() == Json::booleanValue)
190 { 192 {