gssd: Use same style for including config.h that rest of nfs-utils uses

Clean up.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/utils/gssd/context.c b/utils/gssd/context.c
index 0ca7079c0367880239e0ef3928921b4d4d56fa7c..1e50bbfd85d6073c8bea39e2ae84d36c0ee5fec9 100644 (file)
--- a/utils/gssd/context.c
+++ b/utils/gssd/context.c
@@ -28,7 +28,10 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
+
 #include <stdio.h>
 #include <syslog.h>
 #include <string.h>

diff --git a/utils/gssd/context_heimdal.c b/utils/gssd/context_heimdal.c
index fc241e3a2192bb9d31a4590cb2ab745f95207c67..ddf064d3974d537714c3d0ccb4f7ac3f4d3560eb 100644 (file)
--- a/utils/gssd/context_heimdal.c
+++ b/utils/gssd/context_heimdal.c
@@ -28,7 +28,9 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
 
 #ifndef HAVE_LUCID_CONTEXT_SUPPORT
 #ifdef HAVE_HEIMDAL

diff --git a/utils/gssd/context_lucid.c b/utils/gssd/context_lucid.c
index 94403af20265e68ef8cca261502dfce5ec7118a2..3243d53022444f97e032a28b936700b2a84968b1 100644 (file)
--- a/utils/gssd/context_lucid.c
+++ b/utils/gssd/context_lucid.c
@@ -28,7 +28,9 @@
  * SUCH DAMAGES.
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
 
 #ifdef HAVE_LUCID_CONTEXT_SUPPORT
 

diff --git a/utils/gssd/context_mit.c b/utils/gssd/context_mit.c
index e76a8b1b68332dd89beb1f1dcbaed9d58d71c80c..709a9034be9a8351f2251d936bdb2e875a256fbe 100644 (file)
--- a/utils/gssd/context_mit.c
+++ b/utils/gssd/context_mit.c
@@ -28,7 +28,9 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
 
 #ifndef HAVE_LUCID_CONTEXT_SUPPORT
 #ifdef HAVE_KRB5

diff --git a/utils/gssd/context_spkm3.c b/utils/gssd/context_spkm3.c
index 5b387bde8ecb9f7a9330bce5241da6587193a74f..b927475c63692a7a5a6a1565151013595d83b643 100644 (file)
--- a/utils/gssd/context_spkm3.c
+++ b/utils/gssd/context_spkm3.c
@@ -28,7 +28,10 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
+
 #include <stdio.h>
 #include <syslog.h>
 #include <string.h>

diff --git a/utils/gssd/err_util.c b/utils/gssd/err_util.c
index 2583e06621906e4652c9274f135a2e0e52c1b55d..fe09eda6761067d9f7d50bd9201dd0696bb285ad 100644 (file)
--- a/utils/gssd/err_util.c
+++ b/utils/gssd/err_util.c
@@ -28,6 +28,10 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>

diff --git a/utils/gssd/gss_clnt_send_err.c b/utils/gssd/gss_clnt_send_err.c
index 5260b531f376605f6a738d4e2b553203e5f2026e..4800a0168ca3441f9caf9c9f24845ee6d67ed8fb 100644 (file)
--- a/utils/gssd/gss_clnt_send_err.c
+++ b/utils/gssd/gss_clnt_send_err.c
@@ -30,6 +30,10 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
+
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/types.h>

diff --git a/utils/gssd/gss_oids.c b/utils/gssd/gss_oids.c
index c569b0c1b78073422832f7bed224a6996c2e91b9..a59c4a6428859ea0229252b063e0bc14164df63d 100644 (file)
--- a/utils/gssd/gss_oids.c
+++ b/utils/gssd/gss_oids.c
@@ -28,6 +28,10 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
+
 #include <sys/types.h>
 #include <gssapi/gssapi.h>
 

