From 324fb26ba803a999bedc29e93c46c84f27abf5b7 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose@redhat.com>
Date: Thu, 19 May 2011 09:58:09 +0200
Subject: Set _GNU_SOURCE globally

---
 src/util/crypto/libcrypto/crypto_sha512crypt.c | 1 -
 src/util/crypto/nss/nss_obfuscate.c            | 4 ++--
 src/util/crypto/nss/nss_sha512crypt.c          | 3 ++-
 src/util/debug.c                               | 3 ++-
 src/util/server.c                              | 1 -
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/util')

diff --git a/src/util/crypto/libcrypto/crypto_sha512crypt.c b/src/util/crypto/libcrypto/crypto_sha512crypt.c
index 29900cc9..50734318 100644
--- a/src/util/crypto/libcrypto/crypto_sha512crypt.c
+++ b/src/util/crypto/libcrypto/crypto_sha512crypt.c
@@ -10,7 +10,6 @@
 /* SHA512-based Unix crypt implementation.
    Released into the Public Domain by Ulrich Drepper <drepper@redhat.com>.  */
 
-#define _GNU_SOURCE
 #include <endian.h>
 #include <errno.h>
 #include <limits.h>
diff --git a/src/util/crypto/nss/nss_obfuscate.c b/src/util/crypto/nss/nss_obfuscate.c
index bd8688e6..cbd8984a 100644
--- a/src/util/crypto/nss/nss_obfuscate.c
+++ b/src/util/crypto/nss/nss_obfuscate.c
@@ -183,13 +183,13 @@ done:
 
 static int nss_encrypt_decrypt_init(TALLOC_CTX *mem_ctx,
                                     struct crypto_mech_data *mech_props,
-                                    bool encrypt,
+                                    bool do_encrypt,
                                     struct sss_nss_crypto_ctx *cctx)
 {
     CK_ATTRIBUTE_TYPE   op;
     int ret;
 
-    op = encrypt ? CKA_ENCRYPT : CKA_DECRYPT;
+    op = do_encrypt ? CKA_ENCRYPT : CKA_DECRYPT;
 
     /* turn the raw key into a key object */
     cctx->keyobj = PK11_ImportSymKey(cctx->slot, mech_props->cipher,
diff --git a/src/util/crypto/nss/nss_sha512crypt.c b/src/util/crypto/nss/nss_sha512crypt.c
index 514e4d9a..76eb8a63 100644
--- a/src/util/crypto/nss/nss_sha512crypt.c
+++ b/src/util/crypto/nss/nss_sha512crypt.c
@@ -8,7 +8,8 @@
 /* SHA512-based Unix crypt implementation.
    Released into the Public Domain by Ulrich Drepper <drepper@redhat.com>.  */
 
-#define _GNU_SOURCE
+#include "config.h"
+
 #include <endian.h>
 #include <errno.h>
 #include <limits.h>
diff --git a/src/util/debug.c b/src/util/debug.c
index dbd54c1e..18bfda42 100644
--- a/src/util/debug.c
+++ b/src/util/debug.c
@@ -19,7 +19,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#define _GNU_SOURCE
+#include "config.h"
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/src/util/server.c b/src/util/server.c
index e1262373..d33c5cb1 100644
--- a/src/util/server.c
+++ b/src/util/server.c
@@ -23,7 +23,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#define _GNU_SOURCE
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-- 
cgit