nfs-utils: Tidy up libnfsidmap exported symbols list and API

index dce8148..29f132d 100644
@@ -53,9 +53,11 @@
 #include "conffile.h"
 #include "xlog.h"
 
+#pragma GCC visibility push(hidden)
+
 static void conf_load_defaults(void);
 static char * conf_readfile(const char *path);
-int conf_set(int , const char *, const char *, const char *, 
+static int conf_set(int , const char *, const char *, const char *, 
 	const char *, int , int );
 static void conf_parse(int trans, char *buf, 
 	char **section, char **subsection);

@@ -77,10 +79,8 @@ TAILQ_HEAD (conf_trans_head, conf_trans) conf_trans_queue;
 /*
  * Radix-64 Encoding.
  */
-const uint8_t bin2asc[]
-  = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
-const uint8_t asc2bin[] =
+static const uint8_t asc2bin[] =
 {
   255, 255, 255, 255, 255, 255, 255, 255,
   255, 255, 255, 255, 255, 255, 255, 255,

@@ -489,10 +489,6 @@ static void conf_free_bindings(void)
 	}
 }
 
-#pragma GCC visibility push(hidden)
-/* these are the real fuinctions, hidden from being exported
- * by libnfsidmap ABI compatability */
-
 /* Open the config file and map it into our address space, then parse it.  */
 static void
 conf_load_file(const char *conf_file)

@@ -560,8 +556,6 @@ conf_cleanup(void)
 	TAILQ_INIT(&conf_trans_queue);
 }
 
-#pragma GCC visibility pop
-
 /*
  * Return the numeric value denoted by TAG in section SECTION or DEF
  * if that tag does not exist.

@@ -577,7 +571,6 @@ conf_get_num(const char *section, const char *tag, int def)
 	return def;
 }
 
-#pragma GCC visibility push(hidden)
 /*
  * Return the Boolean value denoted by TAG in section SECTION, or DEF
  * if that tags does not exist.

@@ -609,7 +602,6 @@ conf_get_bool(const char *section, const char *tag, _Bool def)
 		return false;
 	return def;
 }
-#pragma GCC visibility pop
 
 /* Validate X according to the range denoted by TAG in section SECTION.  */
 int

@@ -655,7 +647,6 @@ conf_get_str_with_def(const char *section, const char *tag, char *def)
 	return result;
 }
 
-#pragma GCC visibility push(hidden)
 /*
  * Find a section that may or may not have an argument
  */

@@ -687,7 +678,6 @@ retry:
 	}
 	return 0;
 }
-#pragma GCC visibility pop
 
 /*
  * Build a list of string values out of the comma separated value denoted by

@@ -882,7 +872,7 @@ conf_trans_node(int transaction, enum conf_op op)
 }
 
 /* Queue a set operation.  */
-int
+static int
 conf_set(int transaction, const char *section, const char *arg,
 	const char *tag, const char *value, int override, int is_default)
 {

index 2b12d95..1d6eb31 100644
@@ -42,8 +42,7 @@
 #include <err.h>
 #include <syslog.h>
 #include "nfsidmap.h"
-#include "nfsidmap_internal.h"
-#include "cfg.h"
+#include "nfsidmap_plugin.h"
 
 #include <voms_apic.h>
 

@@ -232,7 +231,7 @@ static int gums_init(void)
 	char buf[512], type[128], value[256];
 	char *alt_conf = NULL;
 
-	alt_conf = conf_get_str("GUMS", "Conf_File");
+	alt_conf = nfsidmap_config_get("GUMS", "Conf_File");
 	if (alt_conf == NULL)
 		f = fopen(prima_conf, "r");
 	else

120 lines not on this page · raw message

new file mode 100644
index 0000000..891c855
@@ -0,0 +1,33 @@
+/*
+ *  nfsidmap_common.c
+ *
+ *  nfs idmapping library, primarily for nfs4 client/server kernel idmapping
+ *  and for userland nfs4 idmapping by acl libraries.
+ *
+ *  Code common to libnfsidmap and some of its bundled plugins
+ *
+ */
+
+#include "config.h"
+
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+#include "nfsidmap.h"
+#include "nfsidmap_private.h"
+#include "nfsidmap_plugin.h"
+#include "conffile.h"
+
+#pragma GCC visibility push(hidden)
+
+int reformat_group = 0;
+int no_strip = 0;
+
+struct conf_list *local_realms;
+
+struct conf_list *get_local_realms(void)
+{
+	return local_realms;
+}
+

79 lines not on this page · raw message

68 lines not on this page · raw message

55 lines not on this page · raw message

index a86d768..6f024dc 100644
@@ -47,10 +47,19 @@
 #include <limits.h>
 #include <ctype.h>
 #include "nfsidmap.h"
-#include "nfsidmap_internal.h"
-#include "conffile.h"
+#include "nfsidmap_plugin.h"
+#include "nfsidmap_private.h"
 #include <syslog.h>
 
+static char *get_default_domain(void)
+{
+	static char default_domain[NFS4_MAX_DOMAIN_LEN] = "";
+	if (default_domain[0] == 0) {
+		nfs4_get_default_domain(NULL, default_domain, NFS4_MAX_DOMAIN_LEN);
+	}
+	return default_domain;
+}
+
 /*
  * NSS Translation Methods
  *

index c82d7f3..0b1173f 100644
@@ -43,7 +43,7 @@
 
 #include "conffile.h"
 #include "nfsidmap.h"
-#include "nfsidmap_internal.h"
+#include "nfsidmap_plugin.h"
 
 /*
  * Static Translation Methods

index 2258aa8..e82828c 100644
@@ -47,7 +47,8 @@
 #define LDAP_DEPRECATED 1
 #include <ldap.h>
 #include "nfsidmap.h"
-#include "nfsidmap_internal.h"
+#include "nfsidmap_plugin.h"
+#include "nfsidmap_private.h"
 #include "conffile.h"
 
 /* attribute/objectclass default mappings */