1501589 - Port bug 1501404 (part 6): Replace use of NS_STARTTLSSOCKETPROVIDER_CONTRACTID - nsLDAPSecurityGlue.cpp:157:39: error: use of undeclared identifier 'NS_STARTTLSSOCKETPROVIDER_CONTRACTID'

Status: RESOLVED FIXED

(MailNews Core :: LDAP Integration, task)

Description

[Magnus Melin [:mkmelin]]

From bug 1501404 part 6 - https://hg.mozilla.org/mozilla-central/rev/1766ed669623

nsLDAPSecurityGlue.cpp:157:39: error: use of undeclared identifier 'NS_STARTTLSSOCKETPROVIDER_CONTRACTID'

Comment 1

[Magnus Melin [:mkmelin]]

Attachment: bug1501589_NS_STARTTLSSOCKETPROVIDER_CONTRACTID.patch

Think this should do it, but other build errors prevents verifying it

Comment 2

[Magnus Melin [:mkmelin]]

Comment on attachment 9019603 [details] [diff] [review]
bug1501589_NS_STARTTLSSOCKETPROVIDER_CONTRACTID.patch

Review of attachment 9019603 [details] [diff] [review]:
-----------------------------------------------------------------

not ready

Comment 3

[Jorg K (CEST = GMT+2)]

Indeed, it complains about NS_SOCKETPROVIDERSERVICE_CONTRACTID which was also removed here:
https://hg.mozilla.org/mozilla-central/rev/79795a6721cc#l2.12

You want to use this code:
https://hg.mozilla.org/mozilla-central/rev/1766ed669623#l4.43

+  nsCOMPtr<nsISocketProvider> inst;
+  if (!nsCRT::strcmp(type, "ssl") &&
+      XRE_IsParentProcess() &&
+      EnsureNSSInitializedChromeOrContent()) {
+    inst = new nsSSLSocketProvider();
+  } else if (!nsCRT::strcmp(type, "starttls") &&
+             XRE_IsParentProcess() &&
+             EnsureNSSInitializedChromeOrContent()) {
+    inst = new nsTLSSocketProvider();

So just:
nsCOMPtr<nsISocketProvider> inst = new nsTLSSocketProvider();

Comment 4

[Jorg K (CEST = GMT+2)]

Attachment: bug1501589_NS_STARTTLSSOCKETPROVIDER_CONTRACTID.patch (v2)

Done.

Comment 5

[Magnus Melin [:mkmelin]]

Attachment: bug1501589_NS_STARTTLSSOCKETPROVIDER_CONTRACTID.patch

Alternatively this. Not sure which is better

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/fc3bc776f223
Port bug 1501404 (part 6): Replace use of NS_STARTTLSSOCKETPROVIDER_CONTRACTID. r=jorgk

Comment 7

[Magnus Melin [:mkmelin]]

Hm, actually to use startls it does some more checks - https://hg.mozilla.org/mozilla-central/rev/1766ed669623#l4.48 so perhaps the second version should be used?

Comment 8

[Jorg K (CEST = GMT+2)]

Umm, you attached the original patch again :-(

Comment 9

[Jorg K (CEST = GMT+2)]

You're referring to:
+  } else if (!nsCRT::strcmp(type, "starttls") &&
+             XRE_IsParentProcess() &&
+             EnsureNSSInitializedChromeOrContent()) {
+    inst = new nsTLSSocketProvider();

Well, TB doesn't do e10s, so we don't need the XRE_IsParentProcess(). I don't know what the EnsureNSSInitializedChromeOrContent() is about.

Comment 10

[Magnus Melin [:mkmelin]]

Attachment: bug1501589_NS_STARTTLSSOCKETPROVIDER_CONTRACTID.patch

Had forgot to qrefresh. I think this could be preferable. You never know if we start doing e10s one day

Comment 11

[Jorg K (CEST = GMT+2)]

Comment on attachment 9019617 [details] [diff] [review]
bug1501589_NS_STARTTLSSOCKETPROVIDER_CONTRACTID.patch

Yes, this compiles too and looks like the better solution. Sorry about the "trigger happy" landing.

Any reason you moved the block up?

Comment 12

[Jorg K (CEST = GMT+2)]

Attachment: bug1501589_NS_STARTTLSSOCKETPROVIDER_CONTRACTID.patch (v3)

Reshuffled this a bit. Also made it:
    sps = nsSocketProviderService::GetOrCreate();
    if (!sps || NS_FAILED(sps->GetSocketProvider("starttls", getter_AddRefs(tlsSocketProvider)))) {

The previous solution would have crashed if sps==null.

Comment 13

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/97346356d25c
Backed out changeset fc3bc776f223 to make way for a better solution. a=backout
https://hg.mozilla.org/comm-central/rev/3eb79f25d25b
Port bug 1501404 (part 6): Replace use of NS_STARTTLSSOCKETPROVIDER_CONTRACTID. r=jorgk