From 9d7904ba4b404aee6c1cfa3abc50da0df6bc8c02 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 15 May 2013 00:11:41 +0200 Subject: Fix unresolved symbol gp_boolean_is_true() in mechglue plugin. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit At the same time, rename gp_common.c to gp_util.c to make it more visible there is no relation to gp_common.h. Signed-off-by: Günther Deschner Reviewed-by: Simo Sorce --- proxy/Makefile.am | 5 +++-- proxy/src/gp_common.c | 49 ------------------------------------------------- proxy/src/gp_util.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 51 deletions(-) delete mode 100644 proxy/src/gp_common.c create mode 100644 proxy/src/gp_util.c diff --git a/proxy/Makefile.am b/proxy/Makefile.am index 3f1d0ee..857be35 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -114,7 +114,8 @@ GP_MECHGLUE_OBJ = \ src/mechglue/gpp_indicate_mechs.c \ src/mechglue/gpp_priv_integ.c \ src/mechglue/gpp_misc.c \ - src/mechglue/gss_plugin.c + src/mechglue/gss_plugin.c \ + src/gp_util.c dist_noinst_HEADERS = \ rpcgen/gp_rpc.h \ @@ -154,7 +155,7 @@ gssproxy_SOURCES = \ src/gp_export.c \ src/gp_debug.c \ src/gp_log.c \ - src/gp_common.c \ + src/gp_util.c \ src/gp_rpc_accept_sec_context.c \ src/gp_rpc_release_handle.c \ src/gp_rpc_acquire_cred.c \ diff --git a/proxy/src/gp_common.c b/proxy/src/gp_common.c deleted file mode 100644 index 19253dc..0000000 --- a/proxy/src/gp_common.c +++ /dev/null @@ -1,49 +0,0 @@ -/* - GSS-PROXY - - Copyright (C) 2013 Red Hat, Inc. - Copyright (C) 2013 Simo Sorce - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -#include -#include -#include "gp_common.h" - -bool gp_same(const char *a, const char *b) -{ - if ((a == b) || strcmp(a, b) == 0) { - return true; - } - - return false; -} - -bool gp_boolean_is_true(const char *s) -{ - if (strcasecmp(s, "1") == 0 || - strcasecmp(s, "on") == 0 || - strcasecmp(s, "true") == 0 || - strcasecmp(s, "yes") == 0) { - return true; - } - - return false; -} diff --git a/proxy/src/gp_util.c b/proxy/src/gp_util.c new file mode 100644 index 0000000..8400da1 --- /dev/null +++ b/proxy/src/gp_util.c @@ -0,0 +1,48 @@ +/* + GSS-PROXY + + Copyright (C) 2013 Red Hat, Inc. + Copyright (C) 2013 Simo Sorce + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +*/ + +#include +#include + +bool gp_same(const char *a, const char *b) +{ + if ((a == b) || strcmp(a, b) == 0) { + return true; + } + + return false; +} + +bool gp_boolean_is_true(const char *s) +{ + if (strcasecmp(s, "1") == 0 || + strcasecmp(s, "on") == 0 || + strcasecmp(s, "true") == 0 || + strcasecmp(s, "yes") == 0) { + return true; + } + + return false; +} -- cgit