diff --git a/utils/gssd/gss_util.c b/utils/gssd/gss_util.c
index 2d66be9b9005c0b7601baa0340885bc5a868cf6e..99aceb37714b48bab6a41c03d4e0d57c58532bb5 100644 (file)
--- a/utils/gssd/gss_util.c
+++ b/utils/gssd/gss_util.c
@@ -57,7 +57,11 @@
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-#include "config.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
+
 #include <errno.h>
 #include <stdio.h>
 #include <ctype.h>

diff --git a/utils/gssd/gssd.c b/utils/gssd/gssd.c
index 6d8f3b90d7d11e48de887a5387745fbda363675e..f6949db72e10333571b78309684e0b8a8ef3c649 100644 (file)
--- a/utils/gssd/gssd.c
+++ b/utils/gssd/gssd.c
@@ -36,7 +36,9 @@
 
 */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
 
 #include <sys/param.h>
 #include <sys/socket.h>

diff --git a/utils/gssd/gssd_main_loop.c b/utils/gssd/gssd_main_loop.c
index b9f3a06520265c02f7ec5a14b1367d30297141c3..917b66221bfd536419146f1881b293a2831bf406 100644 (file)
--- a/utils/gssd/gssd_main_loop.c
+++ b/utils/gssd/gssd_main_loop.c
@@ -28,9 +28,14 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
+
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
+
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/poll.h>

diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c
index 91fc8d23b8130c18346b1abecd4f646eff65e7ab..d0d3f7ffa219b03501e5079f85d759c619013a5f 100644 (file)
--- a/utils/gssd/gssd_proc.c
+++ b/utils/gssd/gssd_proc.c
@@ -38,10 +38,14 @@
 
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
+
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
-#include "config.h"
+
 #include <sys/param.h>
 #include <rpc/rpc.h>
 #include <sys/stat.h>

diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c
index d4ee631b1a00be5549b99ca281d0ac47e91286a5..8923b3bc56227d5f626e9ba6c238d629cef69630 100644 (file)
--- a/utils/gssd/krb5_util.c
+++ b/utils/gssd/krb5_util.c
@@ -91,10 +91,14 @@
 
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
+
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
-#include "config.h"
+
 #include <sys/param.h>
 #include <rpc/rpc.h>
 #include <sys/stat.h>

diff --git a/utils/gssd/svcgssd.c b/utils/gssd/svcgssd.c
index 4aa157df04bbc8e480dddca323c358ff3ad32b77..f97dcd37cfadf9c1fbf2021cc524b19f0b013a40 100644 (file)
--- a/utils/gssd/svcgssd.c
+++ b/utils/gssd/svcgssd.c
@@ -37,7 +37,9 @@
 
 */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
 
 #include <sys/param.h>
 #include <sys/types.h>

diff --git a/utils/gssd/svcgssd_main_loop.c b/utils/gssd/svcgssd_main_loop.c
index 280816d3630ffbea9651cc96701a867c6500df84..2b4111c8327dadbcfa27c0279af7332828eeedda 100644 (file)
--- a/utils/gssd/svcgssd_main_loop.c
+++ b/utils/gssd/svcgssd_main_loop.c
@@ -28,6 +28,10 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
+
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/poll.h>

diff --git a/utils/gssd/svcgssd_mech2file.c b/utils/gssd/svcgssd_mech2file.c
index 22c3ed8c3404d6bb5fcffeaf89eaac3bffa6862e..65de8d01fedba026f35b11c4bd689f634579ef8d 100644 (file)
--- a/utils/gssd/svcgssd_mech2file.c
+++ b/utils/gssd/svcgssd_mech2file.c
@@ -34,7 +34,9 @@
 
 */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
 
 #include <gssapi/gssapi.h>
 #include <string.h>

diff --git a/utils/gssd/svcgssd_proc.c b/utils/gssd/svcgssd_proc.c
index 1d13532be3a8ccac4c1e22d2c34173949f860b66..b390beae2fe90ef17908e816b976d34442d540f3 100644 (file)
--- a/utils/gssd/svcgssd_proc.c
+++ b/utils/gssd/svcgssd_proc.c
@@ -33,6 +33,10 @@
 
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
+
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <rpc/rpc.h>