Remove unused binary search logic (#812)

1 files changed, 10 insertions, 194 deletions

diff --git a/packages/google-compute-engine-oslogin/src/nss/nss_cache_oslogin.c b/packages/google-compute-engine-oslogin/src/nss/nss_cache_oslogin.c
index ed66a9a..55bb78d 100644
--- a/packages/google-compute-engine-oslogin/src/nss/nss_cache_oslogin.c
+++ b/packages/google-compute-engine-oslogin/src/nss/nss_cache_oslogin.c
@@ -61,129 +61,9 @@ static inline enum nss_status _nss_cache_oslogin_ent_bad_return_code(
 }
 
 //
-// Binary search routines below here
-//
-
-int _nss_cache_oslogin_bsearch2_compare(const void *key, const void *value) {
-  struct nss_cache_oslogin_args *args = (struct nss_cache_oslogin_args *)key;
-  const char *value_text = (const char *)value;
-
-  // Using strcmp as the generation of the index sorts without
-  // locale awareness.
-  return strcmp(args->lookup_key, value_text);
-}
-
-enum nss_status _nss_cache_oslogin_bsearch2(struct nss_cache_oslogin_args *args,
-                                            int *errnop) {
-  enum nss_cache_oslogin_match (*lookup)(
-      FILE *, struct nss_cache_oslogin_args *) = args->lookup_function;
-  FILE *file = NULL;
-  FILE *system_file_stream = NULL;
-  struct stat system_file;
-  struct stat sorted_file;
-  enum nss_status ret = 100;
-  long offset = 0;
-  void *mapped_data = NULL;
-
-  file = fopen(args->sorted_filename, "r");
-  if (file == NULL) {
-    DEBUG("error opening %s\n", args->sorted_filename);
-    return NSS_STATUS_UNAVAIL;
-  }
-
-  // if the sorted file is older than the system file, do not risk stale
-  // data and abort
-  // TODO(vasilios):  should be a compile or runtime option
-  if (stat(args->system_filename, &system_file) != 0) {
-    DEBUG("failed to stat %s\n", args->system_filename);
-    fclose(file);
-    return NSS_STATUS_UNAVAIL;
-  }
-  if (fstat(fileno(file), &sorted_file) != 0) {
-    DEBUG("failed to stat %s\n", args->sorted_filename);
-    fclose(file);
-    return NSS_STATUS_UNAVAIL;
-  }
-  if (difftime(system_file.st_mtime, sorted_file.st_mtime) > 0) {
-    DEBUG("%s may be stale, aborting lookup\n", args->sorted_filename);
-    fclose(file);
-    return NSS_STATUS_UNAVAIL;
-  }
-
-  mapped_data =
-      mmap(NULL, sorted_file.st_size, PROT_READ, MAP_PRIVATE, fileno(file), 0);
-  if (mapped_data == MAP_FAILED) {
-    DEBUG("mmap failed\n");
-    fclose(file);
-    return NSS_STATUS_UNAVAIL;
-  }
-
-  const char *data = (const char *)mapped_data;
-  while (*data != '\n') {
-    ++data;
-  }
-  long entry_size = data - (const char *)mapped_data + 1;
-  long entry_count = sorted_file.st_size / entry_size;
-
-  void *entry = bsearch(args, mapped_data, entry_count, entry_size,
-                        &_nss_cache_oslogin_bsearch2_compare);
-  if (entry != NULL) {
-    const char *entry_text = entry;
-    sscanf(entry_text + strlen(entry_text) + 1, "%ld", &offset);
-  }
-
-  if (munmap(mapped_data, sorted_file.st_size) == -1) {
-    DEBUG("munmap failed\n");
-  }
-  fclose(file);
-
-  if (entry == NULL) {
-    return NSS_STATUS_NOTFOUND;
-  }
-
-  system_file_stream = fopen(args->system_filename, "r");
-  if (system_file_stream == NULL) {
-    DEBUG("error opening %s\n", args->system_filename);
-    return NSS_STATUS_UNAVAIL;
-  }
-
-  if (fseek(system_file_stream, offset, SEEK_SET) != 0) {
-    DEBUG("fseek fail\n");
-    return NSS_STATUS_UNAVAIL;
-  }
-
-  switch (lookup(system_file_stream, args)) {
-    case NSS_CACHE_OSLOGIN_EXACT:
-      ret = NSS_STATUS_SUCCESS;
-      break;
-    case NSS_CACHE_OSLOGIN_ERROR:
-      if (errno == ERANGE) {
-        // let the caller retry
-        *errnop = errno;
-        ret = _nss_cache_oslogin_ent_bad_return_code(*errnop);
-      }
-      break;
-    default:
-      ret = NSS_STATUS_UNAVAIL;
-      break;
-  }
-
-  fclose(system_file_stream);
-  return ret;
-}
-
-//
 // Routines for passwd map defined below here
 //
 
-// _nss_cache_oslogin_setpwent_path()
-// Helper function for testing
-
-extern char *_nss_cache_oslogin_setpwent_path(const char *path) {
-  DEBUG("%s %s\n", "Setting p_filename to", path);
-  return strncpy(p_filename, path, NSS_CACHE_OSLOGIN_PATH_LENGTH - 1);
-}
-
 // _nss_cache_oslogin_pwuid_wrap()
 // Internal wrapper for binary searches, using uid-specific calls.
 
@@ -329,42 +209,15 @@ enum nss_status _nss_cache_oslogin_getpwent_r(struct passwd *result,
 enum nss_status _nss_cache_oslogin_getpwuid_r(uid_t uid, struct passwd *result,
                                               char *buffer, size_t buflen,
                                               int *errnop) {
-  char filename[NSS_CACHE_OSLOGIN_PATH_LENGTH];
-  struct nss_cache_oslogin_args args;
   enum nss_status ret;
 
-  strncpy(filename, p_filename, NSS_CACHE_OSLOGIN_PATH_LENGTH - 1);
-  if (strlen(filename) > NSS_CACHE_OSLOGIN_PATH_LENGTH - 7) {
-    DEBUG("filename too long\n");
-    return NSS_STATUS_UNAVAIL;
-  }
-  strncat(filename, ".ixuid", 6);
-
-  args.sorted_filename = filename;
-  args.system_filename = p_filename;
-  args.lookup_function = _nss_cache_oslogin_pwuid_wrap;
-  args.lookup_value = &uid;
-  args.lookup_result = result;
-  args.buffer = buffer;
-  args.buflen = buflen;
-  char uid_text[11];
-  snprintf(uid_text, sizeof(uid_text), "%d", uid);
-  args.lookup_key = uid_text;
-  args.lookup_key_length = strlen(uid_text);
-
-  DEBUG("Binary search for uid %d\n", uid);
   NSS_CACHE_OSLOGIN_LOCK();
-  ret = _nss_cache_oslogin_bsearch2(&args, errnop);
-
-  if (ret == NSS_STATUS_UNAVAIL) {
-    DEBUG("Binary search failed, falling back to full linear search\n");
-    ret = _nss_cache_oslogin_setpwent_locked();
+  ret = _nss_cache_oslogin_setpwent_locked();
 
-    if (ret == NSS_STATUS_SUCCESS) {
-      while ((ret = _nss_cache_oslogin_getpwent_r_locked(
-          result, buffer, buflen, errnop)) == NSS_STATUS_SUCCESS) {
-        if (result->pw_uid == uid) break;
-      }
+  if (ret == NSS_STATUS_SUCCESS) {
+    while ((ret = _nss_cache_oslogin_getpwent_r_locked(
+                result, buffer, buflen, errnop)) == NSS_STATUS_SUCCESS) {
+      if (result->pw_uid == uid) break;
     }
   }
 
@@ -381,55 +234,18 @@ enum nss_status _nss_cache_oslogin_getpwnam_r(const char *name,
                                               struct passwd *result,
                                               char *buffer, size_t buflen,
                                               int *errnop) {
-  char *pw_name;
-  char filename[NSS_CACHE_OSLOGIN_PATH_LENGTH];
-  struct nss_cache_oslogin_args args;
   enum nss_status ret;
 
   NSS_CACHE_OSLOGIN_LOCK();
+  ret = _nss_cache_oslogin_setpwent_locked();
 
-  // name is a const char, we need a non-const copy
-  pw_name = malloc(strlen(name) + 1);
-  if (pw_name == NULL) {
-    DEBUG("malloc error\n");
-    return NSS_STATUS_UNAVAIL;
-  }
-  strncpy(pw_name, name, strlen(name) + 1);
-
-  strncpy(filename, p_filename, NSS_CACHE_OSLOGIN_PATH_LENGTH - 1);
-  if (strlen(filename) > NSS_CACHE_OSLOGIN_PATH_LENGTH - 8) {
-    DEBUG("filename too long\n");
-    free(pw_name);
-    return NSS_STATUS_UNAVAIL;
-  }
-  strncat(filename, ".ixname", 7);
-
-  args.sorted_filename = filename;
-  args.system_filename = p_filename;
-  args.lookup_function = _nss_cache_oslogin_pwnam_wrap;
-  args.lookup_value = pw_name;
-  args.lookup_result = result;
-  args.buffer = buffer;
-  args.buflen = buflen;
-  args.lookup_key = pw_name;
-  args.lookup_key_length = strlen(pw_name);
-
-  DEBUG("Binary search for user %s\n", pw_name);
-  ret = _nss_cache_oslogin_bsearch2(&args, errnop);
-
-  if (ret == NSS_STATUS_UNAVAIL) {
-    DEBUG("Binary search failed, falling back to full linear search\n");
-    ret = _nss_cache_oslogin_setpwent_locked();
-
-    if (ret == NSS_STATUS_SUCCESS) {
-      while ((ret = _nss_cache_oslogin_getpwent_r_locked(
-          result, buffer, buflen, errnop)) == NSS_STATUS_SUCCESS) {
-        if (!strcmp(result->pw_name, name)) break;
-      }
+  if (ret == NSS_STATUS_SUCCESS) {
+    while ((ret = _nss_cache_oslogin_getpwent_r_locked(
+                result, buffer, buflen, errnop)) == NSS_STATUS_SUCCESS) {
+      if (!strcmp(result->pw_name, name)) break;
     }
   }
 
-  free(pw_name);
   _nss_cache_oslogin_endpwent_locked();
   NSS_CACHE_OSLOGIN_UNLOCK();