From 9bc6d7165f6f068f30636de97db1ca2ec6fca572 Mon Sep 17 00:00:00 2001
From: Kevin Wasserman <krwasserman@painless-security.com>
Date: Tue, 25 Nov 2014 16:48:23 -0500
Subject: [PATCH] Enable -Wall -Werror with GCC; fix warnings

---
 json_gssapi/CMakeLists.txt                   | 4 ++--
 json_gssapi/main.cpp                         | 3 ++-
 json_gssapi/src/datamodel/GSSDisplayStatus.h | 2 +-
 json_gssapi/src/util_base64.cpp              | 8 ++++----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/json_gssapi/CMakeLists.txt b/json_gssapi/CMakeLists.txt
index 1ec8720..7c58396 100644
--- a/json_gssapi/CMakeLists.txt
+++ b/json_gssapi/CMakeLists.txt
@@ -63,8 +63,8 @@ endif (WIN32)
 
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
-#elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-#  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror")
+elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror")
 endif ()
 
 include_directories(${KRB5_INCLUDE_DIRS} ${JANSSON_INCLUDE_DIRS})
diff --git a/json_gssapi/main.cpp b/json_gssapi/main.cpp
index 26c23e1..6070aa1 100644
--- a/json_gssapi/main.cpp
+++ b/json_gssapi/main.cpp
@@ -64,7 +64,8 @@ int main(int argc, char **argv) {
   }
   fclose(f);
 #else
-  ssize_t readTotal, readThisRound, readRemaining;
+  ssize_t readThisRound;
+  size_t readTotal, readRemaining;
   do 
   {
     // Read 32 bit length
diff --git a/json_gssapi/src/datamodel/GSSDisplayStatus.h b/json_gssapi/src/datamodel/GSSDisplayStatus.h
index c1f2e76..762c2e7 100644
--- a/json_gssapi/src/datamodel/GSSDisplayStatus.h
+++ b/json_gssapi/src/datamodel/GSSDisplayStatus.h
@@ -29,7 +29,7 @@ private:
     string minorMessage;
     string majorMessage;
         
-    GSSDisplayStatus& operator= ( const GSSDisplayStatus& other ) {};
+    GSSDisplayStatus& operator= ( const GSSDisplayStatus& other );
 };
 
 #endif // GSSDISPLAYSTATUS_H
diff --git a/json_gssapi/src/util_base64.cpp b/json_gssapi/src/util_base64.cpp
index 35f17b9..e039213 100644
--- a/json_gssapi/src/util_base64.cpp
+++ b/json_gssapi/src/util_base64.cpp
@@ -67,10 +67,10 @@ static char base64_decode[SCHAR_MAX];
 
 static GSSWEB_ONCE_CALLBACK(init_decode_table)
 {
-    int i;
+    size_t i;
     memset(&base64_decode[0], -1, sizeof(base64_decode));
     for (i = 0; i < sizeof(base64_chars) / sizeof(base64_chars[0]); i++)
-        base64_decode[base64_chars[i]] = (char )i;
+        base64_decode[(unsigned int)base64_chars[i]] = (char )i;
     GSSWEB_ONCE_LEAVE;
 }
 
@@ -79,7 +79,7 @@ pos(char c)
 {
     if (c <= 0)
         return -1;
-    return base64_decode[c];
+    return base64_decode[(unsigned int)c];
 }
 
 void
@@ -225,4 +225,4 @@ void
 base64Free(void *mem)
 {
     free(mem);
-}
\ No newline at end of file
+}
-- 
2.1.4