Move client lib files in their own directory

Make space for the actual mechglue plugin interface. The mechglue interface
will use the client library to communicate with the gss-proxy but will
reimplement all GSSAPI SPI as wrappers in order to properly handle fallbacks to
local mechanism and other input/output transformations.

12 files changed, 12 insertions, 17 deletions

diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 15f29e2..ec6eb50 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -83,21 +83,21 @@ endif
 
 GP_RPCGEN_OBJ = rpcgen/gp_rpc_xdr.c rpcgen/gss_proxy_xdr.c
 GP_MECHGLUE_OBJ = \
-    src/mechglue/gpm_display_status.c \
-    src/mechglue/gpm_accept_sec_context.c \
-    src/mechglue/gpm_release_handle.c \
-    src/mechglue/gpm_acquire_cred.c \
-    src/mechglue/gpm_indicate_mechs.c \
-    src/mechglue/gpm_import_and_canon_name.c \
-    src/mechglue/gpm_init_sec_context.c \
-    src/mechglue/gpm_common.c
+    src/client/gpm_display_status.c \
+    src/client/gpm_accept_sec_context.c \
+    src/client/gpm_release_handle.c \
+    src/client/gpm_acquire_cred.c \
+    src/client/gpm_indicate_mechs.c \
+    src/client/gpm_import_and_canon_name.c \
+    src/client/gpm_init_sec_context.c \
+    src/client/gpm_common.c
 
 dist_noinst_HEADERS = \
     rpcgen/gp_rpc.h \
     rpcgen/gss_proxy.h \
     src/gp_rpc_process.h \
     src/gp_proxy.h \
-    src/mechglue/gssapi_gpm.h \
+    src/client/gssapi_gpm.h \
     src/gp_common.h \
     src/gp_log.h \
     src/gp_creds.h \
diff --git a/proxy/src/mechglue/gpm_accept_sec_context.c b/proxy/src/client/gpm_accept_sec_context.c
index d5eeb8a..d5eeb8a 100644
--- a/proxy/src/mechglue/gpm_accept_sec_context.c
+++ b/proxy/src/client/gpm_accept_sec_context.c
diff --git a/proxy/src/mechglue/gpm_acquire_cred.c b/proxy/src/client/gpm_acquire_cred.c
index 8e9b010..8e9b010 100644
--- a/proxy/src/mechglue/gpm_acquire_cred.c
+++ b/proxy/src/client/gpm_acquire_cred.c
diff --git a/proxy/src/mechglue/gpm_common.c b/proxy/src/client/gpm_common.c
index 16ea7d6..16ea7d6 100644
--- a/proxy/src/mechglue/gpm_common.c
+++ b/proxy/src/client/gpm_common.c
diff --git a/proxy/src/mechglue/gpm_display_status.c b/proxy/src/client/gpm_display_status.c
index cc5e3cc..cc5e3cc 100644
--- a/proxy/src/mechglue/gpm_display_status.c
+++ b/proxy/src/client/gpm_display_status.c
diff --git a/proxy/src/mechglue/gpm_import_and_canon_name.c b/proxy/src/client/gpm_import_and_canon_name.c
index 5301d60..5301d60 100644
--- a/proxy/src/mechglue/gpm_import_and_canon_name.c
+++ b/proxy/src/client/gpm_import_and_canon_name.c
diff --git a/proxy/src/mechglue/gpm_indicate_mechs.c b/proxy/src/client/gpm_indicate_mechs.c
index 693e588..693e588 100644
--- a/proxy/src/mechglue/gpm_indicate_mechs.c
+++ b/proxy/src/client/gpm_indicate_mechs.c
diff --git a/proxy/src/mechglue/gpm_init_sec_context.c b/proxy/src/client/gpm_init_sec_context.c
index 0769363..0769363 100644
--- a/proxy/src/mechglue/gpm_init_sec_context.c
+++ b/proxy/src/client/gpm_init_sec_context.c
diff --git a/proxy/src/mechglue/gpm_release_handle.c b/proxy/src/client/gpm_release_handle.c
index 010c148..010c148 100644
--- a/proxy/src/mechglue/gpm_release_handle.c
+++ b/proxy/src/client/gpm_release_handle.c
diff --git a/proxy/src/mechglue/gssapi_gpm.h b/proxy/src/client/gssapi_gpm.h
index f4faf3f..f4faf3f 100644
--- a/proxy/src/mechglue/gssapi_gpm.h
+++ b/proxy/src/client/gssapi_gpm.h
diff --git a/proxy/src/mechglue/README b/proxy/src/mechglue/README
index a97d511..9a191ef 100644
--- a/proxy/src/mechglue/README
+++ b/proxy/src/mechglue/README
@@ -1,7 +1,2 @@
-Eventually here we will have the mechglue to module to be loaded in various gssapi
-implementations.
-
-At the moment we just need a conformant client in order to test the server
-implementation. So will just implement a simple RFC2744 API. It will
-be easy to turn this API into the mechglue SPI later on.
-
+This directory now contains the actual mechglue plugin,
+client functions have been moved to the client directory.
diff --git a/proxy/tests/cli_srv_comm.c b/proxy/tests/cli_srv_comm.c
index 2d7d3eb..a866e8a 100644
--- a/proxy/tests/cli_srv_comm.c
+++ b/proxy/tests/cli_srv_comm.c
@@ -40,7 +40,7 @@
 #include "src/gp_rpc_process.h"
 #include "src/gp_conv.h"
 #include "src/gp_debug.h"
-#include "src/mechglue/gssapi_gpm.h"
+#include "src/client/gssapi_gpm.h"
 #include "popt.h"
 
 int gp_send_buffer(int fd, char *buf, uint32_t len)