libutil/zsecurity: make zmq security class private

Problem: the flux_sec_t "class" is only used by the broker and flux-keygen, and should be removed from the public API. Relocate to libutil/zsecurity. Fixes #1843
flux-framework · Nov 19, 2018 · e098c8b · e098c8b
1 parent 08f2e31
commit e098c8b
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 17 deletions.
diff --git a/src/broker/broker.c b/src/broker/broker.c
@@ -64,6 +64,7 @@
 #include "src/common/libutil/ipaddr.h"
 #include "src/common/libutil/kary.h"
 #include "src/common/libutil/monotime.h"
+#include "src/common/libutil/zsecurity.h"
 #include "src/common/libpmi/pmi.h"
 #include "src/common/libpmi/pmi_strerror.h"
 

diff --git a/src/broker/overlay.c b/src/broker/overlay.c
@@ -37,6 +37,7 @@
 #include "src/common/libutil/iterators.h"
 #include "src/common/libutil/kary.h"
 #include "src/common/libutil/cleanup.h"
+#include "src/common/libutil/zsecurity.h"
 
 #include "heartbeat.h"
 #include "overlay.h"

diff --git a/src/broker/overlay.h b/src/broker/overlay.h
@@ -2,6 +2,7 @@
 #define _BROKER_OVERLAY_H
 
 #include "attr.h"
+#include "src/common/libutil/zsecurity.h"
 
 typedef struct overlay_struct overlay_t;
 typedef void (*overlay_cb_f)(overlay_t *ov, void *sock, void *arg);

diff --git a/src/cmd/flux-keygen.c b/src/cmd/flux-keygen.c
@@ -29,6 +29,7 @@
 #include <flux/core.h>
 
 #include "src/common/libutil/log.h"
+#include "src/common/libutil/zsecurity.h"
 
 
 #define OPTIONS "hfpd:"

diff --git a/src/common/libflux/Makefile.am b/src/common/libflux/Makefile.am
@@ -58,7 +58,6 @@ fluxcoreinclude_HEADERS = \
 	connector.h \
 	reactor.h \
 	msg_handler.h \
-	security.h \
 	message.h \
 	request.h \
 	keepalive.h \
@@ -90,7 +89,6 @@ libflux_la_SOURCES = \
 	handle.c \
 	reactor.c \
 	msg_handler.c \
-	security.c \
 	message.c \
 	request.c \
 	response.c \
@@ -130,7 +128,6 @@ TESTS = test_message.t \
 	test_response.t \
 	test_event.t \
 	test_tagpool.t \
-	test_security.t \
 	test_future.t \
 	test_composite_future.t \
 	test_reactor.t \
@@ -199,10 +196,6 @@ test_reactor_t_SOURCES = test/reactor.c
 test_reactor_t_CPPFLAGS = $(test_cppflags)
 test_reactor_t_LDADD = $(test_ldadd) $(LIBDL)
 
-test_security_t_SOURCES = test/security.c
-test_security_t_CPPFLAGS = $(test_cppflags)
-test_security_t_LDADD = $(test_ldadd) $(LIBDL)
-
 test_future_t_SOURCES = test/future.c
 test_future_t_CPPFLAGS = $(test_cppflags)
 test_future_t_LDADD = $(test_ldadd) $(LIBDL)

diff --git a/src/common/libflux/flux.h b/src/common/libflux/flux.h
@@ -30,7 +30,6 @@
 #include "reactor.h"
 #include "msg_handler.h"
 #include "connector.h"
-#include "security.h"
 #include "message.h"
 #include "request.h"
 #include "response.h"

diff --git a/src/common/libflux/message.h b/src/common/libflux/message.h
@@ -30,7 +30,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include "types.h"
-#include "security.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/common/libutil/Makefile.am b/src/common/libutil/Makefile.am
@@ -86,7 +86,9 @@ libutil_la_SOURCES = \
 	aux.c \
 	aux.h \
 	fdutils.c \
-	fdutils.h
+	fdutils.h \
+	zsecurity.c \
+	zsecurity.h
 
 EXTRA_DIST = veb_mach.c
 
@@ -112,7 +114,8 @@ TESTS = test_nodeset.t \
 	test_ipaddr.t \
 	test_fluid.t \
 	test_aux.t \
-	test_fdutils.t
+	test_fdutils.t \
+	test_zsecurity.t
 
 
 test_ldadd = \
@@ -224,3 +227,7 @@ test_aux_t_LDADD = $(test_ldadd)
 test_fdutils_t_SOURCES = test/fdutils.c
 test_fdutils_t_CPPFLAGS = $(test_cppflags)
 test_fdutils_t_LDADD = $(test_ldadd)
+
+test_zsecurity_t_SOURCES = test/zsecurity.c
+test_zsecurity_t_CPPFLAGS = $(test_cppflags)
+test_zsecurity_t_LDADD = $(test_ldadd)
diff --git a/src/common/libflux/test/security.c → src/common/libutil/test/zsecurity.c b/src/common/libflux/test/security.c → src/common/libutil/test/zsecurity.c
@@ -12,7 +12,7 @@
 #include <dirent.h>
 #include <czmq.h>
 
-#include "src/common/libflux/security.h"
+#include "src/common/libutil/zsecurity.h"
 #include "src/common/libtap/tap.h"
 #include "src/common/libutil/unlink_recursive.h"
 

diff --git a/src/common/libflux/security.c → src/common/libutil/zsecurity.c b/src/common/libflux/security.c → src/common/libutil/zsecurity.c
@@ -22,7 +22,7 @@
  *  See also:  http://www.gnu.org/licenses/
 \*****************************************************************************/
 
-/* security.c - flux security functions */
+/* zsecurity.c - flux zeromq security functions */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -34,7 +34,7 @@
 #include <libgen.h>
 #include <czmq.h>
 
-#include "security.h"
+#include "zsecurity.h"
 
 #include "src/common/libutil/log.h"
 #include "src/common/libutil/oom.h"

diff --git a/src/common/libflux/security.h → src/common/libutil/zsecurity.h b/src/common/libflux/security.h → src/common/libutil/zsecurity.h
@@ -22,8 +22,8 @@
  *  See also:  http://www.gnu.org/licenses/
 \*****************************************************************************/
 
-#ifndef _FLUX_CORE_SECURITY_H
-#define _FLUX_CORE_SECURITY_H
+#ifndef _UTIL_ZSECURITY_H
+#define _UTIL_ZSECURITY_H
 
 #include <stdbool.h>
 
@@ -127,7 +127,7 @@ const char *flux_sec_confstr (flux_sec_t *c);
 }
 #endif
 
-#endif /* _FLUX_CORE_SECURITY_H */
+#endif /* !_UTIL_ZSECURITY_H */
 
 /*
  * vi:tabstop=4 shiftwidth=4 expandtab