Neil Horman a3281df
diff -up ./src/freight-agent/freightproxy_main.c.buildfix ./src/freight-agent/freightproxy_main.c
Neil Horman 78ba90c
--- ./src/freight-agent/freightproxy_main.c.buildfix	2015-12-21 10:31:38.000000000 -0500
Neil Horman 78ba90c
+++ ./src/freight-agent/freightproxy_main.c	2017-01-25 11:22:53.091074521 -0500
Neil Horman a3281df
@@ -75,10 +75,10 @@ processContentLength(TSession *    const
Neil Horman a3281df
         RequestHeaderValue(httpRequestP, "content-length");
Neil Horman a3281df
 
Neil Horman a3281df
     if (content_length == NULL) {
Neil Horman a3281df
-        *missingP = TRUE;
Neil Horman a3281df
+        *missingP = true;
Neil Horman a3281df
         *errorP = NULL;
Neil Horman a3281df
     } else {
Neil Horman a3281df
-        *missingP = FALSE;
Neil Horman a3281df
+        *missingP = false;
Neil Horman a3281df
         *inputLenP = 0;  /* quiet compiler warning */
Neil Horman a3281df
         if (content_length[0] == '\0')
Neil Horman a3281df
             asprintf((char **)errorP, "The value in your content-length "
Neil Horman 78ba90c
@@ -190,8 +190,8 @@ GetToken(char ** const pP) {
Neil Horman 78ba90c
 		switch (**pP) {
Neil Horman 78ba90c
 	case '\t':
Neil Horman 78ba90c
 	case ' ':
Neil Horman 78ba90c
-	case CR:
Neil Horman 78ba90c
-	case LF:
Neil Horman 78ba90c
+	case '\r':
Neil Horman 78ba90c
+	case '\n':
Neil Horman 78ba90c
 	case '\0':
Neil Horman 78ba90c
 		if (p0 == *pP)
Neil Horman 78ba90c
 			return NULL;
Neil Horman a3281df
@@ -323,15 +323,15 @@ RequestAuthFromDb(TSession *   const ses
Neil Horman a3281df
 				if (dbpass && !strcmp(dbpass, pass)) {
Neil Horman a3281df
 					SessionGetRequestInfo(sessionP, (const TRequestInfo ** const)&requestP);
Neil Horman a3281df
 					requestP->user = strdup(user);
Neil Horman a3281df
-					authorized = TRUE;
Neil Horman a3281df
+					authorized = true;
Neil Horman a3281df
 				} else
Neil Horman a3281df
-					authorized = FALSE;
Neil Horman a3281df
+					authorized = false;
Neil Horman a3281df
 			} else
Neil Horman a3281df
-				authorized = FALSE;
Neil Horman a3281df
+				authorized = false;
Neil Horman a3281df
 		} else
Neil Horman a3281df
-			authorized = FALSE;
Neil Horman a3281df
+			authorized = false;
Neil Horman a3281df
 	} else
Neil Horman a3281df
-		authorized = FALSE;
Neil Horman a3281df
+		authorized = false;
Neil Horman a3281df
 
Neil Horman a3281df
 	if (!authorized) {
Neil Horman a3281df
 		char hdrValue[1024];
Neil Horman a3281df
@@ -368,7 +368,7 @@ static abyss_bool handleDefaultRequest(T
Neil Horman a3281df
 {
Neil Horman a3281df
 	ResponseStatus(sessionP, 500); /* Not found */
Neil Horman a3281df
 	ResponseError2(sessionP, "We don't serve regular html in these here parts");
Neil Horman a3281df
-	return TRUE;
Neil Horman a3281df
+	return true;
Neil Horman a3281df
 }
Neil Horman a3281df
 
Neil Horman a3281df
 static void handleFreightRPC(void * const handler,
Neil Horman a3281df
@@ -381,7 +381,7 @@ static void handleFreightRPC(void * cons
Neil Horman a3281df
 	struct call_info cinfo;
Neil Horman a3281df
 	xmlrpc_mem_block *body;
Neil Horman a3281df
 
Neil Horman a3281df
-	*handledP = TRUE;
Neil Horman a3281df
+	*handledP = true;
Neil Horman a3281df
 
Neil Horman a3281df
 	authenticated = RequestAuthFromDb(sessionP, "FreightProxyDomain");
Neil Horman a3281df
 
Neil Horman 4ce3538
diff -up ./src/freight-agent/xmlrpc_client.c.buildfix ./src/freight-agent/xmlrpc_client.c
Neil Horman a3281df
--- ./src/freight-agent/xmlrpc_client.c.buildfix	2015-12-21 10:31:38.000000000 -0500
Neil Horman 78ba90c
+++ ./src/freight-agent/xmlrpc_client.c	2017-01-25 11:22:16.135147238 -0500
Neil Horman 4ce3538
@@ -32,7 +32,7 @@ struct xmlrpc_info {
Neil Horman 4ce3538
 	xmlrpc_server_info *server;
Neil Horman 4ce3538
 };
Neil Horman 4ce3538
 
Neil Horman 4ce3538
-static int xmlrpc_init(struct agent_config *acfg)
Neil Horman 4ce3538
+static int xmlrpc_init_driver(struct agent_config *acfg)
Neil Horman 4ce3538
 {
Neil Horman 4ce3538
 	struct xmlrpc_info *info;
Neil Horman 4ce3538
 	char *port = "80";
Neil Horman 4ce3538
@@ -685,7 +685,7 @@ static int xmlrpc_send_raw_sql(const cha
Neil Horman 4ce3538
 }
Neil Horman 4ce3538
 
Neil Horman 4ce3538
 struct db_api xmlrpc_api = {
Neil Horman 4ce3538
-	.init = xmlrpc_init,
Neil Horman 4ce3538
+	.init = xmlrpc_init_driver,
Neil Horman 4ce3538
 	.cleanup = xmlrpc_cleanup,
Neil Horman 4ce3538
 	.connect = xmlrpc_connect,
Neil Horman 4ce3538
 	.disconnect = xmlrpc_disconnect,