Revert 97925 - Linux: allow linking directly with Kerberos instead of using dlopen.

net/http/http_auth_gssapi_posix.cc

 // Copyright (c) 2011 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"
 #include "base/file_path.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 
-#if defined(DLOPEN_KERBEROS)
 // These are defined for the GSSAPI library:
 // Paraphrasing the comments from gssapi.h:
 // "The implementation must reserve static storage for a
 // gss_OID_desc object for each constant.  That constant
 // should be initialized to point to that gss_OID_desc."
 namespace {
 
 static gss_OID_desc GSS_C_NT_USER_NAME_VAL = {
   10,
   const_cast<char*>("\x2a\x86\x48\x86\xf7\x12\x01\x02\x01\x01")
@@ skipping 25 matching lines @@
 
 }  // namespace
 
 gss_OID GSS_C_NT_USER_NAME = &GSS_C_NT_USER_NAME_VAL;
 gss_OID GSS_C_NT_MACHINE_UID_NAME = &GSS_C_NT_MACHINE_UID_NAME_VAL;
 gss_OID GSS_C_NT_STRING_UID_NAME = &GSS_C_NT_STRING_UID_NAME_VAL;
 gss_OID GSS_C_NT_HOSTBASED_SERVICE_X = &GSS_C_NT_HOSTBASED_SERVICE_X_VAL;
 gss_OID GSS_C_NT_HOSTBASED_SERVICE = &GSS_C_NT_HOSTBASED_SERVICE_VAL;
 gss_OID GSS_C_NT_ANONYMOUS = &GSS_C_NT_ANONYMOUS_VAL;
 gss_OID GSS_C_NT_EXPORT_NAME = &GSS_C_NT_EXPORT_NAME_VAL;
-#endif  // defined(DLOPEN_KERBEROS)
 
 namespace net {
 
 // These are encoded using ASN.1 BER encoding.
 
 // This one is used by Firefox's nsAuthGSSAPI class.
 gss_OID_desc CHROME_GSS_KRB5_MECH_OID_DESC_VAL = {
   9,
   const_cast<char*>("\x2a\x86\x48\x86\xf7\x12\x01\x02\x02")
 };
@@ skipping 328 matching lines @@
 }
 
 bool GSSAPISharedLibrary::Init() {
   if (!initialized_)
     InitImpl();
   return initialized_;
 }
 
 bool GSSAPISharedLibrary::InitImpl() {
   DCHECK(!initialized_);
-#if defined(DLOPEN_KERBEROS)
   gssapi_library_ = LoadSharedLibrary();
   if (gssapi_library_ == NULL)
     return false;
-#endif  // defined(DLOPEN_KERBEROS)
   initialized_ = true;
   return true;
 }
 
 base::NativeLibrary GSSAPISharedLibrary::LoadSharedLibrary() {
   const char** library_names;
   size_t num_lib_names;
   const char* user_specified_library[1];
   if (!gssapi_library_name_.empty()) {
     user_specified_library[0] = gssapi_library_name_.c_str();
@@ skipping 26 matching lines @@
       // Only return this library if we can bind the functions we need.
       if (BindMethods(lib))
         return lib;
       base::UnloadNativeLibrary(lib);
     }
   }
   LOG(WARNING) << "Unable to find a compatible GSSAPI library";
   return NULL;
 }
 
-#if defined(DLOPEN_KERBEROS)
 #define BIND(lib, x)                                                    \
-  DCHECK(lib);                                                          \
   gss_##x##_type x = reinterpret_cast<gss_##x##_type>(                  \
       base::GetFunctionPointerFromNativeLibrary(lib, "gss_" #x));       \
   if (x == NULL) {                                                      \
     LOG(WARNING) << "Unable to bind function \"" << "gss_" #x << "\"";  \
     return false;                                                       \
   }
-#else
-#define BIND(lib, x) gss_##x##_type x = gss_##x
-#endif
 
 bool GSSAPISharedLibrary::BindMethods(base::NativeLibrary lib) {
+  DCHECK(lib != NULL);
+
   BIND(lib, import_name);
   BIND(lib, release_name);
   BIND(lib, release_buffer);
   BIND(lib, display_name);
   BIND(lib, display_status);
   BIND(lib, init_sec_context);
   BIND(lib, wrap_size_limit);
   BIND(lib, delete_sec_context);
   BIND(lib, inquire_context);
 
@@ skipping 393 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