Support specifying the GSSAPI library that will be used.

net/http/http_auth_gssapi_posix.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_auth_gssapi_posix.h"
 
 #include <limits>
 #include <string>
 
 #include "base/base64.h"
@@ skipping 367 matching lines @@
                                                 DescribeOid(gssapi_lib,
                                                             mech_type).c_str(),
                                                 ctx_flags,
                                                 locally_initiated,
                                                 open);
   return description;
 }
 
 }  // namespace
 
-GSSAPISharedLibrary::GSSAPISharedLibrary()
+GSSAPISharedLibrary::GSSAPISharedLibrary(const std::string& gssapi_library_name)
     : initialized_(false),
+      gssapi_library_name_(gssapi_library_name),
       gssapi_library_(NULL),
       import_name_(NULL),
       release_name_(NULL),
       release_buffer_(NULL),
       display_name_(NULL),
       display_status_(NULL),
       init_sec_context_(NULL),
       wrap_size_limit_(NULL),
       delete_sec_context_(NULL),
       inquire_context_(NULL) {
@@ skipping 15 matching lines @@
 bool GSSAPISharedLibrary::InitImpl() {
   DCHECK(!initialized_);
   gssapi_library_ = LoadSharedLibrary();
   if (gssapi_library_ == NULL)
     return false;
   initialized_ = true;
   return true;
 }
 
 base::NativeLibrary GSSAPISharedLibrary::LoadSharedLibrary() {
-  static const char* kLibraryNames[] = {
+  const char** kLibraryNames;

[cbentzel, 2010/11/11 03:37:51]

Nit: this should be library_names now [it's no longer a compile time constant].

[Jakob Kummerow (corp), 2010/11/11 11:10:53]

Done.

+  size_t num_lib_names;
+  const char* kTempLibraryName[1];

[cbentzel, 2010/11/11 03:37:51]

Nit: name this something like const char* user_specified_library[1];

[Jakob Kummerow (corp), 2010/11/11 11:10:53]

Done.

+  if (!gssapi_library_name_.empty()) {
+    // We have a user-specified library name, so we ignore hard-coded values.

[danno, 2010/11/10 16:52:01]

Try to avoid using "we" or ""I" in the code and instead passive voice.
This comment is also self-evident from looking at the code, so you might be able
to avoid it altogether.

[Jakob Kummerow (corp), 2010/11/10 17:48:39]

Done.

+    kTempLibraryName[0] = gssapi_library_name_.c_str();
+    kLibraryNames = kTempLibraryName;
+    num_lib_names = 1;
+  } else {
+    static const char* kTempLibraryNames[] = {

[cbentzel, 2010/11/11 03:37:51]

Nit: name kDefaultLibraryNames (there's nothing "Temporary" about these).

[Jakob Kummerow (corp), 2010/11/11 11:10:53]

Done.

 #if defined(OS_MACOSX)
-    "libgssapi_krb5.dylib"  // MIT Kerberos
+      "libgssapi_krb5.dylib"  // MIT Kerberos
 #else
-    "libgssapi_krb5.so.2",  // MIT Kerberos - FC, Suse10, Debian
-    "libgssapi.so.4",       // Heimdal - Suse10, MDK
-    "libgssapi.so.1"        // Heimdal - Suse9, CITI - FC, MDK, Suse10
+      "libgssapi_krb5.so.2",  // MIT Kerberos - FC, Suse10, Debian
+      "libgssapi.so.4",       // Heimdal - Suse10, MDK
+      "libgssapi.so.1"        // Heimdal - Suse9, CITI - FC, MDK, Suse10
 #endif
-  };
-  static size_t num_lib_names = arraysize(kLibraryNames);
+    };
+    kLibraryNames = kTempLibraryNames;
+    num_lib_names = arraysize(kTempLibraryNames);
+  }
 
   for (size_t i = 0; i < num_lib_names; ++i) {
     const char* library_name = kLibraryNames[i];
     FilePath file_path(library_name);
     base::NativeLibrary lib = base::LoadNativeLibrary(file_path);
     if (lib) {
       // Only return this library if we can bind the functions we need.
       if (BindMethods(lib))
         return lib;
       base::UnloadNativeLibrary(lib);
@@ skipping 161 matching lines @@
   return inquire_context_(minor_status,
                           context_handle,
                           src_name,
                           targ_name,
                           lifetime_rec,
                           mech_type,
                           ctx_flags,
                           locally_initiated,
                           open);
 }
-GSSAPILibrary* GSSAPILibrary::GetDefault() {
-  return Singleton<GSSAPISharedLibrary>::get();
-}
 
 ScopedSecurityContext::ScopedSecurityContext(GSSAPILibrary* gssapi_lib)
     : security_context_(GSS_C_NO_CONTEXT),
       gssapi_lib_(gssapi_lib) {
   DCHECK(gssapi_lib_);
 }
 
 ScopedSecurityContext::~ScopedSecurityContext() {
   if (security_context_ != GSS_C_NO_CONTEXT) {
     gss_buffer_desc output_token = GSS_C_EMPTY_BUFFER;
@@ skipping 239 matching lines @@
   if (rv != OK) {
     LOG(ERROR) << "Problem initializing context. \n"
                << DisplayExtendedStatus(library_, major_status, minor_status)
                << '\n'
                << DescribeContext(library_, scoped_sec_context_.get());
   }
   return rv;
 }
 
 }  // namespace net