diff options
| author | Alexander Bokovoy <ab@samba.org> | 2012-04-24 19:37:13 +0300 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2012-04-25 00:18:32 +0200 |
| commit | 594e3161810ba5a57ce5a3c88a8cd89b11d04650 (patch) | |
| tree | 85f2a84c3ff5260722027db8fa940d30e5de5f2d /lib/replace | |
| parent | 2d01099acc77d433f06f36f854f27fd9f1e43f05 (diff) | |
| download | samba-594e3161810ba5a57ce5a3c88a8cd89b11d04650.tar.gz samba-594e3161810ba5a57ce5a3c88a8cd89b11d04650.tar.bz2 samba-594e3161810ba5a57ce5a3c88a8cd89b11d04650.zip | |
lib/replace: split out GSSAPI from lib/replace/system/kerberos.h into lib/replace/system/gssapi.h
With waf build include directories are defined by dependencies specified to subsystems.
Without proper dependency <gssapi/gssapi.h> cannot be found for embedded Heimdal builds
when there are no system-wide gssapi/gssapi.h available.
Split out GSSAPI header includes in a separate replacement header and use that explicitly
where needed.
Autobuild-User: Alexander Bokovoy <ab@samba.org>
Autobuild-Date: Wed Apr 25 00:18:33 CEST 2012 on sn-devel-104
Diffstat (limited to 'lib/replace')
| -rw-r--r-- | lib/replace/system/gssapi.h | 53 | ||||
| -rw-r--r-- | lib/replace/system/kerberos.h | 18 |
2 files changed, 55 insertions, 16 deletions
diff --git a/lib/replace/system/gssapi.h b/lib/replace/system/gssapi.h new file mode 100644 index 0000000000..c22663c1d0 --- /dev/null +++ b/lib/replace/system/gssapi.h @@ -0,0 +1,53 @@ +#ifndef _system_gssapi_h +#define _system_gssapi_h + +/* + Unix SMB/CIFS implementation. + + GSSAPI system include wrappers + + Copyright (C) Andrew Tridgell 2004 + + ** NOTE! The following LGPL license applies to the replace + ** library. This does NOT imply that all of Samba is released + ** under the LGPL + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, see <http://www.gnu.org/licenses/>. + +*/ + +#ifdef HAVE_LIBGSSAPI + +#ifdef HAVE_GSSAPI_GSSAPI_EXT_H +#include <gssapi/gssapi_ext.h> +#elif HAVE_GSSAPI_GSSAPI_H +#include <gssapi/gssapi.h> +#elif HAVE_GSSAPI_GSSAPI_GENERIC_H +#include <gssapi/gssapi_generic.h> +#elif HAVE_GSSAPI_H +#include <gssapi.h> +#endif + +#if HAVE_GSSAPI_GSSAPI_KRB5_H +#include <gssapi/gssapi_krb5.h> +#endif + +#if HAVE_GSSAPI_GSSAPI_SPNEGO_H +#include <gssapi/gssapi_spnego.h> +#elif HAVE_GSSAPI_SPNEGO_H +#include <gssapi_spnego.h> +#endif + +#endif +#endif diff --git a/lib/replace/system/kerberos.h b/lib/replace/system/kerberos.h index 7762d4be46..636ce0f2e0 100644 --- a/lib/replace/system/kerberos.h +++ b/lib/replace/system/kerberos.h @@ -7,11 +7,11 @@ kerberos system include wrappers Copyright (C) Andrew Tridgell 2004 - + ** NOTE! The following LGPL license applies to the replace ** library. This does NOT imply that all of Samba is released ** under the LGPL - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either @@ -37,19 +37,5 @@ #include <com_err.h> #endif -#ifdef HAVE_GSSAPI_GSSAPI_EXT_H -#include <gssapi/gssapi_ext.h> -#elif HAVE_GSSAPI_GSSAPI_H -#include <gssapi/gssapi.h> -#elif HAVE_GSSAPI_GSSAPI_GENERIC_H -#include <gssapi/gssapi_generic.h> -#elif HAVE_GSSAPI_H -#include <gssapi.h> -#endif - -#if HAVE_GSSAPI_GSSAPI_KRB5_H -#include <gssapi/gssapi_krb5.h> -#endif - #endif #endif |