diff --git a/acinclude.m4 b/acinclude.m4
index 4d65675b5b..b00267fd06 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -184,7 +184,7 @@ AC_CHECK_MEMBER(struct stat64.st_mode,
 #include <unistd.h>])
 
 AC_MSG_CHECKING([if largefile compiles (looking at you, OSX)])
-AC_COMPILE_IFELSE([ 
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([ 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -197,7 +197,7 @@ int main(void) {
                ],[
                   AC_MSG_RESULT([yes])
                   AC_DEFINE([LARGEFILE_WORKS],1,[Define if open64, stat64, and friends work])
-               ],[AC_MSG_RESULT([no])])
+               ],[AC_MSG_RESULT([no])])])
 ])
 
 
diff --git a/doc/soelim.c b/doc/soelim.c
index 4baf7cba2e..6fa15d229c 100644
--- a/doc/soelim.c
+++ b/doc/soelim.c
@@ -146,8 +146,7 @@ main(int argc, char *argv[])
   return (0);
   }
 
-int dofile(filein)
-FILE *filein;
+int dofile(FILE *filein)
   {
   char buf[256];
   int  dirindex;
diff --git a/src/cmds/MXML.c b/src/cmds/MXML.c
index cf79670898..e591db24c5 100644
--- a/src/cmds/MXML.c
+++ b/src/cmds/MXML.c
@@ -115,7 +115,7 @@ int MXMLSetChild(
 int MXMLCreateE(
 
   mxml_t **E,    /* O */
-  char    *Name) /* I (optional) */
+  const char    *Name) /* I (optional) */
 
   {
   /* NOTE:  should 'Name' be mandatory? */
@@ -457,7 +457,7 @@ int MXMLAppendAttr(
 
     len = strlen(E->AVal[ATok]) + strlen(AVal) + 2;
 
-    tmpAVal = realloc(E->AVal[ATok], len);
+    tmpAVal = (char *)realloc(E->AVal[ATok], len);
 
     if (tmpAVal == NULL)
       {
@@ -527,7 +527,7 @@ int MXMLSetVal(
       ptr = (char *)V;
       Vlen = strlen(ptr);
     
-      outbuf = calloc(buf_size, (sizeof(char)));
+      outbuf = (char *)calloc(buf_size, (sizeof(char)));
       
       if (outbuf == NULL)
         {
@@ -751,7 +751,7 @@ int MXMLToXString(
     {
     NewSize = MMAX_BUFFER;
 
-    if ((*Buf = calloc(1, NewSize)) == NULL)
+    if ((*Buf = (char *)calloc(1, NewSize)) == NULL)
       {
       /* cannot allocate buffer */
 
diff --git a/src/cmds/MXML.h b/src/cmds/MXML.h
index 78fa4a0252..552160345e 100644
--- a/src/cmds/MXML.h
+++ b/src/cmds/MXML.h
@@ -6,7 +6,7 @@ int MXMLExtractE(mxml_t *E, mxml_t *C, mxml_t **CP);
 
 int MXMLSetChild(mxml_t *E, char *CName, mxml_t **CE); 
 
-int MXMLCreateE(mxml_t **E, char *Name); 
+int MXMLCreateE(mxml_t **E, const char *Name);
 
 int MXMLDestroyE(mxml_t **EP); 
 
diff --git a/src/cmds/common_cmds.c b/src/cmds/common_cmds.c
index b3e48a1e74..b357a06777 100644
--- a/src/cmds/common_cmds.c
+++ b/src/cmds/common_cmds.c
@@ -189,7 +189,7 @@ void calloc_or_fail(
   memmgr **mm,            /* memory manager */
   char   **dest,
   int      alloc_size,
-  char    *err_msg)
+  const char    *err_msg)
 
   {
   *dest = (char *)memmgr_calloc(mm, 1, alloc_size);
diff --git a/src/cmds/common_cmds.h b/src/cmds/common_cmds.h
index e0eb4af017..0ae22b5473 100644
--- a/src/cmds/common_cmds.h
+++ b/src/cmds/common_cmds.h
@@ -90,7 +90,7 @@ int parse_env_line(memmgr **mm, char *one_var, char **name, char **value);
 
 void set_env_opts(memmgr **mm, job_data **env_attr, char **envp);
 
-void calloc_or_fail(memmgr **mm, char **dest, int alloc_size, char *err_msg);
+void calloc_or_fail(memmgr **mm, char **dest, int alloc_size, const char *err_msg);
 
 int parse_variable_list(memmgr **mm, job_data **dest_hash, job_data *user_env, int var_type, int op_type, char *the_list);
 
diff --git a/src/cmds/pbsdsh.c b/src/cmds/pbsdsh.c
index d4bfe29044..c5d4969992 100644
--- a/src/cmds/pbsdsh.c
+++ b/src/cmds/pbsdsh.c
@@ -40,7 +40,7 @@ extern int event_count;
 struct tm_errcode
   {
   int trc_code;
-  char   *trc_name;
+  const char   *trc_name;
   } tm_errcode[] =
 
   {
@@ -69,7 +69,7 @@ fd_set permrfsd;
 int grabstdio = 0;
 
 
-char *get_ecname(
+const char *get_ecname(
 
   int rc)
 
@@ -283,7 +283,7 @@ getstdout(void)
         {
         if (FD_ISSET(i, &rfsd))
           {
-          if ((bytes = read(i, &buf, 1023)) > 0)
+          if ((bytes = read_ac_socket(i, &buf, 1023)) > 0)
             {
             buf[bytes] = '\0';
             fprintf(stdout, "%s", buf);
@@ -504,9 +504,9 @@ char *gethostnames(
   char *hoststart;
   int rc, tm_errno, i, j;
 
-  allnodes = calloc(numnodes, PBS_MAXNODENAME + 1 + sizeof(char));
-  rescinfo = calloc(numnodes, RESCSTRLEN + 1 + sizeof(char));
-  rescevent = calloc(numnodes, sizeof(tm_event_t));
+  allnodes = (char *)calloc(numnodes, PBS_MAXNODENAME + 1 + sizeof(char));
+  rescinfo = (char *)calloc(numnodes, RESCSTRLEN + 1 + sizeof(char));
+  rescevent = (tm_event_t*)calloc(numnodes, sizeof(tm_event_t));
 
   if (!allnodes || !rescinfo || !rescevent)
     {
@@ -711,7 +711,7 @@ int main(
   int posixly_correct_set_by_caller = 0;
   char *envstr;
 
-  id = calloc(60, sizeof(char));
+  id = (char *)calloc(60, sizeof(char));
 
   if (id == NULL)
     {
@@ -830,7 +830,7 @@ int main(
 #ifdef __GNUC__
   if (!posixly_correct_set_by_caller)
     {
-    putenv("POSIXLY_CORRECT");
+    putenv((char *)"POSIXLY_CORRECT");
     free(envstr);
     }
 
@@ -991,7 +991,7 @@ int main(
     stop  = numnodes;
     }
 
-  if ((ioenv = calloc(2, sizeof(char **))) == NULL)
+  if ((ioenv = (char **)calloc(2, sizeof(char **))) == NULL)
     {
     /* FAILURE - cannot alloc memory */
 
@@ -1005,7 +1005,7 @@ int main(
     {
     stdoutfd = build_listener(&stdoutport);
 
-    if ((*ioenv = calloc(50, sizeof(char *))) == NULL)
+    if ((*ioenv = (char *)calloc(50, sizeof(char *))) == NULL)
       {
       /* FAILURE - cannot alloc memory */
 
diff --git a/src/cmds/pbsnodes.c b/src/cmds/pbsnodes.c
index 2f64018bf9..5ed5a002e2 100644
--- a/src/cmds/pbsnodes.c
+++ b/src/cmds/pbsnodes.c
@@ -157,7 +157,7 @@ static int set_note(
   int             rc;
   int             local_errno = 0;
 
-  new_attr.name     = ATTR_NODE_note;
+  new_attr.name     = (char *)ATTR_NODE_note;
   new_attr.resource = NULL;
   new_attr.value    = msg;
   new_attr.op       = SET;
@@ -234,7 +234,7 @@ static char *get_nstate(
       }
     }
 
-  return("");
+  return((char *)"");
   }
 
 
@@ -265,10 +265,10 @@ static char *get_note(
 static int marknode(
 
   int            con,
-  char          *name,
-  char          *state1,
+  const char   *name,
+  const char   *state1,
   enum batch_op  op1,
-  char          *state2,
+  const char   *state2,
   enum batch_op  op2)
 
   {
@@ -278,9 +278,9 @@ static int marknode(
   int             rc;
   int             local_errno = 0;
 
-  new_attr[0].name     = ATTR_NODE_state;
+  new_attr[0].name     = (char *)ATTR_NODE_state;
   new_attr[0].resource = NULL;
-  new_attr[0].value    = state1;
+  new_attr[0].value    = (char *)state1;
   new_attr[0].op       = op1;
 
   if (state2 == NULL)
@@ -291,9 +291,9 @@ static int marknode(
     {
     new_attr[0].next     = &new_attr[1];
     new_attr[1].next     = NULL;
-    new_attr[1].name     = ATTR_NODE_state;
+    new_attr[1].name     = (char *)ATTR_NODE_state;
     new_attr[1].resource = NULL;
-    new_attr[1].value    = state2;
+    new_attr[1].value    = (char *)state2;
     new_attr[1].op     = op2;
     }
 
@@ -301,7 +301,7 @@ static int marknode(
          con,
          MGR_CMD_SET,
          MGR_OBJ_NODE,
-         name,
+         (char *)name,
          new_attr,
          NULL,
          &local_errno);
@@ -796,7 +796,7 @@ int main(
             {
             if (!strcasecmp(NState[lindex], argv[optind]))
               {
-              ListType = lindex;
+              ListType = (enum NStateEnum)lindex;
 
               optind++;
 
@@ -814,7 +814,7 @@ int main(
         }
       else
         {
-        nodeargs = calloc(2, sizeof(char **));
+        nodeargs = (char **)calloc(2, sizeof(char **));
         nodeargs[0] = strdup("");
         nodeargs[1] = '\0';
         }
diff --git a/src/cmds/pbspoe.c b/src/cmds/pbspoe.c
index 87e5939c90..aa1ca1293a 100644
--- a/src/cmds/pbspoe.c
+++ b/src/cmds/pbspoe.c
@@ -34,7 +34,7 @@
 #define XPDBX_PATH         "/usr/lpp/ppe.poe/bin/xpdbx"
 #define INTERACTIVE_FILE   "/usr/local/pbs/etc/interactive"
 
-void   set_if_undefined(char *name, char *val);
+void   set_if_undefined(const char *name, const char *val);
 void   check_environment();
 int    is_pbs_job();
 char **pbs_setup(char *command, int argc, char **argv);
@@ -68,7 +68,7 @@ is_pbs_job(void)
   return(1);
   }
 
-void set_if_undefined(char *name, char *val)
+void set_if_undefined(const char *name, const char *val)
   {
   char *ret;
   int result;
@@ -76,7 +76,7 @@ void set_if_undefined(char *name, char *val)
 
   if (ret != NULL) return;
 
-  result = putenv(val);
+  result = putenv((char *)val);
 
   if (result != 0)
     {
@@ -272,7 +272,7 @@ char **pbs_setup(
 
   /* make an argument list */
 
-  newargs = calloc((argc + 8), sizeof(char *));
+  newargs = (char **)calloc((argc + 8), sizeof(char *));
 
   if (newargs == NULL)
     {
@@ -351,7 +351,7 @@ char **pbs_setup(
 
   if (ocmdfile == 0)
     {
-    newargs[j++] = PBSPD;
+    newargs[j++] = (char *)PBSPD;
     newargs[j++] = pbsjobkey;
     }
 
@@ -422,7 +422,7 @@ char **pbs_setup(
       exit(1);
       }
 
-    newargs[j++] = "-cmdfile";
+    newargs[j++] = (char *)"-cmdfile";
 
     newargs[j++] = ncmdfname;
 
@@ -432,7 +432,7 @@ char **pbs_setup(
     {
     fprintf(stderr, "%s: Warning, (number of host nodes) < (number of procs)\n\t-- assigning multiple processes per node\n\t-- not using high-performance switch mode\n", mcn);
 
-    putenv("MP_EUILIB=ip");
+    putenv((char *)"MP_EUILIB=ip");
 
     sprintf(hostfile, "/tmp/pbsHtemp.%s", getenv("PBS_JOBID"));
 
@@ -526,7 +526,7 @@ char **pbs_setup(
 
   free(hfile_mem);
 
-  newargs[j++]   = "-hostfile";
+  newargs[j++]   = (char *)"-hostfile";
 
   newargs[j++]   = hostfile;
 
@@ -644,15 +644,15 @@ char *get_real_command(
   else
     command_name = argv0;
 
-  if (!strcmp(command_name, "poe")) return(POE_PATH);
+  if (!strcmp(command_name, (char *)"poe")) return(POE_PATH);
 
-  if (!strcmp(command_name, "pbspoe")) return(POE_PATH);
+  if (!strcmp(command_name, (char *)"pbspoe")) return(POE_PATH);
 
-  if (!strcmp(command_name, "pdbx")) return(PDBX_PATH);
+  if (!strcmp(command_name, (char *)"pdbx")) return(PDBX_PATH);
 
-  if (!strcmp(command_name, "xpdbx")) return XPDBX_PATH;
+  if (!strcmp(command_name, (char *)"xpdbx")) return XPDBX_PATH;
 
-  if (!strcmp(command_name, "newpoe")) return(POE_PATH);
+  if (!strcmp(command_name, (char *)"newpoe")) return(POE_PATH);
 
   fprintf(stderr, "\"%s\" unknown to the PBS front end.\n", argv0);
 
diff --git a/src/cmds/qalter.c b/src/cmds/qalter.c
index 45bbf24dbb..640a91dd50 100644
--- a/src/cmds/qalter.c
+++ b/src/cmds/qalter.c
@@ -528,7 +528,7 @@ int main(
           if (strcmp(keyword, ATTR_depend) == 0)
             {
             int rtn = 0;
-            pdepend = calloc(1, PBS_DEPEND_LEN);
+            pdepend = (char *)calloc(1, PBS_DEPEND_LEN);
 
             if ((pdepend == NULL) ||
                  (rtn = parse_depend_list(valuewd,pdepend,PBS_DEPEND_LEN)))
@@ -684,7 +684,7 @@ int main(
     if ((stat != 0) &&
         (any_failed != PBSE_UNKJOBID))
       {
-      prt_job_err("qalter", connect, job_id_out);
+      prt_job_err((char *)"qalter", connect, job_id_out);
       }
     else if ((stat != 0) && 
              (any_failed != PBSE_UNKJOBID) &&
@@ -701,7 +701,7 @@ int main(
         goto cnt;
         }
 
-      prt_job_err("qalter", connect, job_id_out);
+      prt_job_err((char *)"qalter", connect, job_id_out);
       }  /* END else if (stat && ...) */
 
     pbs_disconnect(connect);
diff --git a/src/cmds/qdel.c b/src/cmds/qdel.c
index b0f5da69ba..2f1428e9bd 100644
--- a/src/cmds/qdel.c
+++ b/src/cmds/qdel.c
@@ -204,7 +204,7 @@ int main(
   for (;optind < argc;optind++)
     {
     int connect;
-    int stat = 0;
+    int stat;
 
     /* check to see if user specified 'all' to delete all jobs */
 
@@ -247,7 +247,7 @@ int main(
     if (stat &&
         (any_failed != PBSE_UNKJOBID))
       {
-      prt_job_err("qdel", connect, job_id_out);
+      prt_job_err((char *)"qdel", connect, job_id_out);
       }
     else if (stat && 
              (any_failed != PBSE_UNKJOBID) &&
@@ -264,7 +264,7 @@ int main(
         goto cnt;
         }
 
-      prt_job_err("qdel", connect, job_id_out);
+      prt_job_err((char *)"qdel", connect, job_id_out);
       }
 
     pbs_disconnect(connect);
diff --git a/src/cmds/qmgr.c b/src/cmds/qmgr.c
index ed7125b76b..6546940aa3 100644
--- a/src/cmds/qmgr.c
+++ b/src/cmds/qmgr.c
@@ -2017,52 +2017,52 @@ int get_request(
 int is_attr(
 
   int   object,
-  char *name,
+  const char *name,
   int   attr_type)
 
   {
-  static char *svr_public_attrs[] =
+  static const char *svr_public_attrs[] =
     {
 #include "qmgr_svr_public.h"
 #include "site_qmgr_svr_print.h"
     NULL
     };
 
-  static char *svr_readonly_attrs[] =
+  static const char *svr_readonly_attrs[] =
     {
 #include "qmgr_svr_readonly.h"
     NULL
     };
 
-  static char *que_public_attrs[] =
+  static const char *que_public_attrs[] =
     {
 #include "qmgr_que_public.h"
 #include "site_qmgr_que_print.h"
     NULL
     };
 
-  static char *que_readonly_attrs[] =
+  static const char *que_readonly_attrs[] =
     {
 #include "qmgr_que_readonly.h"
     NULL
     };
 
-  static char *node_public_attrs[] =
+  static const char *node_public_attrs[] =
     {
 #include "qmgr_node_public.h"
 #include "site_qmgr_node_print.h"
     NULL
     };
 
-  static char *node_readonly_attrs[] =
+  static const char *node_readonly_attrs[] =
     {
 #include "qmgr_node_readonly.h"
     NULL
     };
 
   /* DIAGTODO: need a list of public and read-only diag attrs */
-  char **attr_public = NULL;
-  char **attr_readonly = NULL;
+  const char **attr_public = NULL;
+  const char **attr_readonly = NULL;
 
   char  *dupname  = NULL;
   char  *name_ptr = NULL;
@@ -2404,9 +2404,9 @@ int parse(
 
 void pstderr_big(
 
-  char *svrname,
-  char *objname,
-  char *errmesg)
+  const char *svrname,
+  const char *objname,
+  const char *errmesg)
 
   {
   if (! zopt)
@@ -2675,12 +2675,12 @@ int is_valid_object(
 
   static struct attrl attrq =
     {
-    NULL, ATTR_qtype, "", "", 0
+    NULL, (char *)ATTR_qtype, (char *)"", (char *)"", EQ
     };
 
   static struct attrl attrn =
     {
-    NULL, ATTR_NODE_state, "", "", 0
+    NULL, (char *)ATTR_NODE_state, (char *)"", (char *)"", EQ
     };
 
   int   local_errno = 0;
diff --git a/src/cmds/qmgr_functions.h b/src/cmds/qmgr_functions.h
index 9a85528e1d..0a3a203bc7 100644
--- a/src/cmds/qmgr_functions.h
+++ b/src/cmds/qmgr_functions.h
@@ -35,13 +35,13 @@ struct objname * commalist2objname(char *names, int type);
 
 int get_request(char *request); 
 
-int is_attr(int object, char *name, int attr_type);
+int is_attr(int object, const char *name, int attr_type);
 
 void show_help(char *str);
 
 int parse(char *request, int *oper, int *type, char **names, struct attropl **attr);
 
-void pstderr_big(char *svrname, char *objname, char *errmesg);
+void pstderr_big(const char *svrname, const char *objname, const char *errmesg);
 
 void free_objname_list(struct objname *list);
 
diff --git a/src/cmds/qselect.c b/src/cmds/qselect.c
index 1f62359764..68bed624f6 100644
--- a/src/cmds/qselect.c
+++ b/src/cmds/qselect.c
@@ -90,7 +90,7 @@ set_attrop(struct attropl **list, char *a_name, char *r_name, char *v_name, enum
 #define OPSTRING_LEN 4
 #define OP_LEN 2
 #define OP_ENUM_LEN 6
-static char *opstring_vals[] = { "eq", "ne", "ge", "gt", "le", "lt" };
+static const char *opstring_vals[] = { "eq", "ne", "ge", "gt", "le", "lt" };
 static enum batch_op opstring_enums[] = { EQ, NE, GE, GT, LE, LT };
 
 
@@ -267,7 +267,7 @@ int main(
 
         sprintf(a_value, "%ld", (long)after);
 
-        set_attrop(&select_list, ATTR_a, NULL, a_value, op);
+        set_attrop(&select_list, (char *)ATTR_a, NULL, a_value, op);
         break;
 
       case 'e':
@@ -329,7 +329,7 @@ int main(
             }
           }
 
-        set_attrop(&select_list, ATTR_c, NULL, optargout, op);
+        set_attrop(&select_list, (char *)ATTR_c, NULL, optargout, op);
 
         break;
 
@@ -375,7 +375,7 @@ int main(
           break;
           }
 
-        set_attrop(&select_list, ATTR_h, NULL, optargout, op);
+        set_attrop(&select_list, (char *)ATTR_h, NULL, optargout, op);
 
         break;
 
@@ -390,20 +390,20 @@ int main(
             break;
             }
 
-          set_attrop(&select_list, ATTR_l, resource_name, optargout, op);
+          set_attrop(&select_list, (char *)ATTR_l, resource_name, optargout, op);
           }
 
         break;
 
       case 'p':
         check_op(optarg, pop, optargout);
-        set_attrop(&select_list, ATTR_p, NULL, optargout, op);
+        set_attrop(&select_list, (char *)ATTR_p, NULL, optargout, op);
         break;
 
       case 'q':
         strncpy(destination, optarg, PBS_MAXROUTEDEST);
         check_op(optarg, pop, optargout);
-        set_attrop(&select_list, ATTR_q, NULL, optargout, op);
+        set_attrop(&select_list, (char *)ATTR_q, NULL, optargout, op);
         break;
 
       case 'r':
@@ -426,7 +426,7 @@ int main(
           break;
           }
 
-        set_attrop(&select_list, ATTR_r, NULL, pc, op);
+        set_attrop(&select_list, (char *)ATTR_r, NULL, pc, op);
 
         break;
 
@@ -457,7 +457,7 @@ int main(
           pc++;
           }
 
-        set_attrop(&select_list, ATTR_state, NULL, optargout, op);
+        set_attrop(&select_list, (char *)ATTR_state, NULL, optargout, op);
 
         break;
 
@@ -471,18 +471,18 @@ int main(
           break;
           }
 
-        set_attrop(&select_list, ATTR_u, NULL, optarg, op);
+        set_attrop(&select_list, (char *)ATTR_u, NULL, optarg, op);
 
         break;
 
       case 'A':
         op = EQ;
-        set_attrop(&select_list, ATTR_A, NULL, optarg, op);
+        set_attrop(&select_list, (char *)ATTR_A, NULL, optarg, op);
         break;
 
       case 'N':
         op = EQ;
-        set_attrop(&select_list, ATTR_N, NULL, optarg, op);
+        set_attrop(&select_list, (char *)ATTR_N, NULL, optarg, op);
         break;
 
       default :
@@ -531,7 +531,7 @@ int main(
     exit(any_failed);
     }
 
-  selectjob_list = pbs_selectjob_err(connect, select_list, exec_only ? EXECQUEONLY : NULL, &any_failed);
+  selectjob_list = pbs_selectjob_err(connect, select_list, exec_only ? (char *)EXECQUEONLY : NULL, &any_failed);
 
   if (selectjob_list == NULL)
     {
diff --git a/src/cmds/qstat.c b/src/cmds/qstat.c
index 4e1c6b6245..6c63bfb238 100644
--- a/src/cmds/qstat.c
+++ b/src/cmds/qstat.c
@@ -61,9 +61,7 @@ mbool_t DisplayXML = FALSE;
 #define maxlinesize 65536
 int   linesize = 77;
 
-int   tasksize;
-
-static char *summarize_arrays_extend_opt = "summarize_arrays";
+static const char *summarize_arrays_extend_opt = "summarize_arrays";
 
 /* END globals */
 
@@ -214,7 +212,7 @@ void prt_attr(
 
   {
   char *c;
-  char *comma = ",";
+  const char *comma = ",";
   int   first = 1;
   int   l;
   int   start;
@@ -341,11 +339,11 @@ static char *findattrl(
 
 static void prt_nodes(
 
-  char *nodes)   /* I */
+  const char *nodes)   /* I */
 
   {
   int   i;
-  char *stp;
+  const char *stp;
 
   char  linebuf[65536];
 
@@ -439,7 +437,7 @@ static char *cnv_size(
   int sft;
   unsigned long nval;
   char *pc;
-  char *suffix;
+  const char *suffix;
   static char outbuf[25];
 
   if (opt & ALT_DISPLAY_Mb)
@@ -516,23 +514,23 @@ static void altdsp_statjob(
   int                  alt_opt)   /* I */
 
   {
-  char *comment;
+  const char *comment;
   char *pc;
 
   struct attrl *pat;
-  char *exechost;
+  const char *exechost;
   char *usern = NULL;
   char *queuen = NULL;
   char *jobn = NULL;
-  char *sess;
-  char *tasks;
+  const char *sess;
+  const char *tasks;
   char  calcTasks[64];
-  char *nodect;
-  char *rqtimecpu;
-  char *rqtimewal;
-  char *jstate;
-  char *eltimecpu;
-  char *eltimewal;
+  const char *nodect;
+  const char *rqtimecpu;
+  const char *rqtimewal;
+  const char *jstate;
+  const char *eltimecpu;
+  const char *eltimewal;
   char tmpLine[MAX_LINE_LEN];
 
   int   usecput;
@@ -540,14 +538,14 @@ static void altdsp_statjob(
   static char  rqmem[SIZEL];
   static char  srfsbig[SIZEL];
   static char  srfsfast[SIZEL];
-  static char *blank = " -- ";
+  static const char *blank = " -- ";
 
   if (prtheader)
     {
     printf("\n%s: ",
            prtheader->name);
 
-    if ((pc = findattrl(prtheader->attribs, ATTR_comment, NULL)) != NULL)
+    if ((pc = findattrl(prtheader->attribs, (char *)ATTR_comment, NULL)) != NULL)
       {
       printf("%s",
              pc);
@@ -827,11 +825,11 @@ static void altdsp_statque(
 
   {
   char  rmem[SIZEL];
-  char *cput;
-  char *wallt;
-  char *jmax;
-  char *nodect;
-  char *blank = "--   ";
+  const char *cput;
+  const char *wallt;
+  const char *jmax;
+  const char *nodect;
+  const char *blank = "--   ";
   int   jrun;
   int   jque;
   char  qenabled = '\0';
@@ -995,7 +993,7 @@ void display_statjob(
   char *jid;
   char *name;
   char *owner;
-  char *timeu;
+  const char *timeu;
   char *state;
   char *location;
   char format[80];
@@ -1127,7 +1125,7 @@ void display_statjob(
             else
               {
               if ((!strcmp(a->name, "Walltime")) && (a->value[0] == '-'))
-                prt_attr(a->name, "Exceeded", a->value);
+                prt_attr(a->name, (char *)"Exceeded", a->value);
               else
                 prt_attr(a->name, a->resource, a->value);
 
@@ -1363,8 +1361,8 @@ void display_statque(
   int                  l;
   char                *c;
   char                *name;
-  char                *max;
-  char                *tot;
+  const char         *max;
+  const char         *tot;
   char                 ena[MAXNUML + 1];
   char                 str[MAXNUML + 1];
   char                 que[MAXNUML + 1];
@@ -1374,7 +1372,7 @@ void display_statque(
   char                 trn[MAXNUML + 1];
   char                 ext[MAXNUML + 1];
   char                 dne[MAXNUML + 1];
-  char                *type;
+  const char         *type;
   char                 format[80];
 
   int                  NUML = 5;
@@ -1509,7 +1507,7 @@ void display_statque(
             {
             type = a->value;
 
-            *(type + 1) = '\0';
+            *((char *)type + 1) = '\0';
             }
           }
 
@@ -1559,8 +1557,8 @@ void display_statserver(
   int l;
   char *c;
   char *name;
-  char *max;
-  char *tot;
+  const char *max;
+  const char *tot;
   char que[MAXNUML + 1];
   char run[MAXNUML + 1];
   char hld[MAXNUML + 1];
@@ -1568,7 +1566,7 @@ void display_statserver(
   char trn[MAXNUML + 1];
   char ext[MAXNUML + 1];
   char dne[MAXNUML + 1];
-  char *stats;
+  const char *stats;
   char format[80];
 
   int  NUML;
@@ -1958,7 +1956,7 @@ int main(
   int errflg = 0;
   int any_failed = 0;
   extern char *optarg;
-  char *conflict = "qstat: conflicting options.\n";
+  const char *conflict = "qstat: conflicting options.\n";
 #if (TCL_QSTAT == 0)
   char *pc;
 #else
@@ -1974,12 +1972,12 @@ int main(
   char server_old[MAXSERVERNAME] = "";
   char rmt_server[MAXSERVERNAME];
   char destination[PBS_MAXDEST + 1];
-  char *def_server;
+  const char *def_server;
 
   char *queue_name_out;
   char *server_name_out;
 
-  char *ExtendOpt = NULL;
+  const char *ExtendOpt = NULL;
 
   char operand[PBS_MAXCLTJOBID + 1];
   int alt_opt;
@@ -2079,7 +2077,7 @@ int main(
 
         alt_opt |= ALT_DISPLAY_i;
 
-        add_atropl(&p_atropl, ATTR_state, NULL, "EHQTW", EQ);
+        add_atropl(&p_atropl, (char *)ATTR_state, NULL, (char *)"EHQTW", EQ);
 
         break;
 
@@ -2101,7 +2099,7 @@ int main(
 
         alt_opt |= ALT_DISPLAY_r;
 
-        add_atropl(&p_atropl, ATTR_state, NULL, "RS", EQ);
+        add_atropl(&p_atropl, (char *)ATTR_state, NULL, (char *)"RS", EQ);
 
         break;
 
@@ -2121,7 +2119,7 @@ int main(
 
         alt_opt |= ALT_DISPLAY_u;
 
-        add_atropl(&p_atropl, ATTR_u, NULL, optarg, EQ);
+        add_atropl(&p_atropl, (char *)ATTR_u, NULL, optarg, EQ);
 
         break;
 
@@ -2241,12 +2239,12 @@ int main(
 
             case 'i':
               alt_opt |= ALT_DISPLAY_i;
-              add_atropl(&p_atropl, ATTR_state, (char *)0, "EHQTW", EQ);
+              add_atropl(&p_atropl, (char *)ATTR_state, (char *)0, (char *)"EHQTW", EQ);
               break;
 
             case 'r':
               alt_opt |= ALT_DISPLAY_r;
-              add_atropl(&p_atropl, ATTR_state, (char *)0, "RS", EQ);
+              add_atropl(&p_atropl, (char *)ATTR_state, (char *)0, (char *)"RS", EQ);
               break;
 
             case 'u':
@@ -2256,7 +2254,7 @@ int main(
 
               while (*++pc == ' ');
 
-              add_atropl(&p_atropl, ATTR_u, (char *)0, pc, EQ);
+              add_atropl(&p_atropl, (char *)ATTR_u, (char *)0, pc, EQ);
 
               pc = pc + strlen(pc) - 1; /* for the later incr */
 
@@ -2522,7 +2520,7 @@ int main(
 
           if (*queue_name_out != '\0')
             {
-            add_atropl(&p_atropl, ATTR_q, NULL, queue_name_out, EQ);
+            add_atropl(&p_atropl, (char *)ATTR_q, NULL, queue_name_out, EQ);
             }
           }    /* END else */
 
@@ -2571,18 +2569,18 @@ int main(
                        connect,
                        job_id_out,
                        NULL,
-                       exec_only ? EXECQUEONLY : ExtendOpt,
+                       exec_only ? (char *)EXECQUEONLY : (char *)ExtendOpt,
                        &any_failed);
           }
         else
           {
           if (t_opt)
             {
-            p_status = pbs_selstat_err(connect, p_atropl, exec_only ? EXECQUEONLY : NULL, &any_failed);
+            p_status = pbs_selstat_err(connect, p_atropl, exec_only ? (char *)EXECQUEONLY : NULL, &any_failed);
             }
           else
             {
-            p_status = pbs_selstat_err(connect, p_atropl, exec_only ? EXECQUEONLY : summarize_arrays_extend_opt, &any_failed);
+            p_status = pbs_selstat_err(connect, p_atropl, exec_only ? (char *)EXECQUEONLY : (char *)summarize_arrays_extend_opt, &any_failed);
             }
           }
 
@@ -2603,7 +2601,7 @@ int main(
 
             tcl_stat("job", NULL, f_opt);
 
-            prt_job_err("qstat", connect, job_id_out);
+            prt_job_err((char *)"qstat", connect, job_id_out);
             }
           else
             {
@@ -2611,7 +2609,7 @@ int main(
 
             if (any_failed != PBSE_NONE)
               {
-              prt_job_err("qstat", connect, job_id_out);
+              prt_job_err((char *)"qstat", connect, job_id_out);
               }
             }
           }
diff --git a/src/cmds/qsub_functions.c b/src/cmds/qsub_functions.c
index 0d885c5055..d96d6a63ad 100644
--- a/src/cmds/qsub_functions.c
+++ b/src/cmds/qsub_functions.c
@@ -21,6 +21,7 @@
 #include <pbs_error.h>    /* all static defines,  message & error codes */
 #include "qsub_functions.h"
 #include "common_cmds.h"
+#include "../lib/Libifl/lib_ifl.h"
 
 #include <sys/socket.h>
 #include <sys/stat.h>
@@ -83,7 +84,7 @@ char *host_name_suffix = NULL;
 int    J_opt = FALSE;
 int    P_opt = FALSE;
 
-char *checkpoint_strings = "n,c,s,u,none,shutdown,periodic,enabled,interval,depth,dir";
+const char *checkpoint_strings = "n,c,s,u,none,shutdown,periodic,enabled,interval,depth,dir";
 
 /* adapted from openssh */
 /* The parameter was EMsg, but was never used.
@@ -209,7 +210,7 @@ char *x11_get_proto(
     return(NULL);
     }
 
-  authstring = calloc(1, strlen(proto) + strlen(data) + strlen(screen) + 4);
+  authstring = (char *)calloc(1, strlen(proto) + strlen(data) + strlen(screen) + 4);
 
   if (authstring == NULL)
     {
@@ -294,7 +295,7 @@ int find_job_script_index(
 char *smart_strtok(
 
   char  *line,          /* I */
-  char  *delims,        /* I */
+  const char  *delims,        /* I */
   char **ptrPtr,        /* O */
   int    ign_backslash) /* I */
 
@@ -526,10 +527,10 @@ char *smart_strtok(
 
 
 
-int get_name_value(start, name, value)
-char  *start;
-char **name;
-char **value;
+int get_name_value(
+    char  *start,
+    char **name,
+    char **value)
   {
   static char *tok_ptr;
   char *curr_ptr;
@@ -705,7 +706,7 @@ int validate_submit_filter(
   int rc = 0;
   job_data *filter_info = NULL;
   struct stat  sfilter;
-  char *DefaultFilterPath = "/usr/local/sbin/torque_submitfilter";
+  const char *DefaultFilterPath = "/usr/local/sbin/torque_submitfilter";
 
   hash_find(*a_hash, ATTR_pbs_o_submit_filter, &filter_info);
   if ((filter_info != NULL) && (filter_info->var_type == CONFIG_DATA))
@@ -1170,7 +1171,7 @@ void make_argv(
   int len;
   char quote;
 
-  buffer = calloc(1, strlen(line) + 1);
+  buffer = (char *)calloc(1, strlen(line) + 1);
 
   if (buffer == NULL)
     {
@@ -1181,7 +1182,7 @@ void make_argv(
 
   *argc = 0;
 
-  argv[(*argc)++] = "qsub";
+  argv[(*argc)++] = (char *)"qsub";
 
   l = line;
   b = buffer;
@@ -1440,7 +1441,7 @@ int reader(
 
   while (1)
     {
-    c = read(s, buf, sizeof(buf));
+    c = read_ac_socket(s, buf, sizeof(buf));
 
     if (c > 0)
       {
@@ -1448,7 +1449,7 @@ int reader(
 
       while (c)
         {
-        if ((wc = write(d, p, c)) < 0)
+        if ((wc = write_ac_socket(d, p, c)) < 0)
           {
           if (errno == EINTR)
             {
@@ -1510,7 +1511,7 @@ void writer(
 
   while (1)
     {
-    i = read(d, &c, 1);
+    i = read_ac_socket(d, &c, 1);
 
     if (i > 0)
       {
@@ -1524,7 +1525,7 @@ void writer(
 
           /* read next character to check */
 
-          while ((i = read(d, &c, 1)) != 1)
+          while ((i = read_ac_socket(d, &c, 1)) != 1)
             {
             if ((i == -1) && (errno == EINTR))
               continue;
@@ -1556,7 +1557,7 @@ void writer(
             {
             /* not escape, write out tilde */
 
-            while ((wi = write(s, &tilde, 1)) != 1)
+            while ((wi = write_ac_socket(s, &tilde, 1)) != 1)
               {
               if ((wi == -1) && (errno == EINTR))
                 continue;
@@ -1581,7 +1582,7 @@ void writer(
                   (c == '\r');
         }
 
-      while ((wi = write(s, &c, 1)) != 1)
+      while ((wi = write_ac_socket(s, &c, 1)) != 1)
         {
         /* write out character */
 
@@ -1665,7 +1666,7 @@ void send_winsize(
           wsz->ws_xpixel,
           wsz->ws_ypixel);
 
-  if (write(sock, buf, PBS_TERM_BUF_SZ) != PBS_TERM_BUF_SZ)
+  if (write_ac_socket(sock, buf, PBS_TERM_BUF_SZ) != PBS_TERM_BUF_SZ)
     print_qsub_usage_exit("qsub: sending winsize");
 /*    {
     perror("sending winsize");
@@ -1701,7 +1702,7 @@ void send_term(
   else
     safe_strncat(buf, term, PBS_TERM_BUF_SZ - 5);
 
-  if (write(sock, buf, PBS_TERM_BUF_SZ) != PBS_TERM_BUF_SZ)
+  if (write_ac_socket(sock, buf, PBS_TERM_BUF_SZ) != PBS_TERM_BUF_SZ)
     print_qsub_usage_exit("qsub: sending term type");
 /*    {
     perror("sending term type");
@@ -1718,7 +1719,7 @@ void send_term(
   cc_array[4] = oldtio.c_cc[VEOF];
   cc_array[5] = oldtio.c_cc[VSUSP];
 
-  if (write(sock, cc_array, PBS_TERM_CCA) != PBS_TERM_CCA)
+  if (write_ac_socket(sock, cc_array, PBS_TERM_CCA) != PBS_TERM_CCA)
     print_qsub_usage_exit("qsub: sending term options");
 /*    {
     perror("sending term options");
@@ -2114,7 +2115,7 @@ void interactive(
 
   while (amt > 0)
     {
-    fromlen = read(news, pc, amt);
+    fromlen = read_ac_socket(news, pc, amt);
 
     if (fromlen <= 0)
       break;
@@ -2265,7 +2266,7 @@ int validate_group_list(
   /* check each group to determine if it is a valid group that the user can be a part of.
    * group list is of the form group[@host][,group[@host]...] */
   char          *groups = strdup(glist);
-  char          *delims = ",";
+  const char   *delims = ",";
   char          *tmp_group = strtok(groups, delims); 
   char          *at;
   char          *u_name;
@@ -2919,7 +2920,7 @@ void process_opts(
               Depend_opt = passet;
               */
 
-              pdepend = calloc(1, PBS_DEPEND_LEN);
+              pdepend = (char *)calloc(1, PBS_DEPEND_LEN);
 
               if ((pdepend == NULL) ||
                    (rc = parse_depend_list(valuewd,pdepend,PBS_DEPEND_LEN)))
@@ -3576,7 +3577,7 @@ void process_opts(
           /* Duplicate code */
 /* #ifdef linux */
           aindex = 1;  /* prime getopt's starting point */
-          tmpArgV[0] = "";
+          tmpArgV[0] = (char *)"";
 /* #else */
 /*           aindex = 1;  prime getopt's starting point */
 /*           tmpArgV[0] = ""; */
@@ -3706,8 +3707,8 @@ void set_job_defaults(
 
 char *get_param(
 
-  char *param,      /* I */
-  char *config_buf) /* I */
+  const char *param,      /* I */
+  const char *config_buf) /* I */
 
   {
   char tmpLine[1024];
@@ -3723,7 +3724,7 @@ char *get_param(
 
   /* NOTE: currently case-sensitive (FIXME) */
 
-  if ((param_val = strstr(config_buf, param)) == NULL)
+  if ((param_val = strstr((char *)config_buf, param)) == NULL)
     {
     return(NULL);
     }
@@ -3879,7 +3880,7 @@ void process_config_file(
  * display the qsub usage information
  * exit
  */
-void print_qsub_usage_exit(char *error_msg)
+void print_qsub_usage_exit(const char *error_msg)
   {
   static char usage[] =
     "usage: qsub [-a date_time] [-A account_string] [-b secs]\n\
@@ -3970,7 +3971,7 @@ void set_minwclimit(
 void add_variable_list(
 
   job_info *ji,
-  char     *var_name,
+  const char     *var_name,
   job_data *src_hash)
 
   {
@@ -3991,7 +3992,7 @@ void add_variable_list(
   total_len += hash_strlen(ji->user_attr);
   count = hash_count(ji->user_attr);
   total_len += count*2;
-  var_list = memmgr_calloc(&ji->mm, 1, total_len);
+  var_list = (char *)memmgr_calloc(&ji->mm, 1, total_len);
 
   if (v_value != NULL)
     {
@@ -4000,7 +4001,7 @@ void add_variable_list(
       strcat(var_list, ",");
     }
 
-  for (en=src_hash; en != NULL; en=en->hh.next)
+  for (en=src_hash; en != NULL; en=(job_data *)en->hh.next)
     {
     pos++;
     strcat(var_list, en->name);
diff --git a/src/cmds/qsub_functions.h b/src/cmds/qsub_functions.h
index 34e2a2bd04..0e9d2772f3 100644
--- a/src/cmds/qsub_functions.h
+++ b/src/cmds/qsub_functions.h
@@ -114,7 +114,7 @@ char *x11_get_proto(
 
 char *smart_strtok(
     char  *line,          /* I */
-    char  *delims,        /* I */
+    const char  *delims,        /* I */
     char **ptrPtr,        /* O */
     int    ign_backslash);/* I */
 
@@ -220,8 +220,8 @@ int load_config(
   int   BufSize);                 /* I */
 
 char *get_param(
-    char *param,                  /* I */
-    char *config_buf);            /* I */
+    const char *param,                  /* I */
+    const char *config_buf);            /* I */
 
 void set_client_attr_defaults(
     memmgr **mm,                  /* M */
@@ -233,7 +233,7 @@ void process_config_file(
     job_info *ji);                /* M */
 
 void print_qsub_usage_exit(
-    char *error_msg);             /* I */
+    const char *error_msg);             /* I */
 
 void add_submit_args_to_job(memmgr **mm, job_data **job_attr, int argc, char **argv);
 
diff --git a/src/cmds/test/common_cmds/scaffolding.c b/src/cmds/test/common_cmds/scaffolding.c
index c2b4379e31..2ba8d7d072 100644
--- a/src/cmds/test/common_cmds/scaffolding.c
+++ b/src/cmds/test/common_cmds/scaffolding.c
@@ -12,7 +12,7 @@ int env_del_call = 0;
 int env_find_call = 0;
 int tc_num = 0;
 
-int hash_add_item(memmgr **mm, job_data **head, char *name, char *value, int var_type, int op_type)
+int hash_add_item(memmgr **mm, job_data **head, const char *name, const char *value, int var_type, int op_type)
   {
   if ((strcmp(name, "ONE_VAR") == 0)
       && (strcmp(value, "ONE_VAL") == 0)
@@ -47,7 +47,7 @@ int hash_add_item(memmgr **mm, job_data **head, char *name, char *value, int var
   return 0;
   }
 
-int hash_del_item(memmgr **mm, job_data **head, char *name)
+int hash_del_item(memmgr **mm, job_data **head, const char *name)
   {
   if (strcmp(name, "_") == 0)
     {
@@ -56,7 +56,7 @@ int hash_del_item(memmgr **mm, job_data **head, char *name)
   return 0;
   }
 
-int hash_find(job_data *head, char *name, job_data **env_var)
+int hash_find(job_data *head, const char *name, job_data **env_var)
   {
   if (tc_num == 1)
     {
@@ -78,7 +78,7 @@ int hash_find(job_data *head, char *name, job_data **env_var)
   return 1;
   }
 
-void hash_add_or_exit(memmgr **mm, job_data **head, char *name, char *value, int var_type)
+void hash_add_or_exit(memmgr **mm, job_data **head, const char *name, const char *value, int var_type)
   {
   if (tc_num == 2)
     {
@@ -109,8 +109,8 @@ int append_dynamic_string(dynamic_string *ds, const char *str)
 
 dynamic_string *get_dynamic_string(int size, const char *str)
   {
-  dynamic_string *ds = calloc(1, sizeof(dynamic_string));
-  ds->str = calloc(1, 1024*10);
+  dynamic_string *ds = (dynamic_string *)calloc(1, sizeof(dynamic_string));
+  ds->str = (char *)calloc(1, 1024*10);
   return(ds);
   }
 
diff --git a/src/cmds/test/pbsdsh/scaffolding.c b/src/cmds/test/pbsdsh/scaffolding.c
index 43f2663e95..caa10fa50a 100644
--- a/src/cmds/test/pbsdsh/scaffolding.c
+++ b/src/cmds/test/pbsdsh/scaffolding.c
@@ -19,7 +19,7 @@ int tm_poll(tm_event_t poll_event, tm_event_t *result_event, int wait, int *tm_e
   exit(1);
   }
 
-ssize_t read_nonblocking_socket(int fd, void *buf, ssize_t count)
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
   { 
   fprintf(stderr, "The call to read_nonblocking_socket needs to be mocked!!\n");
   exit(1);
diff --git a/src/cmds/test/pbsnodes/scaffolding.c b/src/cmds/test/pbsnodes/scaffolding.c
index ad5f4fdefc..e012cdc45e 100644
--- a/src/cmds/test/pbsnodes/scaffolding.c
+++ b/src/cmds/test/pbsnodes/scaffolding.c
@@ -87,7 +87,7 @@ int pbs_manager_err(int c, int command, int objtype, char *objname, struct attro
   exit(1);
   }
 
-int MXMLCreateE(mxml_t **E, char *Name)
+int MXMLCreateE(mxml_t **E, const char *Name)
   { 
   fprintf(stderr, "The call to MXMLCreateE needs to be mocked!!\n");
   exit(1);
diff --git a/src/cmds/test/qstat/scaffolding.c b/src/cmds/test/qstat/scaffolding.c
index 674ea96c1e..3c77fab901 100644
--- a/src/cmds/test/qstat/scaffolding.c
+++ b/src/cmds/test/qstat/scaffolding.c
@@ -109,7 +109,7 @@ int MXMLAddE(mxml_t *E, mxml_t *C)
   exit(1);
   }
 
-int MXMLCreateE(mxml_t **E, char *Name)
+int MXMLCreateE(mxml_t **E, const char *Name)
   { 
   fprintf(stderr, "The call to MXMLCreateE needs to be mocked!!\n");
   exit(1);
diff --git a/src/cmds/test/qsub_functions/scaffolding.c b/src/cmds/test/qsub_functions/scaffolding.c
index b37f0099e6..ed34cfbc1a 100644
--- a/src/cmds/test/qsub_functions/scaffolding.c
+++ b/src/cmds/test/qsub_functions/scaffolding.c
@@ -17,7 +17,7 @@ char *pbs_geterrmsg(int connect)
   exit(1);
   }
 
-int hash_find(job_data *head, char *name, job_data **env_var)
+int hash_find(job_data *head, const char *name, job_data **env_var)
   {
   fprintf(stderr, "The call to hash_find to be mocked!!\n");
   exit(1);
@@ -89,19 +89,19 @@ int prepare_path( char *path_in,  char *path_out,  char *host)
   exit(1);
   }
 
-int hash_del_item(memmgr **mm, job_data **head, char *name)
+int hash_del_item(memmgr **mm, job_data **head, const char *name)
   {
   fprintf(stderr, "The call to hash_del_item to be mocked!!\n");
   exit(1);
   }
 
-int csv_length(char *csv_str)
+int csv_length(const char *csv_str)
   {
   fprintf(stderr, "The call to csv_length to be mocked!!\n");
   exit(1);
   }
 
-char *csv_nth(char *csv_str, int n)
+char *csv_nth(const char *csv_str, int n)
   {
   fprintf(stderr, "The call to csv_nth to be mocked!!\n");
   exit(1);
@@ -143,7 +143,7 @@ int parse_at_list(char *list, int use_count, int abs_path)
   exit(1);
   }
 
-char * csv_find_string(char *csv_str, char *search_str)
+char * csv_find_string(const char *csv_str, const char *search_str)
   {
   fprintf(stderr, "The call to csv_find_string to be mocked!!\n");
   exit(1);
@@ -167,7 +167,7 @@ int pbs_deljob_err( int c, char *jobid, char *extend, int *local_errno)
   exit(1);
   }
 
-void calloc_or_fail( char **dest, int alloc_size, char *err_msg)
+void calloc_or_fail( char **dest, int alloc_size, const char *err_msg)
   {
   fprintf(stderr, "The call to calloc_or_fail to be mocked!!\n");
   exit(1);
@@ -197,7 +197,7 @@ char *pbs_strerror(int err)
   exit(1);
   }
 
-void hash_add_or_exit(memmgr **mm, job_data **head, char *name, char *value, int var_type)
+void hash_add_or_exit(memmgr **mm, job_data **head, const char *name, const char *value, int var_type)
   {
   fprintf(stderr, "The call to hash_add_or_exit to be mocked!!\n");
   exit(1);
@@ -265,3 +265,13 @@ int load_config(
   {
   return(0);
   }
+
+ssize_t write_ac_socket(int fd, const void *buf, ssize_t count)
+  {
+  return(0);
+  }
+
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
+  {
+  return(0);
+  }
diff --git a/src/drmaa/src/submit.c b/src/drmaa/src/submit.c
index e38e6f3c8a..330c7ea11f 100644
--- a/src/drmaa/src/submit.c
+++ b/src/drmaa/src/submit.c
@@ -824,7 +824,7 @@ drmaa_write_tmpfile(
 
   while (len > 0)
     {
-    size_t written = write(fd, content, len);
+    size_t written = write_ac_socket(fd, content, len);
 
     if (written != (size_t) - 1)
       {
diff --git a/src/include/acct.h b/src/include/acct.h
index 59f7ebdcfa..15772e3426 100644
--- a/src/include/acct.h
+++ b/src/include/acct.h
@@ -104,7 +104,7 @@
 #define PBS_ACCT_ABT (int)'A' /* Job Abort by server */
 
 extern int  acct_open (char *filename);
-extern void account_record (int acctype, job *pjob, char *text);
+extern void account_record (int acctype, job *pjob, const char *text);
 extern void account_jobstr (job *pjob);
 extern void account_jobend (job *pjob, char * used);
 
diff --git a/src/include/alps_constants.h b/src/include/alps_constants.h
index 7d4ce1b94f..4e0ecd71c4 100644
--- a/src/include/alps_constants.h
+++ b/src/include/alps_constants.h
@@ -96,7 +96,6 @@
 #define CONFIRM_BASIL_REQ           "echo \"<?xml version='1.0'?><BasilRequest protocol='%s' method='CONFIRM' reservation_id='%s' %s='%lld'/>\" | %s"
 #define DELETE_BASIL_REQ            "echo \"<?xml version='1.0'?><BasilRequest protocol='%s' method='RELEASE' reservation_id='%s'/>\" | %s"
 
-
 extern const int   apbasil_fail_transient;
 extern const int   apbasil_fail_permanent;
 extern const char *message;
@@ -130,7 +129,7 @@ extern const char *text_name;
 extern const char *memory_mb;
 extern const char *family;
 extern const char *cproc_eq;
-extern const int   cproc_eq_len;
+extern const int   ac_cproc_eq_len;
 extern const char *CRAY_GPU_STATUS_START;
 extern const char *CRAY_GPU_STATUS_END;
 extern const char *alps_reporter_feature;
diff --git a/src/include/attribute.h b/src/include/attribute.h
index 091af951c6..b40407fd50 100644
--- a/src/include/attribute.h
+++ b/src/include/attribute.h
@@ -210,7 +210,7 @@ typedef struct pbs_attribute pbs_attribute;
 struct attribute_def
   {
   const char *at_name;
-  int (*at_decode)(pbs_attribute *patr, const char *name, char *rn, char *val, int perm);
+  int (*at_decode)(pbs_attribute *patr, const char *name, const char *rn, const char *val, int perm);
   int (*at_encode)(pbs_attribute *pattr, tlist_head *phead,
                       const char *aname, const char *rsname, int mode, int perm);
   int (*at_set)(pbs_attribute *pattr, pbs_attribute *new_attr, enum batch_op);
@@ -336,7 +336,7 @@ struct array_strings
  */
 
 extern void clear_attr(pbs_attribute *pattr, attribute_def *pdef);
-extern int  find_attr(attribute_def *attrdef, char *name, int limit);
+extern int  find_attr(attribute_def *attrdef, const char *name, int limit);
 extern int  recov_attr(int fd, void *parent, attribute_def *padef,
 			   pbs_attribute *pattr, int limit, int unknown, int do_actions);
 extern long attr_ifelse_long(pbs_attribute *, pbs_attribute *, long);
@@ -353,22 +353,22 @@ extern int  attr_atomic_node_set(svrattrl *plist, pbs_attribute *old,
                                        int unkn, int privil, int *badattr);
 extern void attr_atomic_kill(pbs_attribute *temp, attribute_def *pdef, int);
 
-int  decode_b(pbs_attribute *patr, const char *name, char *rn, char *val, int);
-int  decode_c(pbs_attribute *patr, const char *name, char *rn, char *val, int);
-int  decode_l(pbs_attribute *patr, const char *name, char *rn, char *val, int);
-int  decode_ll(pbs_attribute *patr, const char *name, char *rn, char *val, int);
-int  decode_size(pbs_attribute *patr, const char *name, char *rn, char *val, int);
-int  decode_str(pbs_attribute *patr, const char *name, char *rn, char *val, int);
-int  decode_time(pbs_attribute *patr, const char *name, char *rn, char *val, int);
-int  decode_arst(pbs_attribute *patr, const char *name, char *rn, char *val, int);
-int  decode_arst_direct(pbs_attribute *patr, char *val);
-int  decode_arst_merge(pbs_attribute *,const char *,char *,char *);
-int  decode_resc(pbs_attribute *patr, const char *name, char *rn, char *val, int);
-int  decode_depend(pbs_attribute *patr, const char *name, char *rn, char *val, int);
-int  decode_hold(pbs_attribute *patr, const char *name, char *rn, char *val, int);
-int  decode_uacl(pbs_attribute *patr, const char *name, char *rn, char *val, int);
-int  decode_unkn(pbs_attribute *patr, const char *name, char *rn, char *val, int);
-int  decode_tv(pbs_attribute *patr, const char *name,  char *rescn,	char *val, int);
+int  decode_b(pbs_attribute *patr, const char *name, const char *rn, const char *val, int);
+int  decode_c(pbs_attribute *patr, const char *name, const char *rn, const char *val, int);
+int  decode_l(pbs_attribute *patr, const char *name, const char *rn, const char *val, int);
+int  decode_ll(pbs_attribute *patr, const char *name, const char *rn, const char *val, int);
+int  decode_size(pbs_attribute *patr, const char *name, const char *rn, const char *val, int);
+int  decode_str(pbs_attribute *patr, const char *name, const char *rn, const char *val, int);
+int  decode_time(pbs_attribute *patr, const char *name, const char *rn, const char *val, int);
+int  decode_arst(pbs_attribute *patr, const char *name, const char *rn, const char *val, int);
+int  decode_arst_direct(pbs_attribute *patr, const char *val);
+int  decode_arst_merge(pbs_attribute *,const char *,const char *,const char *);
+int  decode_resc(pbs_attribute *patr, const char *name, const char *rn, const char *val, int);
+int  decode_depend(pbs_attribute *patr, const char *name, const char *rn, const char *val, int);
+int  decode_hold(pbs_attribute *patr, const char *name, const char *rn, const char *val, int);
+int  decode_uacl(pbs_attribute *patr, const char *name, const char *rn, const char *val, int);
+int  decode_unkn(pbs_attribute *patr, const char *name, const char *rn, const char *val, int);
+int  decode_tv(pbs_attribute *patr, const char *name,  const char *rescn, const char *val, int);
  
 int encode_b(pbs_attribute *attr, tlist_head *phead, const char *atname,
                            const char *rsname, int mode, int perm);
@@ -462,10 +462,10 @@ extern int      encode_state(pbs_attribute *, tlist_head *, const char *, const
 extern int      encode_props(pbs_attribute*, tlist_head*, const char*, const char*, int, int);
 extern int      encode_jobs(pbs_attribute*, tlist_head*, const char*, const char*, int, int);
 extern int      encode_ntype(pbs_attribute*, tlist_head*, const char*, const char*, int, int);
-extern int      decode_state(pbs_attribute*, const char*, char*, char*, int);
-extern int      decode_props(pbs_attribute*, const char*, char*, char*, int);
-extern int      decode_ntype(pbs_attribute*, const char*, char*, char*, int);
-extern int      decode_null(pbs_attribute*, const char*, char*, char*, int);
+extern int      decode_state(pbs_attribute*, const char*, const char*, const char*, int);
+extern int      decode_props(pbs_attribute*, const char*, const char*, const char*, int);
+extern int      decode_ntype(pbs_attribute*, const char*, const char*, const char*, int);
+extern int      decode_null(pbs_attribute*, const char*, const char*, const char*, int);
 extern int      comp_null(pbs_attribute*, pbs_attribute*);
 extern int      count_substrings(char*, int*);
 extern int      set_node_state(pbs_attribute*, pbs_attribute*, enum batch_op);
@@ -495,7 +495,7 @@ extern int 		job_radix_action (pbs_attribute *new_attr, void *pobj, int actmode)
 
 /* Token manipulation functions */
 
-extern int  decode_tokens(pbs_attribute *, const char *, char *, char *, int);
+extern int  decode_tokens(pbs_attribute *, const char *, const char *, const char *, int);
 
 int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y);
 
diff --git a/src/include/batch_request.h b/src/include/batch_request.h
index 4b45d177f6..d0cd6eec36 100644
--- a/src/include/batch_request.h
+++ b/src/include/batch_request.h
@@ -106,6 +106,7 @@
 #include "u_memmgr.h" /* memmgr */
 #include "resizable_array.h"
 #include "hash_table.h"
+#include "work_task.h"
 
 #define  INITIAL_REQUEST_HOLDER_SIZE 20
 
@@ -439,7 +440,7 @@ extern void  req_delete_reservation(struct batch_request *preq);
 #endif
 
 #ifdef SERVER_LIMITS_H
-int relay_to_mom (job **, struct batch_request *, void (*func)());
+int relay_to_mom (job **, struct batch_request *, void (*func)(struct work_task *));
 #endif  /* SERVER_LIMITS_H */
 
 /* PBS Batch Request Decode/Encode routines */
diff --git a/src/include/csv.h b/src/include/csv.h
index bbd9358812..f8bb8e1419 100644
--- a/src/include/csv.h
+++ b/src/include/csv.h
@@ -5,10 +5,10 @@
 #ifndef _CSV_H_
 #define _CSV_H_
 
-extern int csv_length(char *csv_str);
-extern char *csv_nth(char *csv_str, int n);
-extern char *csv_find_string(char *csv_str, const char *search_str);
-extern char *csv_find_value(char *csv_str, const char *search_str);
+extern int csv_length(const char *csv_str);
+extern char *csv_nth(const char *csv_str, int n);
+extern char *csv_find_string(const char *csv_str, const char *search_str);
+extern char *csv_find_value(const char *csv_str, const char *search_str);
 /* Note that csv_nth returns a pointer to a static buffer */
 
 
diff --git a/src/include/mcom.h b/src/include/mcom.h
index df2300a765..e39054e192 100644
--- a/src/include/mcom.h
+++ b/src/include/mcom.h
@@ -244,7 +244,7 @@ enum MSocketAttrEnum
   };
 
 
-extern int MXMLCreateE(mxml_t **, char *);
+extern int MXMLCreateE(mxml_t **, const char *);
 extern int MXMLAddE(mxml_t *, mxml_t *);
 extern int MXMLSetVal(mxml_t *, void *, enum MDataFormatEnum);
 extern int MXMLDestroyE(mxml_t **);
diff --git a/src/include/pbs_job.h b/src/include/pbs_job.h
index 558344ce2d..40743b89b4 100644
--- a/src/include/pbs_job.h
+++ b/src/include/pbs_job.h
@@ -1108,7 +1108,7 @@ extern int   site_check_user_map(job *, char *, char *, int);
 int  svr_dequejob(job *, int);
 extern int   svr_enquejob(job *, int, int);
 extern void  svr_evaljobstate(job *, int *, int *, int);
-extern void  svr_mailowner(job *, int, int, char *);
+extern void  svr_mailowner(job *, int, int, const char *);
 extern void  set_resc_deflt(job *, pbs_attribute *, int);
 extern void  set_statechar(job *);
 extern int   svr_setjobstate(job *, int, int, int);
@@ -1122,7 +1122,7 @@ extern int   svr_chk_owner(struct batch_request *, job *);
 extern struct batch_request *cpy_stage(struct batch_request *, job *, enum job_atr, int);
 extern struct batch_request *setup_cpyfiles(struct batch_request *, job *, char *, char *, int, int);
 extern struct batch_request *cpy_checkpoint(struct batch_request *, job *, enum job_atr, int);
-int   issue_signal(job **, char *, void(*)(struct work_task *), void *);
+int   issue_signal(job **, const char *, void(*)(struct batch_request *), void *);
 #endif /* BATCH_REQUEST_H */
 
 
diff --git a/src/include/pbs_nodes.h b/src/include/pbs_nodes.h
index 435b8a50db..aa714fc6d7 100644
--- a/src/include/pbs_nodes.h
+++ b/src/include/pbs_nodes.h
@@ -348,6 +348,8 @@ struct pbsnode
   struct AvlNode       *node_boards;         /* private tree of numa nodes */
   char                 *numa_str;            /* comma-delimited string of processor values */
   char                 *gpu_str;             /* comma-delimited string of the number of gpus for each nodeboard */
+
+  unsigned char         nd_mom_reported_down;/* notes that the mom reported its own shutdown */
   
   unsigned char         nd_is_alps_reporter;
   unsigned char         nd_is_alps_login;
@@ -565,7 +567,7 @@ extern int update_nodes_file(struct pbsnode *);
 
 extern void bad_node_warning(pbs_net_t, struct pbsnode *);
 
-struct pbsnode  *find_nodebyname(char *);
+struct pbsnode  *find_nodebyname(const char *);
 struct pbsnode  *find_node_in_allnodes(all_nodes *an, char *nodename);
 int              create_partial_pbs_node(char *, unsigned long, int);
 struct pbssubn  *create_subnode(struct pbsnode *pnode);
diff --git a/src/include/qmgr.h b/src/include/qmgr.h
index 74d0f7ffdf..0aa34b6fdb 100644
--- a/src/include/qmgr.h
+++ b/src/include/qmgr.h
@@ -116,7 +116,7 @@ void clean_up();
 void clean_up_and_exit(int);
 void freeattrl(struct attrl *);
 void freeattropl(struct attropl *);
-void pstderr_big(char *, char*, char *);
+void pstderr_big(const char *, const char*, const char *);
 void free_objname_list(struct objname *);
 void free_server(struct server *);
 void free_objname(struct objname *);
@@ -126,7 +126,7 @@ int set_active(int, struct objname *);
 int get_request(char *);
 int parse(char *, int *, int *, char **, struct attropl **);
 int execute(int, int, int, char *, struct attropl *);
-int is_attr(int, char *, int);
+int is_attr(int, const char *, int);
 int is_valid_object(struct objname *, int);
 void disconnect_from_server();
 
diff --git a/src/include/queue.h b/src/include/queue.h
index cd9000437b..bf44e8bf6b 100644
--- a/src/include/queue.h
+++ b/src/include/queue.h
@@ -175,6 +175,16 @@ extern attribute_def que_attr_def[];
 
 /* at last we come to the queue definition itself */
 
+typedef struct _queuefix
+  {
+  int    qu_modified; /* != 0 => update disk file */
+  int    qu_type;     /* queue type: exec, route */
+  time_t qu_ctime;    /* time queue created */
+  time_t qu_mtime;    /* time queue last modified */
+  char   qu_name[PBS_MAXQUEUENAME]; /* queue name */
+  } queuefix;
+
+
 typedef struct pbs_queue
   {
   int              q_being_recycled;
@@ -186,14 +196,7 @@ typedef struct pbs_queue
   tlist_head       qu_jobs_array_sum; /* jobs with job arrays summarized */
 #endif
 
-  struct queuefix
-    {
-    int    qu_modified; /* != 0 => update disk file */
-    int    qu_type;     /* queue type: exec, route */
-    time_t qu_ctime;    /* time queue created */
-    time_t qu_mtime;    /* time queue last modified */
-    char   qu_name[PBS_MAXQUEUENAME]; /* queue name */
-    } qu_qs;
+  queuefix qu_qs;
 
   pthread_mutex_t *qu_mutex; /* this queue's mutex */
 
diff --git a/src/include/resource.h b/src/include/resource.h
index d9aed88bc2..7be36851f6 100644
--- a/src/include/resource.h
+++ b/src/include/resource.h
@@ -119,7 +119,7 @@ typedef struct resource
 typedef struct resource_def
   {
   const char  *rs_name;
-  int     (*rs_decode)(pbs_attribute *, const char *, char *, char *, int);
+  int     (*rs_decode)(pbs_attribute *, const char *, const char *, const char *, int);
   int     (*rs_encode)(pbs_attribute *, tlist_head *, const char *, const char *, int, int);
   int     (*rs_set)(pbs_attribute *, pbs_attribute *, enum batch_op);
   int     (*rs_comp)(pbs_attribute *, pbs_attribute *);
diff --git a/src/include/server.h b/src/include/server.h
index 059703dac5..f2e53b2eaa 100644
--- a/src/include/server.h
+++ b/src/include/server.h
@@ -208,18 +208,21 @@ enum srv_atr
   };
 extern attribute_def svr_attr_def[];
 
+typedef struct _server_qs
+  {
+  int  sv_numjobs; /* number of job owned by server    */
+  int  sv_numque;  /* nuber of queues managed          */
+  int  sv_jobidnumber; /* next number to use in new jobid  */
+  /* the server struct must be saved  */
+  /* whenever this value is updated   */
+  time_t sv_savetm; /* time of server db update         */
+  } server_qs;
+
+
 struct server
   {
 
-  struct server_qs
-    {
-    int  sv_numjobs; /* number of job owned by server    */
-    int  sv_numque;  /* nuber of queues managed          */
-    int  sv_jobidnumber; /* next number to use in new jobid  */
-    /* the server struct must be saved  */
-    /* whenever this value is updated   */
-    time_t sv_savetm; /* time of server db update         */
-    } sv_qs;
+  server_qs sv_qs;
 
   pthread_mutex_t *sv_qs_mutex;
   pthread_mutex_t *sv_attr_mutex;
diff --git a/src/include/u_hash_map_structs.h b/src/include/u_hash_map_structs.h
index d67a5f2904..e37be28b5a 100644
--- a/src/include/u_hash_map_structs.h
+++ b/src/include/u_hash_map_structs.h
@@ -112,15 +112,15 @@ typedef struct job_data
     UT_hash_handle hh;
   } job_data;
 
-int hash_add_item(memmgr **mm, job_data **head, char *name, char *value, int var_type, int op_type);
+int hash_add_item(memmgr **mm, job_data **head, const char *name, const char *value, int var_type, int op_type);
 
-void hash_add_or_exit(memmgr **mm, job_data **head, char *name, char *value, int var_type);
+void hash_add_or_exit(memmgr **mm, job_data **head, const char *name, const char *value, int var_type);
 
-int hash_del_item(memmgr **mm, job_data **head, char *name);
+int hash_del_item(memmgr **mm, job_data **head, const char *name);
 
 int hash_clear(memmgr **mm, job_data **head);
 
-int hash_find(job_data *head, char *name, job_data **env_var);
+int hash_find(job_data *head, const char *name, job_data **env_var);
 
 int hash_count(job_data *head);
 
diff --git a/src/include/uthash.h b/src/include/uthash.h
index 55cb6978a8..d9ee30d0a6 100644
--- a/src/include/uthash.h
+++ b/src/include/uthash.h
@@ -308,8 +308,8 @@ do {
 #define HASH_EMIT_KEY(hh,head,keyptr,fieldlen)                                   \
 do {                                                                             \
     unsigned _klen = fieldlen;                                                   \
-    write(HASH_EMIT_KEYS, &_klen, sizeof(_klen));                                \
-    write(HASH_EMIT_KEYS, keyptr, fieldlen);                                     \
+    write_ac_socket(HASH_EMIT_KEYS, &_klen, sizeof(_klen));                                \
+    write_ac_socket(HASH_EMIT_KEYS, keyptr, fieldlen);                                     \
 } while (0)
 #else 
 #define HASH_EMIT_KEY(hh,head,keyptr,fieldlen)                    
diff --git a/src/lib/Libattr/attr_fn_arst.c b/src/lib/Libattr/attr_fn_arst.c
index a0ad1b5d9f..60bcd2c7c1 100644
--- a/src/lib/Libattr/attr_fn_arst.c
+++ b/src/lib/Libattr/attr_fn_arst.c
@@ -119,7 +119,7 @@
 int decode_arst_direct(
 
   pbs_attribute *patr,  /* I (modified) */
-  char          *val)   /* I */
+  const char    *val)   /* I */
 
   {
   unsigned long bksize;
@@ -266,8 +266,8 @@ int decode_arst(
 
   pbs_attribute *patr,    /* O (modified) */
   const char   *name,    /* I pbs_attribute name (notused) */
-  char          *rescn,   /* I resource name (notused) */
-  char          *val,     /* I pbs_attribute value */
+  const char *rescn,   /* I resource name (notused) */
+  const char    *val,     /* I pbs_attribute value */
   int            perm) /* only used for resources */
 
   {
@@ -331,8 +331,8 @@ int decode_arst_merge(
 
   pbs_attribute *patr,    /* O (modified) */
   const char   *name,    /* I pbs_attribute name (notused) */
-  char          *rescn,   /* I resource name (notused) */
-  char          *val)     /* I pbs_attribute value */
+  const char *rescn,   /* I resource name (notused) */
+  const char    *val)     /* I pbs_attribute value */
 
   {
   int           rc;
diff --git a/src/lib/Libattr/attr_fn_arst.h b/src/lib/Libattr/attr_fn_arst.h
index 856034b71d..d7fdc0ab1f 100644
--- a/src/lib/Libattr/attr_fn_arst.h
+++ b/src/lib/Libattr/attr_fn_arst.h
@@ -4,11 +4,9 @@
 #include "list_link.h" /* tlist_head */
 #include "pbs_ifl.h" /* batch_op */
 
-int decode_arst_direct( struct pbs_attribute *patr, char *val); 
+int decode_arst_direct( struct pbs_attribute *patr, const char *val);
 
-int decode_arst( struct pbs_attribute *patr, const char *name, char *rescn, char *val, int perm);
-
-int decode_arst_merge( struct pbs_attribute *patr, const char *name, char *rescn, char *val);
+int decode_arst( struct pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm);
 
 int encode_arst( pbs_attribute *attr, tlist_head *phead, const char *atname, const char *rsname, int mode, int perm);
 
diff --git a/src/lib/Libattr/attr_fn_b.c b/src/lib/Libattr/attr_fn_b.c
index a1ece928bb..b9718b3978 100644
--- a/src/lib/Libattr/attr_fn_b.c
+++ b/src/lib/Libattr/attr_fn_b.c
@@ -112,8 +112,8 @@
  * -------------------------------------------------------
  */
 
-static char true_val[]  = ATR_TRUE;
-static char false_val[] = ATR_FALSE;
+static const char *true_val  = ATR_TRUE;
+static const char *false_val = ATR_FALSE;
 
 /*
  * decode_b - decode string into boolean pbs_attribute
@@ -128,8 +128,8 @@ int decode_b(
 
   pbs_attribute *patr,
   const char    *name,  /* pbs_attribute name */
-  char          *rescn,  /* resource name, unused here */
-  char          *val,  /* pbs_attribute value */
+  const char *rescn,  /* resource name, unused here */
+  const char    *val,  /* pbs_attribute value */
   int            perm) /* only used for resources */
 
   {
@@ -143,7 +143,7 @@ int decode_b(
     }
   else
     {
-    for (pc = val; *pc; pc++)
+    for (pc = (char *)val; *pc; pc++)
       *pc = (char)toupper((int) * pc);
 
     if ((strcmp(val, true_val) == 0) ||
@@ -194,7 +194,7 @@ int encode_b(
   {
   size_t   ct;
   svrattrl *pal;
-  char  *value;
+  const char  *value;
 
   if (!attr)
     return (-1);
diff --git a/src/lib/Libattr/attr_fn_b.h b/src/lib/Libattr/attr_fn_b.h
index 23aa746586..b2295114f1 100644
--- a/src/lib/Libattr/attr_fn_b.h
+++ b/src/lib/Libattr/attr_fn_b.h
@@ -4,7 +4,7 @@
 #include "list_link.h" /* tlist_head */
 #include "pbs_ifl.h" /* batch_op */
 
-int decode_b(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm);
+int decode_b(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm);
 
 int encode_b(pbs_attribute *attr, tlist_head *phead, const char *atname, const char *rsname, int mode, int perm);
 
diff --git a/src/lib/Libattr/attr_fn_c.c b/src/lib/Libattr/attr_fn_c.c
index d77c9776f6..35c4b45576 100644
--- a/src/lib/Libattr/attr_fn_c.c
+++ b/src/lib/Libattr/attr_fn_c.c
@@ -124,8 +124,8 @@ int decode_c(
 
   pbs_attribute *patr,
   const char   *name,  /* pbs_attribute name */
-  char          *rescn,  /* resource name, unused here */
-  char          *val,  /* pbs_attribute value */
+  const char *rescn,  /* resource name, unused here */
+  const char    *val,  /* pbs_attribute value */
   int            perm) /* only used for resources */
 
   {
diff --git a/src/lib/Libattr/attr_fn_c.h b/src/lib/Libattr/attr_fn_c.h
index 2037da2789..c342acdeb7 100644
--- a/src/lib/Libattr/attr_fn_c.h
+++ b/src/lib/Libattr/attr_fn_c.h
@@ -4,7 +4,7 @@
 #include "list_link.h" /* tlist_head */
 #include "pbs_ifl.h" /* batch_op */
 
-int decode_c( pbs_attribute *patr, const char *name, char *rescn, char *val, int perm);
+int decode_c( pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm);
 
 int encode_c( pbs_attribute *attr, tlist_head *phead, const char *atname, const char *rsname, int mode, int perm);
 
diff --git a/src/lib/Libattr/attr_fn_hold.c b/src/lib/Libattr/attr_fn_hold.c
index e6d199c6df..181f4488c8 100644
--- a/src/lib/Libattr/attr_fn_hold.c
+++ b/src/lib/Libattr/attr_fn_hold.c
@@ -111,12 +111,12 @@ int decode_hold(
 
   pbs_attribute *patr,
   const char   *name,  /* pbs_attribute name */
-  char          *rescn,  /* resource name - unused here */
-  char          *val,  /* pbs_attribute value */
+  const char *rescn,  /* resource name - unused here */
+  const char    *val,  /* pbs_attribute value */
   int            perm) /* only used for resources */
 
   {
-  char  *pc;
+  const char  *pc;
 
   patr->at_val.at_long = 0;
 
diff --git a/src/lib/Libattr/attr_fn_hold.h b/src/lib/Libattr/attr_fn_hold.h
index ebddd56cb1..9b5d335073 100644
--- a/src/lib/Libattr/attr_fn_hold.h
+++ b/src/lib/Libattr/attr_fn_hold.h
@@ -3,7 +3,7 @@
 #include "attribute.h" /* pbs_attribute */
 #include "list_link.h" /* tlist_head */
 
-int decode_hold( pbs_attribute *patr, const char *name, char *rescn, char *val, int perm);
+int decode_hold( pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm);
 
 int encode_hold( pbs_attribute *attr, tlist_head *phead, const char *atname, const char *rsname, int mode, int perm);
 
diff --git a/src/lib/Libattr/attr_fn_l.c b/src/lib/Libattr/attr_fn_l.c
index e9d6e6d339..859623ed09 100644
--- a/src/lib/Libattr/attr_fn_l.c
+++ b/src/lib/Libattr/attr_fn_l.c
@@ -123,12 +123,12 @@ int decode_l(
 
   pbs_attribute *patr,
   const char  *name,  /* pbs_attribute name */
-  char          *rescn,  /* resource name, unused here */
-  char          *val,  /* pbs_attribute value */
+  const char *rescn,  /* resource name, unused here */
+  const char    *val,  /* pbs_attribute value */
   int            perm) /* only used for resources */
 
   {
-  char *pc;
+  const char *pc;
 
   if ((val != (char *)0) && (strlen(val) != 0))
     {
diff --git a/src/lib/Libattr/attr_fn_l.h b/src/lib/Libattr/attr_fn_l.h
index 5075f800cf..ccc989d356 100644
--- a/src/lib/Libattr/attr_fn_l.h
+++ b/src/lib/Libattr/attr_fn_l.h
@@ -4,7 +4,7 @@
 #include "list_link.h" /* tlist_head */
 #include "pbs_ifl.h" /* batch_op */
 
-int decode_l( pbs_attribute *patr, const char *name, char *rescn, char *val, int perm);
+int decode_l( pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm);
 
 int encode_l( pbs_attribute *attr, tlist_head *phead, const char *atname, const char *rsname, int mode, int perm);
 
diff --git a/src/lib/Libattr/attr_fn_ll.c b/src/lib/Libattr/attr_fn_ll.c
index 8f36e1894e..c686464a1f 100644
--- a/src/lib/Libattr/attr_fn_ll.c
+++ b/src/lib/Libattr/attr_fn_ll.c
@@ -49,8 +49,8 @@ int decode_ll(
 
   pbs_attribute *patr,
   const char   *name,  /* pbs_attribute name */
-  char          *rescn, /* resource name, unused here */
-  char          *val,   /* pbs_attribute value */
+  const char *rescn, /* resource name, unused here */
+  const char    *val,   /* pbs_attribute value */
   int            perm)  /* only used for resources */
 
   {
diff --git a/src/lib/Libattr/attr_fn_ll.h b/src/lib/Libattr/attr_fn_ll.h
index c78dfcf8ca..b2f1bd3275 100644
--- a/src/lib/Libattr/attr_fn_ll.h
+++ b/src/lib/Libattr/attr_fn_ll.h
@@ -4,7 +4,7 @@
 #include "list_link.h" /* tlist_head */
 #include "pbs_ifl.h" /* batch_op */
 
-int decode_ll(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm);
+int decode_ll(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm);
 
 int encode_ll(pbs_attribute *attr, tlist_head *phead, const char *atname, const char *rsname, int mode, int perm);
 
diff --git a/src/lib/Libattr/attr_fn_resc.c b/src/lib/Libattr/attr_fn_resc.c
index 6ec092caf3..f123d1830f 100644
--- a/src/lib/Libattr/attr_fn_resc.c
+++ b/src/lib/Libattr/attr_fn_resc.c
@@ -138,8 +138,8 @@ int decode_resc(
 
   pbs_attribute *patr,  /* Modified on Return */
   const char   *name,  /* pbs_attribute name */
-  char          *rescn, /* I resource name - is used here */
-  char          *val,   /* resource value */
+  const char *rescn, /* I resource name - is used here */
+  const char    *val,   /* resource value */
   int            perm)  /* access permissions */
 
   {
diff --git a/src/lib/Libattr/attr_fn_resc.h b/src/lib/Libattr/attr_fn_resc.h
index c5085cad33..5d4eccc473 100644
--- a/src/lib/Libattr/attr_fn_resc.h
+++ b/src/lib/Libattr/attr_fn_resc.h
@@ -5,7 +5,7 @@
 #include "pbs_ifl.h" /* batch_op */
 #include "resource.h" /* resource_def */
 
-int decode_resc(struct pbs_attribute *patr, const char *name, char *rescn, char *val, int perm);
+int decode_resc(struct pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm);
 
 int encode_resc(pbs_attribute *attr, tlist_head *phead, const char *atname, const char *rsname, int mode, int ac_perm);
 
diff --git a/src/lib/Libattr/attr_fn_size.c b/src/lib/Libattr/attr_fn_size.c
index 87cd3106c5..1af3cfe39a 100644
--- a/src/lib/Libattr/attr_fn_size.c
+++ b/src/lib/Libattr/attr_fn_size.c
@@ -113,7 +113,7 @@
  */
 
 
-int to_size(char *, struct size_value *);
+int to_size(const char *, struct size_value *);
 void from_size(struct size_value *, char *);
 int normalize_size(struct size_value *a, struct size_value *b,
                        struct size_value *c, struct size_value *d);
@@ -130,8 +130,8 @@ int decode_size(
 
   pbs_attribute *patr,
   const char   *name, /* pbs_attribute name */
-  char          *rescn, /* resource name, unused here */
-  char          *val, /* pbs_attribute value */
+  const char *rescn, /* resource name, unused here */
+  const char    *val, /* pbs_attribute value */
   int            perm)  /* only used for resources */
 
   {
@@ -423,7 +423,7 @@ normalize_size(struct size_value *a, struct size_value *b, struct size_value *ta
 
 int to_size(
 
-  char              *val,   /* I */
+  const char        *val,   /* I */
   struct size_value *psize) /* O */
 
   {
diff --git a/src/lib/Libattr/attr_fn_size.h b/src/lib/Libattr/attr_fn_size.h
index 513c2a6f9c..c924be9d1a 100644
--- a/src/lib/Libattr/attr_fn_size.h
+++ b/src/lib/Libattr/attr_fn_size.h
@@ -4,7 +4,7 @@
 #include "list_link.h" /* tlist_head */
 #include "pbs_ifl.h" /* batch_op */
 
-int decode_size(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm);
+int decode_size(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm);
 
 int encode_size(pbs_attribute *attr, tlist_head *phead, const char *atname, const char *rsname, int mode, int perm);
 
diff --git a/src/lib/Libattr/attr_fn_str.c b/src/lib/Libattr/attr_fn_str.c
index 33ff394045..c7abb9b554 100644
--- a/src/lib/Libattr/attr_fn_str.c
+++ b/src/lib/Libattr/attr_fn_str.c
@@ -126,8 +126,8 @@ int decode_str(
 
   pbs_attribute *patr,   /* (I modified, allocated ) */
   const char  *name,   /* (I - optional) pbs_attribute name */
-  char          *rescn,  /* resource name - unused here */
-  char          *val,    /* pbs_attribute value */
+  const char *rescn,  /* resource name - unused here */
+  const char    *val,    /* pbs_attribute value */
   int            perm)   /* only used for resources */
 
   {
diff --git a/src/lib/Libattr/attr_fn_str.h b/src/lib/Libattr/attr_fn_str.h
index 306f348729..ffd633157a 100644
--- a/src/lib/Libattr/attr_fn_str.h
+++ b/src/lib/Libattr/attr_fn_str.h
@@ -4,7 +4,7 @@
 #include "list_link.h" /* tlist_head */
 #include "pbs_ifl.h" /* batch_op */
 
-int decode_str(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm);
+int decode_str(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm);
 
 int encode_str(pbs_attribute *attr, tlist_head *phead, const char *atname, const char *rsname, int mode, int perm);
 
diff --git a/src/lib/Libattr/attr_fn_time.c b/src/lib/Libattr/attr_fn_time.c
index d85492582f..e7daff0c20 100644
--- a/src/lib/Libattr/attr_fn_time.c
+++ b/src/lib/Libattr/attr_fn_time.c
@@ -126,8 +126,8 @@ int decode_time(
 
   pbs_attribute *patr,  /* I/O (modified) */
   const char   *name,  /* I - pbs_attribute name (not used) */
-  char          *rescn, /* I - resource name (not used) */
-  char          *val,   /* I - pbs_attribute value */
+  const char *rescn, /* I - resource name (not used) */
+  const char    *val,   /* I - pbs_attribute value */
   int            perm)  /* only used for resources */
 
   {
diff --git a/src/lib/Libattr/attr_fn_time.h b/src/lib/Libattr/attr_fn_time.h
index d6d4622a76..550923d6ce 100644
--- a/src/lib/Libattr/attr_fn_time.h
+++ b/src/lib/Libattr/attr_fn_time.h
@@ -3,7 +3,7 @@
 #include "attribute.h" /* pbs_attribute */
 #include "list_link.h" /* tlist_head */
 
-int decode_time(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm);
+int decode_time(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm);
 
 int encode_time(pbs_attribute *attr, tlist_head *phead, const char *atname, const char *rsname, int mode, int perm);
 
diff --git a/src/lib/Libattr/attr_fn_tokens.c b/src/lib/Libattr/attr_fn_tokens.c
index f813187c72..5ba27d6d27 100644
--- a/src/lib/Libattr/attr_fn_tokens.c
+++ b/src/lib/Libattr/attr_fn_tokens.c
@@ -22,8 +22,8 @@ int decode_tokens(
 
   pbs_attribute *patr,
   const char   *name,  /* pbs_attribute name */
-  char          *rescn, /* resource name, unused here */
-  char          *val,   /* pbs_attribute value */
+  const char *rescn, /* resource name, unused here */
+  const char    *val,   /* pbs_attribute value */
   int            perm)  /* only used for resources */
 
 
@@ -35,7 +35,7 @@ int decode_tokens(
   if (val != NULL)
     {
     ret = PBSE_BADATVAL; /* Assume bad until proven otherwise */
-    colon = strstr(val, ":");
+    colon = strstr((char *)val, ":");
 
     if (colon != NULL)
       {
diff --git a/src/lib/Libattr/attr_fn_tokens.h b/src/lib/Libattr/attr_fn_tokens.h
index c045917ab1..f52e540efd 100644
--- a/src/lib/Libattr/attr_fn_tokens.h
+++ b/src/lib/Libattr/attr_fn_tokens.h
@@ -2,5 +2,5 @@
 
 #include "attribute.h" /* pbs_attribute */
 
-int decode_tokens(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm);
+int decode_tokens(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm);
 
diff --git a/src/lib/Libattr/attr_fn_tv.c b/src/lib/Libattr/attr_fn_tv.c
index 2f3b07f5c6..21cc27c334 100644
--- a/src/lib/Libattr/attr_fn_tv.c
+++ b/src/lib/Libattr/attr_fn_tv.c
@@ -127,8 +127,8 @@ int decode_tv(
 
   pbs_attribute *patr,
   const char   *name,  /* pbs_attribute name */
-  char          *rescn, /* resource name*/
-  char          *val,   /* pbs_attribute value */
+  const char *rescn, /* resource name*/
+  const char    *val,   /* pbs_attribute value */
   int            perm)  /* only used for resources */
    
   {
diff --git a/src/lib/Libattr/attr_fn_tv.h b/src/lib/Libattr/attr_fn_tv.h
index a507165fdc..93790fcece 100644
--- a/src/lib/Libattr/attr_fn_tv.h
+++ b/src/lib/Libattr/attr_fn_tv.h
@@ -7,7 +7,7 @@
 
 int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y);
 
-int decode_tv(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm);
+int decode_tv(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm);
 
 int encode_tv(pbs_attribute *attr, tlist_head *phead, const char *atname, const char *rsname, int mode, int perm);
 
diff --git a/src/lib/Libattr/attr_fn_unkn.c b/src/lib/Libattr/attr_fn_unkn.c
index e7cb991ca4..b234299451 100644
--- a/src/lib/Libattr/attr_fn_unkn.c
+++ b/src/lib/Libattr/attr_fn_unkn.c
@@ -130,8 +130,8 @@ int decode_unkn(
 
   pbs_attribute *patr,  /* May be Modified on Return */
   const char   *name,
-  char          *rescn,
-  char          *value,
+  const char *rescn,
+  const char    *value,
   int            perm)  /* only used for resources */
 
   {
diff --git a/src/lib/Libattr/attr_fn_unkn.h b/src/lib/Libattr/attr_fn_unkn.h
index b296ae8eaf..0aa0a1267f 100644
--- a/src/lib/Libattr/attr_fn_unkn.h
+++ b/src/lib/Libattr/attr_fn_unkn.h
@@ -4,8 +4,6 @@
 #include "list_link.h" /* tlist_head */
 #include "pbs_ifl.h" /* batch_op */
 
-int decode_unkn(pbs_attribute *patr, const char *name, char *rescn, char *value, int perm);
-
 int encode_unkn(pbs_attribute *attr, tlist_head *phead, const char *atname, const char *rsname, int mode, int perm);
 
 int set_unkn(struct pbs_attribute *old, struct pbs_attribute *new, enum batch_op op);
diff --git a/src/lib/Libattr/attr_func.c b/src/lib/Libattr/attr_func.c
index 945e7dd062..7fc4b50634 100644
--- a/src/lib/Libattr/attr_func.c
+++ b/src/lib/Libattr/attr_func.c
@@ -179,7 +179,7 @@ static int str_nc_cmp(
 int find_attr(
 
   struct attribute_def *attr_def, /* ptr to pbs_attribute definitions */
-  char                 *name,     /* pbs_attribute name to find */
+  const char          *name,     /* pbs_attribute name to find */
   int                   limit)    /* limit on size of def array */
 
   {
diff --git a/src/lib/Libattr/attr_func.h b/src/lib/Libattr/attr_func.h
index 6a71e05e73..c92eaf8bf5 100644
--- a/src/lib/Libattr/attr_func.h
+++ b/src/lib/Libattr/attr_func.h
@@ -5,7 +5,7 @@
 
 void clear_attr(pbs_attribute *pattr, attribute_def *pdef); 
 
-int find_attr(struct attribute_def *attr_def, char *name, int limit); 
+int find_attr(struct attribute_def *attr_def, const char *name, int limit);
 
 long attr_ifelse_long(pbs_attribute *attr1, pbs_attribute *attr2, long deflong);
 
diff --git a/src/lib/Libattr/attr_node_func.c b/src/lib/Libattr/attr_node_func.c
index 6ab1818a57..cbd10f9361 100644
--- a/src/lib/Libattr/attr_node_func.c
+++ b/src/lib/Libattr/attr_node_func.c
@@ -554,8 +554,8 @@ int decode_state(
 
   pbs_attribute *pattr,   /* I (modified) */
   const char   *name,    /* pbs_attribute name */
-  char          *rescn,   /* resource name, unused here */
-  char          *val,     /* pbs_attribute value */
+  const char *rescn,   /* resource name, unused here */
+  const char    *val,     /* pbs_attribute value */
   int            perm)    /* only used for resources */
 
   {
@@ -664,8 +664,8 @@ int decode_ntype(
 
   pbs_attribute *pattr,
   const char   *name,   /* pbs_attribute name */
-  char          *rescn,  /* resource name, unused here */
-  char          *val,    /* pbs_attribute value */
+  const char *rescn,  /* resource name, unused here */
+  const char    *val,    /* pbs_attribute value */
   int            perm)   /* only used for resources */
 
 
diff --git a/src/lib/Libattr/attr_node_func.h b/src/lib/Libattr/attr_node_func.h
index 473e0e46aa..27f4407dae 100644
--- a/src/lib/Libattr/attr_node_func.h
+++ b/src/lib/Libattr/attr_node_func.h
@@ -14,9 +14,9 @@ int encode_ntype(pbs_attribute *pattr, tlist_head *ph, const char *aname, const
 
 int encode_jobs(pbs_attribute *pattr, tlist_head *ph, const char *aname, const char *rname, int mode, int perm);
 
-int decode_state(pbs_attribute *pattr, const char *name, char *rescn, char *val, int perm);
+int decode_state(pbs_attribute *pattr, const char *name, const char *rescn, const char *val, int perm);
 
-int decode_ntype(pbs_attribute *pattr, const char *name, char *rescn, char *val, int perm);
+int decode_ntype(pbs_attribute *pattr, const char *name, const char *rescn, const char *val, int perm);
 
 void free_prop_list(struct prop *prop);
 
diff --git a/src/lib/Libattr/test/attr_atomic/scaffolding.c b/src/lib/Libattr/test/attr_atomic/scaffolding.c
index 21b07ad48e..4013708c88 100644
--- a/src/lib/Libattr/test/attr_atomic/scaffolding.c
+++ b/src/lib/Libattr/test/attr_atomic/scaffolding.c
@@ -11,7 +11,7 @@ void clear_attr(pbs_attribute *pattr, attribute_def *pdef)
   exit(1);
   }
 
-int find_attr(struct attribute_def *attr_def, char *name, int limit)
+int find_attr(struct attribute_def *attr_def, const char *name, int limit)
   {
   fprintf(stderr, "The call to find_attr needs to be mocked!!\n");
   exit(1);
diff --git a/src/lib/Libattr/test/attr_fn_tokens/scaffolding.c b/src/lib/Libattr/test/attr_fn_tokens/scaffolding.c
index 8d584febcb..9570dcddc2 100644
--- a/src/lib/Libattr/test/attr_fn_tokens/scaffolding.c
+++ b/src/lib/Libattr/test/attr_fn_tokens/scaffolding.c
@@ -4,7 +4,7 @@
 
 #include "attribute.h" /* pbs_attribute */
 
-int decode_str(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_str(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   fprintf(stderr, "The call to decode_str needs to be mocked!!\n");
   exit(1);
diff --git a/src/lib/Libcmds/test/add_verify_resources/scaffolding.c b/src/lib/Libcmds/test/add_verify_resources/scaffolding.c
index 60c794848d..114f3d6142 100644
--- a/src/lib/Libcmds/test/add_verify_resources/scaffolding.c
+++ b/src/lib/Libcmds/test/add_verify_resources/scaffolding.c
@@ -11,7 +11,7 @@ void *memmgr_calloc(memmgr **mgr, int qty, int size)
   exit(1);
   }
 
-void hash_add_or_exit(memmgr **mm, job_data **head, char *name, char *value, int var_type)
+void hash_add_or_exit(memmgr **mm, job_data **head, const char *name, const char *value, int var_type)
   {
   fprintf(stderr, "The call to hash_add_or_exit needs to be mocked!!\n");
   exit(1);
diff --git a/src/lib/Libcsv/csv.c b/src/lib/Libcsv/csv.c
index 15729198f4..e368e6364a 100644
--- a/src/lib/Libcsv/csv.c
+++ b/src/lib/Libcsv/csv.c
@@ -16,10 +16,10 @@
  * @param csv_str  The string list.
  * @return The number of items in the list.
  */
-int csv_length(char *csv_str)
+int csv_length(const char *csv_str)
   {
   int  length = 0;
-  char *cp;
+  const char *cp;
 
   if (!csv_str || *csv_str == 0)
     return(0);
@@ -47,10 +47,10 @@ int csv_length(char *csv_str)
  *     otherwise, a pointer to a local buffer containing the nth item.
  */
 #define NBUFFERS        32
-char *csv_nth(char *csv_str, int n)
+char *csv_nth(const char *csv_str, int n)
   {
   int  i;
-  char *cp;
+  const char *cp;
   char *tp;
   static char buffer[NBUFFERS][128];
   static  int     buffer_index;
@@ -77,7 +77,7 @@ char *csv_nth(char *csv_str, int n)
 
   memset(buffer[buffer_index], 0, sizeof(buffer[buffer_index]));
 
-  if ((tp = strchr(cp, ',')))
+  if ((tp = strchr((char *)cp, ',')))
     {
     if ((tp - cp) > 128)
       return 0;
@@ -100,7 +100,7 @@ char *csv_nth(char *csv_str, int n)
  * Search a csv list for an entry that matches a specified search string.
  */
 char *
-csv_find_string(char *csv_str, const char *search_str)
+csv_find_string(const char *csv_str, const char *search_str)
   {
   int  i;
   int  nitems;
@@ -144,7 +144,7 @@ csv_find_string(char *csv_str, const char *search_str)
  * pointer to the start of the value string.
  */
 char *
-csv_find_value(char *csv_str, const char *search_str)
+csv_find_value(const char *csv_str, const char *search_str)
   {
   char *cp;
   char *vp;
diff --git a/src/lib/Libcsv/csv.h b/src/lib/Libcsv/csv.h
index deb2a134f0..fea8e958fc 100644
--- a/src/lib/Libcsv/csv.h
+++ b/src/lib/Libcsv/csv.h
@@ -1,9 +1,9 @@
 #include "license_pbs.h" /* See here for the software license */
 
-int csv_length(char *csv_str);
+int csv_length(const char *csv_str);
 
-char *csv_nth(char *csv_str, int n);
+char *csv_nth(const char *csv_str, int n);
 
-char * csv_find_string(char *csv_str, const char *search_str);
+char * csv_find_string(const char *csv_str, const char *search_str);
 
-char * csv_find_value(char *csv_str, const char *search_str);
+char * csv_find_value(const char *csv_str, const char *search_str);
diff --git a/src/lib/Libifl/PBSD_submit_caps.c b/src/lib/Libifl/PBSD_submit_caps.c
index c66cc338e9..86c4695fc0 100644
--- a/src/lib/Libifl/PBSD_submit_caps.c
+++ b/src/lib/Libifl/PBSD_submit_caps.c
@@ -87,6 +87,7 @@
 #include "dis.h"
 #include "u_hash_map_structs.h"
 #include "u_memmgr.h"
+#include "../lib/Libifl/lib_ifl.h"
 
 /* PBSD_submit.c
 
@@ -382,12 +383,12 @@ int PBSD_jscript(
 
   i = 0;
 
-  cc = read(fd, s_buf, SCRIPT_CHUNK_Z);
+  cc = read_ac_socket(fd, s_buf, SCRIPT_CHUNK_Z);
 
   while ((cc > 0) && (PBSD_scbuf(c, PBS_BATCH_jobscript, i, s_buf, cc, jobid, JScript) == 0))
     {
     i++;
-    cc = read(fd, s_buf, SCRIPT_CHUNK_Z);
+    cc = read_ac_socket(fd, s_buf, SCRIPT_CHUNK_Z);
     }
 
   close(fd);
@@ -441,14 +442,14 @@ int PBSD_jobfile(
 
   i = 0;
 
-  cc = read(fd, s_buf, SCRIPT_CHUNK_Z);
+  cc = read_ac_socket(fd, s_buf, SCRIPT_CHUNK_Z);
 
   while ((cc > 0) &&
          (PBSD_scbuf(c, req_type, i, s_buf, cc, jobid, which) == 0))
     {
     i++;
 
-    cc = read(fd, s_buf, SCRIPT_CHUNK_Z);
+    cc = read_ac_socket(fd, s_buf, SCRIPT_CHUNK_Z);
     }
 
   close(fd);
diff --git a/src/lib/Libifl/lib_ifl.h b/src/lib/Libifl/lib_ifl.h
index 2d1a413291..0cb2c132d5 100644
--- a/src/lib/Libifl/lib_ifl.h
+++ b/src/lib/Libifl/lib_ifl.h
@@ -232,6 +232,9 @@ void free_pidlist(struct pidl *pl);
 /* nonblock.c */
 /* ssize_t write_nonblocking_socket(int fd, const void *buf, ssize_t count);  */
 /* ssize_t read_nonblocking_socket(int fd, void *buf, ssize_t count); */
+extern ssize_t write_ac_socket(int, const void *, ssize_t);
+extern ssize_t read_ac_socket(int, void *, ssize_t);
+
 ssize_t read_blocking_socket(int fd, void *buf, ssize_t count);
 
 /* pbsD_alterjo.c */
@@ -427,7 +430,7 @@ int rpp_get_stream_state(int index);
 /* tcp_dis.c */
 void DIS_tcp_settimeout(long timeout); 
 /* static void tcp_pack_buff(struct tcpdisbuf *tp); */
-int tcp_read(struct tcp_chan *chan, long *read_len, long *avail_len); 
+int tcp_read(struct tcp_chan *chan, long long *read_len, long long *avail_len);
 int DIS_tcp_wflush(struct tcp_chan *chan); 
 /* static void DIS_tcp_clear(struct tcpdisbuf *tp); */
 void DIS_tcp_reset(struct tcp_chan *chan, int i);
diff --git a/src/lib/Libifl/nonblock.c b/src/lib/Libifl/nonblock.c
index 12f349e31c..2f75bdd4ec 100644
--- a/src/lib/Libifl/nonblock.c
+++ b/src/lib/Libifl/nonblock.c
@@ -3,6 +3,10 @@
  * Headers redefine read/write to name these instead, before inclusion
  * of stdio.h, so system declaration is used.
  */
+
+#define NEED_BLOCKING_CONNECTIONS
+#include <pbs_config.h>   /* the master config generated by configure */
+
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -13,7 +17,7 @@
  * this would have had to be handled by the main pbs code anyway.
  */
 
-ssize_t write_nonblocking_socket(
+ssize_t write_ac_socket(
 
   int         fd,    /* I */
   const void *buf,   /* I */
@@ -63,8 +67,7 @@ ssize_t write_nonblocking_socket(
 
 
 
-
-ssize_t read_nonblocking_socket(
+ssize_t read_ac_socket(
 
   int     fd,
   void   *buf,
diff --git a/src/lib/Libifl/pbsD_connect.c b/src/lib/Libifl/pbsD_connect.c
index bbac7ecdd7..a552f42fac 100644
--- a/src/lib/Libifl/pbsD_connect.c
+++ b/src/lib/Libifl/pbsD_connect.c
@@ -417,7 +417,7 @@ int PBSD_munge_authenticate(
 
   fd = fileno(munge_pipe);
 
-  while ((bytes_read = read(fd, ptr, MUNGE_SIZE - total_bytes_read)) > 0)
+  while ((bytes_read = read_ac_socket(fd, ptr, MUNGE_SIZE - total_bytes_read)) > 0)
     {
     total_bytes_read += bytes_read;
     ptr += bytes_read;
@@ -1405,7 +1405,7 @@ int pbs_disconnect_socket(
       /* wait for server to close connection */
       /* NOTE:  if read of 'sock' is blocking, request below may hang forever
          -- hence the signal handler above */
-      if (read(sock, &tmp_buf, sizeof(tmp_buf)) < 1)
+      if (read_ac_socket(sock, &tmp_buf, sizeof(tmp_buf)) < 1)
         break;
       }
 
diff --git a/src/lib/Libifl/tcp_dis.c b/src/lib/Libifl/tcp_dis.c
index 5a240308f7..54480e7aab 100644
--- a/src/lib/Libifl/tcp_dis.c
+++ b/src/lib/Libifl/tcp_dis.c
@@ -88,6 +88,8 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <fcntl.h>
+#include "../lib/Libifl/lib_ifl.h" /* DIS_tcp_setup, DIS_tcp_cleanup */
+
 
 #if defined(FD_SET_IN_SYS_SELECT_H)
 #  include <sys/select.h>
@@ -325,7 +327,7 @@ int DIS_tcp_wflush(
   if (rc != PBSE_NONE)
     return(-1);
  
-  while ((i = write(chan->sock, pb, ct)) != (ssize_t)ct)
+  while ((i = write_ac_socket(chan->sock, pb, ct)) != (ssize_t)ct)
     {
     if (i == -1)
       {
diff --git a/src/lib/Libifl/test/PBSD_submit_caps/scaffolding.c b/src/lib/Libifl/test/PBSD_submit_caps/scaffolding.c
index eb543c6593..264f57cd7a 100644
--- a/src/lib/Libifl/test/PBSD_submit_caps/scaffolding.c
+++ b/src/lib/Libifl/test/PBSD_submit_caps/scaffolding.c
@@ -88,3 +88,8 @@ int encode_DIS_ReqHdr(struct tcp_chan *chan, int reqt, char *user)
 void DIS_tcp_cleanup(struct tcp_chan *chan)
   {
   }
+
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
+  {
+  return(0);
+  }
diff --git a/src/lib/Libifl/test/dec_CpyFil/scaffolding.c b/src/lib/Libifl/test/dec_CpyFil/scaffolding.c
index c2cc4e3f4a..9961f8a209 100644
--- a/src/lib/Libifl/test/dec_CpyFil/scaffolding.c
+++ b/src/lib/Libifl/test/dec_CpyFil/scaffolding.c
@@ -22,7 +22,7 @@ char *disrst(int stream, int *retval)
   exit(1);
   }
 
-void append_link(tlist_head *head, list_link *new, void *pobj)
+void append_link(tlist_head *head, list_link *newLink, void *pobj)
   {
   fprintf(stderr, "The call to append_link needs to be mocked!!\n");
   exit(1);
diff --git a/src/lib/Libifl/test/dec_rpys/scaffolding.c b/src/lib/Libifl/test/dec_rpys/scaffolding.c
index 0e4c9e7d2a..03c0f7d3de 100644
--- a/src/lib/Libifl/test/dec_rpys/scaffolding.c
+++ b/src/lib/Libifl/test/dec_rpys/scaffolding.c
@@ -29,7 +29,7 @@ char *disrcs(int stream, size_t *nchars, int *retval)
   exit(1);
   }
 
-void append_link(tlist_head *head, list_link *new, void *pobj)
+void append_link(tlist_head *head, list_link *newLink, void *pobj)
   {
   fprintf(stderr, "The call to append_link needs to be mocked!!\n");
   exit(1);
diff --git a/src/lib/Libifl/test/dec_svrattrl/scaffolding.c b/src/lib/Libifl/test/dec_svrattrl/scaffolding.c
index 46505e0f79..d7abb9c1d7 100644
--- a/src/lib/Libifl/test/dec_svrattrl/scaffolding.c
+++ b/src/lib/Libifl/test/dec_svrattrl/scaffolding.c
@@ -16,7 +16,7 @@ int disrfcs(int stream, size_t *nchars, size_t achars, char *value)
   exit(1);
   }
 
-void append_link(tlist_head *head, list_link *new, void *pobj)
+void append_link(tlist_head *head, list_link *newLink, void *pobj)
   {
   fprintf(stderr, "The call to append_link needs to be mocked!!\n");
   exit(1);
diff --git a/src/lib/Libifl/test/enc_attropl_hash/scaffolding.c b/src/lib/Libifl/test/enc_attropl_hash/scaffolding.c
index a163c5eb6b..c9a4762357 100644
--- a/src/lib/Libifl/test/enc_attropl_hash/scaffolding.c
+++ b/src/lib/Libifl/test/enc_attropl_hash/scaffolding.c
@@ -29,7 +29,7 @@ int hash_count(job_data *head)
  exit(1);
  }
 
-int hash_del_item(memmgr **mm, job_data **head, char *name)
+int hash_del_item(memmgr **mm, job_data **head, const char *name)
  {
  fprintf(stderr, "The call to hash_del_item needs to be mocked!!\n");
  exit(1);
diff --git a/src/lib/Libifl/test/pbsD_connect/scaffolding.c b/src/lib/Libifl/test/pbsD_connect/scaffolding.c
index 0dc011a6a2..0eed5d2f57 100644
--- a/src/lib/Libifl/test/pbsD_connect/scaffolding.c
+++ b/src/lib/Libifl/test/pbsD_connect/scaffolding.c
@@ -28,13 +28,13 @@ int socket_get_tcp()
   exit(1);
   }
 
-int csv_length(char *csv_str)
+int csv_length(const char *csv_str)
   {
   fprintf(stderr, "The call to csv_length needs to be mocked!!\n");
   exit(1);
   }
 
-char *csv_nth(char *csv_str, int n)
+char *csv_nth(const char *csv_str, int n)
   {
   fprintf(stderr, "The call to csv_nth needs to be mocked!!\n");
   exit(1);
@@ -114,3 +114,8 @@ int socket_close(int sock)
   {
   return(0);
   }
+
+size_t read_ac_socket(int fd, void *buf, ssize_t count)
+  {
+  return(0);
+  }
diff --git a/src/lib/Libifl/test/tcp_dis/scaffolding.c b/src/lib/Libifl/test/tcp_dis/scaffolding.c
index d0d294feea..c44854b98d 100644
--- a/src/lib/Libifl/test/tcp_dis/scaffolding.c
+++ b/src/lib/Libifl/test/tcp_dis/scaffolding.c
@@ -39,4 +39,12 @@ int socket_read(int socket, char **the_str, long long *str_len)
   return(1);
   }
 
+ssize_t write_ac_socket(int fd, const void *buf, ssize_t count)
+  {
+  return(0);
+  }
 
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
+  {
+  return(0);
+  }
diff --git a/src/lib/Libnet/net_common.c b/src/lib/Libnet/net_common.c
index e0f4a07953..ce46a08967 100644
--- a/src/lib/Libnet/net_common.c
+++ b/src/lib/Libnet/net_common.c
@@ -1,3 +1,6 @@
+#define NEED_BLOCKING_CONNECTIONS
+#include <pbs_config.h>   /* the master config generated by configure */
+
 #include "license_pbs.h" /* See here for the software license */
 #include "lib_net.h"
 
@@ -23,6 +26,9 @@
 
 #include "pbs_error.h" /* torque error codes */
 
+#include "../lib/Libifl/lib_ifl.h"
+
+
 extern time_t pbs_tcp_timeout; /* located in tcp_dis.c. Move here later */
 
 #define RES_PORT_START 144
@@ -502,7 +508,7 @@ void socket_read_flush(
     {
     if (avail_bytes > 256)
       avail_bytes = 256; 
-    i = read(socket, incoming, avail_bytes);
+    i = read_ac_socket(socket, incoming, avail_bytes);
     if (i < 0)
       break;
     }
@@ -552,7 +558,7 @@ int socket_read_force(
   char log_buf[LOCAL_LOG_BUF_SIZE+1];
   while (bytes_read != 0)
     {
-    bytes_read = read(socket, read_loc, tmp_len);
+    bytes_read = read_ac_socket(socket, read_loc, tmp_len);
     if ((bytes_read == -1) && (errno != EINTR))
       {
       if (getenv("PBSDEBUG") != NULL)
@@ -658,7 +664,7 @@ int socket_read_one_byte(
     rc = socket_wait_for_read(socket);
   if (rc == PBSE_NONE)
     {
-    if (read(socket, one_char, 1) != 1)
+    if (read_ac_socket(socket, one_char, 1) != 1)
       rc = PBSE_SOCKET_READ;
     else
       rc = PBSE_NONE;
@@ -697,7 +703,7 @@ int socket_read_num(
         break;
         }
       }
-    else if (read(socket, &tmp_char, 1) == -1)
+    else if (read_ac_socket(socket, &tmp_char, 1) == -1)
       break;
     else if (pos >= (int)sizeof(str_ll) - 1)
       break;
@@ -768,7 +774,7 @@ int socket_read_str(
     {
     rc = PBSE_INTERNAL;
     }
-  else if (read(socket, &delin, 1) != 1)
+  else if (read_ac_socket(socket, &delin, 1) != 1)
     {
     rc = PBSE_INTERNAL;
     }
diff --git a/src/lib/Libnet/port_forwarding.c b/src/lib/Libnet/port_forwarding.c
index a4947d51ed..229e3ae672 100644
--- a/src/lib/Libnet/port_forwarding.c
+++ b/src/lib/Libnet/port_forwarding.c
@@ -16,6 +16,8 @@
 #include <termios.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include "../lib/Libifl/lib_ifl.h"
+
 
 #include "port_forwarding.h"
 
@@ -142,7 +144,7 @@ void port_forwarder(
           {
           /* non-listening socket to be read */
 
-          rc = read(
+          rc = read_ac_socket(
                  (socks + n)->sock,
                  (socks + n)->buff + (socks + n)->bufavail,
                  BUF_SIZE - (socks + n)->bufavail);
@@ -170,7 +172,7 @@ void port_forwarder(
         {
         int peer = (socks + n)->peer;
 
-        rc = write(
+        rc = write_ac_socket(
                (socks + n)->sock,
                (socks + peer)->buff + (socks + peer)->bufwritten,
                (socks + peer)->bufavail - (socks + peer)->bufwritten);
diff --git a/src/lib/Libnet/test/net_common/scaffolding.c b/src/lib/Libnet/test/net_common/scaffolding.c
index 941e5a5883..1ac7563a7e 100644
--- a/src/lib/Libnet/test/net_common/scaffolding.c
+++ b/src/lib/Libnet/test/net_common/scaffolding.c
@@ -36,3 +36,9 @@ time_t pbs_tcp_timeout;
 void log_record(int eventtype, int eventclass, const char *caller, const char *msg)
   {
   }
+
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count) 
+  {
+  return(0);
+  }
+
diff --git a/src/lib/Libnet/test/net_server/scaffolding.c b/src/lib/Libnet/test/net_server/scaffolding.c
index 707e460e3a..b667331055 100644
--- a/src/lib/Libnet/test/net_server/scaffolding.c
+++ b/src/lib/Libnet/test/net_server/scaffolding.c
@@ -5,7 +5,7 @@
 
 #include "net_connect.h"
 
-char *msg_daemonname = "unset";
+const char *msg_daemonname = "unset";
 
 void disiui_() {}
 
diff --git a/src/lib/Libnet/test/port_forwarding/scaffolding.c b/src/lib/Libnet/test/port_forwarding/scaffolding.c
index 23ff6ced99..4ecc2b210e 100644
--- a/src/lib/Libnet/test/port_forwarding/scaffolding.c
+++ b/src/lib/Libnet/test/port_forwarding/scaffolding.c
@@ -3,13 +3,13 @@
 #include <stdio.h>
 
 
-ssize_t write_nonblocking_socket( int fd,  const void *buf,  ssize_t count)
+ssize_t write_ac_socket( int fd,  const void *buf,  ssize_t count)
   {
   fprintf(stderr, "The call to write_nonblocking_socket needs to be mocked!!\n");
   exit(1);
   }
 
-ssize_t read_nonblocking_socket(int fd, void *buf, ssize_t count)
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
   {
   fprintf(stderr, "The call to read_nonblocking_socket needs to be mocked!!\n");
   exit(1);
diff --git a/src/lib/Libnet/test/server_core/scaffolding.c b/src/lib/Libnet/test/server_core/scaffolding.c
index 45f38d9e27..61217e2d70 100644
--- a/src/lib/Libnet/test/server_core/scaffolding.c
+++ b/src/lib/Libnet/test/server_core/scaffolding.c
@@ -6,7 +6,7 @@
 #include "net_connect.h"
 #include "log.h"
 
-char *msg_daemonname = "unset";
+const char *msg_daemonname = "unset";
 
 void log_get_set_eventclass(int *objclass, SGetter action) {}
 
diff --git a/src/lib/Libsite/site_check_u.c b/src/lib/Libsite/site_check_u.c
index 62778a9bb5..666e0126ee 100644
--- a/src/lib/Libsite/site_check_u.c
+++ b/src/lib/Libsite/site_check_u.c
@@ -114,7 +114,7 @@ extern char  server_host[];
 extern char *msg_orighost; /* error message: no PBS_O_HOST */
 
 /* This is in the server code? */
-extern struct pbsnode *find_nodebyname(char *);
+extern struct pbsnode *find_nodebyname(const char *);
 
 /*
  * site_check_u - site_check_user_map()
diff --git a/src/lib/Libsite/test/site_check_u/scaffolding.c b/src/lib/Libsite/test/site_check_u/scaffolding.c
index 9239e195c2..30c97db12a 100644
--- a/src/lib/Libsite/test/site_check_u/scaffolding.c
+++ b/src/lib/Libsite/test/site_check_u/scaffolding.c
@@ -9,8 +9,8 @@
 char *server_host;
 struct server server;
 
-char *pbs_o_host = "PBS_O_HOST";
-char *msg_orighost = "Job missing PBS_O_HOST value";
+const char *pbs_o_host = "PBS_O_HOST";
+const char *msg_orighost = "Job missing PBS_O_HOST value";
 
 char *get_variable(job *pjob, char *variable) 
   { 
@@ -19,7 +19,7 @@ char *get_variable(job *pjob, char *variable)
   }
 
 
-struct pbsnode *find_nodebyname( char *nodename) 
+struct pbsnode *find_nodebyname(const char *nodename)
   { 
   fprintf(stderr, "The call to find_nodebyname needs to be mocked!!\n");
   exit(1);
diff --git a/src/lib/Libutils/lib_utils.h b/src/lib/Libutils/lib_utils.h
index 9c2707cffd..79cadef4e8 100644
--- a/src/lib/Libutils/lib_utils.h
+++ b/src/lib/Libutils/lib_utils.h
@@ -17,7 +17,7 @@ int MXMLExtractE(mxml_t *E, mxml_t *C, mxml_t **CP);
 
 int MXMLSetChild(mxml_t *E, char *CName, mxml_t **CE);
 
-int MXMLCreateE(mxml_t **E, char *Name);
+int MXMLCreateE(mxml_t **E, const char *Name);
  
 int MXMLDestroyE(mxml_t **EP);
  
diff --git a/src/lib/Libutils/test/u_hash_map_structs/u_hash_map_structs_ct.c b/src/lib/Libutils/test/u_hash_map_structs/u_hash_map_structs_ct.c
index 6c21047e17..5509cd54ad 100644
--- a/src/lib/Libutils/test/u_hash_map_structs/u_hash_map_structs_ct.c
+++ b/src/lib/Libutils/test/u_hash_map_structs/u_hash_map_structs_ct.c
@@ -14,7 +14,7 @@ void initVars()
   calloc_fail = 0;
   }
 
-void callocVal(char **dest, char *src)
+void callocVal(char **dest, const char *src)
   {
   *dest = (char *)calloc(1, strlen(src)+1);
   if (!dest)
@@ -145,8 +145,8 @@ START_TEST(test_add_or_exit)
   {
   job_data *the_map = NULL;
   memmgr *mm = NULL;
-  char *name = "simple_val";
-  char value[] = "should fail";
+  const char *name = "simple_val";
+  const char *value = "should fail";
   int var_type = 4;
   initVars();
   calloc_fail = 1;
@@ -218,7 +218,7 @@ void rundebug()
   {
   job_data *the_map = NULL;
   memmgr *mm = NULL;
-  char *name = "simple_val";
+  const char *name = "simple_val";
   char value[] = "should fail";
   int var_type = 4;
   memmgr_init(&mm, 0);
diff --git a/src/lib/Libutils/test/u_mom_hierarchy/scaffolding.c b/src/lib/Libutils/test/u_mom_hierarchy/scaffolding.c
index ae8babb1c8..f46cb7b453 100644
--- a/src/lib/Libutils/test/u_mom_hierarchy/scaffolding.c
+++ b/src/lib/Libutils/test/u_mom_hierarchy/scaffolding.c
@@ -12,7 +12,7 @@ int pbs_errno;
 time_t time_now;
 int   LOGLEVEL=0;
 char log_buffer[LOG_BUF_SIZE];
-char *dis_emsg[] = 
+const char *dis_emsg[] =
   {
   "No error",
   "Input value too large to convert to this type",
diff --git a/src/lib/Libutils/test/u_mu/scaffolding.c b/src/lib/Libutils/test/u_mu/scaffolding.c
index f9f6546081..d72d3162d3 100644
--- a/src/lib/Libutils/test/u_mu/scaffolding.c
+++ b/src/lib/Libutils/test/u_mu/scaffolding.c
@@ -8,3 +8,7 @@ void log_err(int errnum, const char *routine, const char *text)
   exit(1);
   }
 
+ssize_t write_ac_socket(int fd, const void *buf, ssize_t count)
+  {
+  return(0);
+  }
diff --git a/src/lib/Libutils/u_MXML.c b/src/lib/Libutils/u_MXML.c
index 05c83fbbc1..7c2aa80d8d 100644
--- a/src/lib/Libutils/u_MXML.c
+++ b/src/lib/Libutils/u_MXML.c
@@ -109,7 +109,7 @@ int MXMLSetChild(
 int MXMLCreateE(
 
   mxml_t **E,    /* O */
-  char    *Name) /* I (optional) */
+  const char  *Name) /* I (optional) */
 
   {
   /* NOTE:  should 'Name' be mandatory? */
diff --git a/src/lib/Libutils/u_constants.c b/src/lib/Libutils/u_constants.c
index b0aeb7c4b9..31ae7c554b 100644
--- a/src/lib/Libutils/u_constants.c
+++ b/src/lib/Libutils/u_constants.c
@@ -77,6 +77,7 @@
 * without reference to its choice of law rules.
 */
 
+#include "alps_constants.h"
 
 
 const int   apbasil_fail_transient = -10;
@@ -112,7 +113,7 @@ const char *text_name              = "text";
 const char *memory_mb              = "memory_mb";
 const char *family                 = "family";
 const char *cproc_eq               = "CPROC=";
-const int   cproc_eq_len           = 6;
+const int   ac_cproc_eq_len           = 6;
 const char *CRAY_GPU_STATUS_START  = "<cray_gpu_status>";
 const char *CRAY_GPU_STATUS_END    = "</cray_gpu_status>";
 const char *alps_reporter_feature  = "alps_reporter";
diff --git a/src/lib/Libutils/u_hash_map_structs.c b/src/lib/Libutils/u_hash_map_structs.c
index ecc3a67ac4..8d9d49a38a 100644
--- a/src/lib/Libutils/u_hash_map_structs.c
+++ b/src/lib/Libutils/u_hash_map_structs.c
@@ -101,8 +101,8 @@ int hash_add_item(
 
   memmgr   **mm,                /* M - memory manager */
   job_data **head,            /* M - hashmap */
-  char      *name,                 /* key for the item */
-  char      *value,                /* value for the item */
+  const char      *name,                 /* key for the item */
+  const char      *value,                /* value for the item */
   int        var_type,               /* type of variable */
   int        op_type)                /* operation of variable */
 
@@ -179,8 +179,8 @@ void hash_add_or_exit(
 
   memmgr   **mm,              /* M - memory manager */
   job_data **head,          /* M - hashmap */
-  char      *name,               /* I - The item being added to the hashmap */
-  char      *val,                /* I - Sets the value of variable */
+  const char      *name,               /* I - The item being added to the hashmap */
+  const char      *val,                /* I - Sets the value of variable */
   int        var_type)             /* I - Sets the type of the variable */
   {
   if (hash_add_item(mm, head, name, val, var_type, SET) == FALSE)
@@ -196,7 +196,7 @@ void hash_add_or_exit(
 int hash_del_item(
     memmgr **mm,              /* M - memory manager */
     job_data **head,          /* M - hashmap */
-    char *name)               /* I - entry to delete */
+    const char *name)               /* I - entry to delete */
   {
   int rc = FALSE;
   char *tmp_name = NULL;
@@ -248,9 +248,9 @@ int hash_clear(
  */
 int hash_find(
     
-  job_data  *head,           /* I - hashmap */
-  char      *name,               /* I - name to find */
-  job_data **env_var)       /* O - return value when found */
+  job_data     *head,           /* I - hashmap */
+  const char  *name,               /* I - name to find */
+  job_data     **env_var)       /* O - return value when found */
 
   {
   int rc = TRUE;
diff --git a/src/lib/Libutils/u_mu.c b/src/lib/Libutils/u_mu.c
index 71c698d5be..e659f16821 100644
--- a/src/lib/Libutils/u_mu.c
+++ b/src/lib/Libutils/u_mu.c
@@ -1,4 +1,4 @@
-
+#include <pbs_config.h>   /* the master config generated by configure */
 
 #include <unistd.h>
 #include <sys/types.h>
@@ -6,6 +6,7 @@
 
 #include "utils.h"
 #include "../Liblog/pbs_log.h"
+#include "../Libifl/lib_ifl.h"
 
 
 
@@ -341,7 +342,7 @@ int write_buffer(
   {
   int   written;
 
-  while ((written = write(fds,buf,len)) != len)
+  while ((written = write_ac_socket(fds,buf,len)) != len)
     {
     if ((errno == EINTR) &&
         (written == -1))
diff --git a/src/momctl/momctl.c b/src/momctl/momctl.c
index 0c2eea20a9..c135928f23 100644
--- a/src/momctl/momctl.c
+++ b/src/momctl/momctl.c
@@ -31,9 +31,9 @@ extern char *optarg;
 
 #define MAX_QUERY  128
 
-char *LocalHost = "localhost";
+const char *LocalHost = "localhost";
 
-char *DiagPtr  = "diag";
+const char *DiagPtr  = "diag";
 
 char *Query[MAX_QUERY];
 int   QueryI   = 0;
@@ -63,7 +63,7 @@ enum MOMCmdEnum CmdIndex = momNONE;
 
 /* prototypes */
 
-void MCShowUsage(char *);
+void MCShowUsage(const char *);
 int do_mom(char *, int, int);
 
 /* END prototypes */
@@ -136,7 +136,7 @@ int main(
 
         CmdIndex = momQuery;
 
-        if ((Query[QueryI] = calloc(strlen(DiagPtr) + 3, sizeof(char))) == NULL)
+        if ((Query[QueryI] = (char *)calloc(strlen(DiagPtr) + 3, sizeof(char))) == NULL)
       	  {
           fprintf(stderr,"ERROR:    could not calloc %d bytes!\n",
             (int)strlen(DiagPtr) + 3);
@@ -894,7 +894,7 @@ int do_mom(
 
 void MCShowUsage(
 
-  char *Msg)  /* I (optional) */
+  const char *Msg)  /* I (optional) */
 
   {
   if (Msg != NULL)
diff --git a/src/pam/pam_pbssimpleauth.c b/src/pam/pam_pbssimpleauth.c
index 92a0413a5d..b9de21b33a 100644
--- a/src/pam/pam_pbssimpleauth.c
+++ b/src/pam/pam_pbssimpleauth.c
@@ -159,7 +159,7 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc,
         continue;
         }
 
-      amt = read(fp, &xjob.ji_qs, sizeof(xjob.ji_qs));
+      amt = read_ac_socket(fp, &xjob.ji_qs, sizeof(xjob.ji_qs));
 
       if (amt != sizeof(xjob.ji_qs))
         {
diff --git a/src/resmom/aix4/mom_mach.c b/src/resmom/aix4/mom_mach.c
index 30a1f6194a..6597d9beff 100644
--- a/src/resmom/aix4/mom_mach.c
+++ b/src/resmom/aix4/mom_mach.c
@@ -1709,7 +1709,7 @@ kvm_read(int fd, long addr, char *buf, int size)
   if (lseek(fd, addr, SEEK_SET) != addr)
     return -1;
 
-  if ((ret = read(fd, buf, size)) == -1)
+  if ((ret = read_ac_socket(fd, buf, size)) == -1)
     return -1;
 
   return ret;
diff --git a/src/resmom/aix5/mom_mach.c b/src/resmom/aix5/mom_mach.c
index 87ec66cc91..ce0ba56cba 100644
--- a/src/resmom/aix5/mom_mach.c
+++ b/src/resmom/aix5/mom_mach.c
@@ -1679,7 +1679,7 @@ kvm_read(int fd, long addr, char *buf, int size)
   if (lseek(fd, addr, SEEK_SET) != addr)
     return -1;
 
-  if ((ret = read(fd, buf, size)) == -1)
+  if ((ret = read_ac_socket(fd, buf, size)) == -1)
     return -1;
 
   return ret;
diff --git a/src/resmom/alps_reservations.c b/src/resmom/alps_reservations.c
index 00f2eab9fd..c2bce095b7 100644
--- a/src/resmom/alps_reservations.c
+++ b/src/resmom/alps_reservations.c
@@ -77,9 +77,6 @@
 * without reference to its choice of law rules.
 */
 
-
-
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -91,6 +88,7 @@
 #include "resizable_array.h"
 #include "dynamic_string.h"
 #include "utils.h"
+#include "../lib/Libifl/lib_ifl.h"
 
 
 extern char mom_alias[];
@@ -621,7 +619,7 @@ int confirm_reservation(
   ptr = output;
   memset(output, 0, sizeof(output));
 
-  while ((bytes_read = read(fd, ptr, sizeof(output) - total_bytes_read - 1)) > 0)
+  while ((bytes_read = read_ac_socket(fd, ptr, sizeof(output) - total_bytes_read - 1)) > 0)
     {
     total_bytes_read += bytes_read;
     ptr += bytes_read;
diff --git a/src/resmom/fujitsu/mom_mach.c b/src/resmom/fujitsu/mom_mach.c
index 350f83ee43..36ec2a1a01 100644
--- a/src/resmom/fujitsu/mom_mach.c
+++ b/src/resmom/fujitsu/mom_mach.c
@@ -1925,7 +1925,7 @@ get_la(double *rv)
     return (rm_errno = RM_ERR_SYSTEM);
     }
 
-  if (read(kd, (char *)&load, sizeof(load)) != sizeof(load))
+  if (read_ac_socket(kd, (char *)&load, sizeof(load)) != sizeof(load))
     {
     log_err(errno, id, "read");
     return (rm_errno = RM_ERR_SYSTEM);
@@ -1967,7 +1967,7 @@ getanon(char *id)
     return NULL;
     }
 
-  if (read(kd, (char *)&ai, sizeof(struct anoninfo)) !=
+  if (read_ac_socket(kd, (char *)&ai, sizeof(struct anoninfo)) !=
       sizeof(struct anoninfo))
     {
     log_err(errno, id, "read");
@@ -2055,7 +2055,7 @@ physmem(struct rm_attribute *attrib)
     return NULL;
     }
 
-  if (read(kd, (char *)&pmem, sizeof(pmem)) != sizeof(pmem))
+  if (read_ac_socket(kd, (char *)&pmem, sizeof(pmem)) != sizeof(pmem))
     {
     log_err(errno, id, "read");
     rm_errno = RM_ERR_SYSTEM;
diff --git a/src/resmom/generate_alps_status.c b/src/resmom/generate_alps_status.c
index af854a14bb..a6c6cab7c3 100644
--- a/src/resmom/generate_alps_status.c
+++ b/src/resmom/generate_alps_status.c
@@ -77,8 +77,6 @@
 * without reference to its choice of law rules.
 */
 
-
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -89,6 +87,7 @@
 #include "utils.h"
 #include "alps_constants.h"
 
+#include "../lib/Libifl/lib_ifl.h"
 
 
 /*
diff --git a/src/resmom/irix5/mom_mach.c b/src/resmom/irix5/mom_mach.c
index 51a440a9fd..1e4a54a62d 100644
--- a/src/resmom/irix5/mom_mach.c
+++ b/src/resmom/irix5/mom_mach.c
@@ -2066,7 +2066,7 @@ physmem(struct rm_attribute *attrib)
     return NULL;
     }
 
-  if (read(kfd, (char *)&pmem, sizeof(pmem)) != sizeof(pmem))
+  if (read_ac_socket(kfd, (char *)&pmem, sizeof(pmem)) != sizeof(pmem))
     {
     log_err(errno, id, "read");
     rm_errno = RM_ERR_SYSTEM;
@@ -2352,7 +2352,7 @@ get_la(double *rv)
     return (rm_errno = RM_ERR_SYSTEM);
     }
 
-  if (read(kfd, (char *)&load, sizeof(load)) != sizeof(load))
+  if (read_ac_socket(kfd, (char *)&load, sizeof(load)) != sizeof(load))
     {
     log_err(errno, id, "read");
     return (rm_errno = RM_ERR_SYSTEM);
diff --git a/src/resmom/irix6/mom_mach.c b/src/resmom/irix6/mom_mach.c
index a64af8b878..45cb49c5ef 100644
--- a/src/resmom/irix6/mom_mach.c
+++ b/src/resmom/irix6/mom_mach.c
@@ -2288,7 +2288,7 @@ physmem(struct rm_attribute *attrib)
     return NULL;
     }
 
-  if (read(kfd, (char *)&pmem, sizeof(pmem)) != sizeof(pmem))
+  if (read_ac_socket(kfd, (char *)&pmem, sizeof(pmem)) != sizeof(pmem))
     {
     log_err(errno, id, "read");
     rm_errno = PBSE_RMSYSTEM;
@@ -2566,7 +2566,7 @@ get_la(double *rv)
     return (rm_errno = PBSE_RMSYSTEM);
     }
 
-  if (read(kfd, (char *)&load, sizeof(load)) != sizeof(load))
+  if (read_ac_socket(kfd, (char *)&load, sizeof(load)) != sizeof(load))
     {
     log_err(errno, id, "read");
     return (rm_errno = PBSE_RMSYSTEM);
diff --git a/src/resmom/irix6array/mom_mach.c b/src/resmom/irix6array/mom_mach.c
index 26329bcdaf..8cee27b05a 100644
--- a/src/resmom/irix6array/mom_mach.c
+++ b/src/resmom/irix6array/mom_mach.c
@@ -1828,7 +1828,7 @@ physmem(struct rm_attribute *attrib)
     return NULL;
     }
 
-  if (read(kfd, (char *)&pmem, sizeof(pmem)) != sizeof(pmem))
+  if (read_ac_socket(kfd, (char *)&pmem, sizeof(pmem)) != sizeof(pmem))
     {
     log_err(errno, id, (char *)"read");
     rm_errno = RM_ERR_SYSTEM;
@@ -2018,7 +2018,7 @@ get_la(double *rv)
     return (rm_errno = RM_ERR_SYSTEM);
     }
 
-  if (read(kfd, (char *)&load, sizeof(load)) != sizeof(load))
+  if (read_ac_socket(kfd, (char *)&load, sizeof(load)) != sizeof(load))
     {
     log_err(errno, id, (char *)"read");
     return (rm_errno = RM_ERR_SYSTEM);
diff --git a/src/resmom/linux/test/mom_mach/scaffolding.c b/src/resmom/linux/test/mom_mach/scaffolding.c
index 09bcbbe10a..e46088ccc1 100644
--- a/src/resmom/linux/test/mom_mach/scaffolding.c
+++ b/src/resmom/linux/test/mom_mach/scaffolding.c
@@ -13,19 +13,19 @@
 
 int svr_resc_size = 0;
 char path_meminfo[MAX_LINE];
-char no_parm[] = "required parameter not found";
+const char *no_parm = "required parameter not found";
 long system_ncpus = 0;
 time_t time_now = 0;
 int ignmem = 0;
 double wallfactor = 1.00;
 double cputfactor = 1.00;
 int exiting_tasks = 0;
-char extra_parm[] = "extra parameter(s)";
+const char *extra_parm = "extra parameter(s)";
 int igncput = 0;
 char *ret_string;
 resource_def *svr_resc_def;
 int ignvmem = 0;
-char *msg_momsetlim = "Job start failed. Can't set \"%s\" limit: %s.\n";
+const char *msg_momsetlim = "Job start failed. Can't set \"%s\" limit: %s.\n";
 tlist_head svr_alljobs;
 int LOGLEVEL = 7; /* force logging code to be exercised as tests run */
 int ignwalltime = 0;
diff --git a/src/resmom/mom_comm.c b/src/resmom/mom_comm.c
index 5abd9eeef7..9621930f92 100644
--- a/src/resmom/mom_comm.c
+++ b/src/resmom/mom_comm.c
@@ -111,6 +111,7 @@
 #include "log.h"
 #include "../lib/Liblog/pbs_log.h"
 #include "../lib/Liblog/log_event.h"
+#include "../lib/Libifl/lib_ifl.h"
 #include "net_connect.h"
 #include "dis.h"
 #include "dis_init.h"
@@ -328,7 +329,7 @@ int task_save(
 
   /* just write the "critical" base structure to the file */
 
-  while ((i = write(fds,&ptask->ti_qs,sizeof(ptask->ti_qs)) ) != sizeof(ptask->ti_qs))
+  while ((i = write_ac_socket(fds,&ptask->ti_qs,sizeof(ptask->ti_qs)) ) != sizeof(ptask->ti_qs))
     {
     if ((i < 0) && (errno == EINTR))
       {
@@ -629,7 +630,7 @@ int task_recov(
 
   /* read in task quick save sub-structure */
 
-  while (read(fds, (char *)&task_save, sizeof(task_save)) == sizeof(task_save))
+  while (read_ac_socket(fds, (char *)&task_save, sizeof(task_save)) == sizeof(task_save))
     {
     tid = TM_NULL_TASK;
 
@@ -8148,7 +8149,7 @@ void fork_demux(
     else
       {
       /* read the pipe and then continue */
-      while ((read(pipes[0], &buf, sizeof(buf) - 1) == -1) &&
+      while ((read_ac_socket(pipes[0], &buf, sizeof(buf) - 1) == -1) &&
              (errno == EINTR))
         ;
 
@@ -8180,7 +8181,7 @@ void fork_demux(
     close(im_mom_stdout);
     close(im_mom_stderr);
 
-    if (write(pipes[1], "fail", strlen("fail")) < 0)
+    if (write_ac_socket(pipes[1], "fail", strlen("fail")) < 0)
       perror(__func__);
 
     close(pipes[1]);
@@ -8194,7 +8195,7 @@ void fork_demux(
     close(im_mom_stdout);
     close(im_mom_stderr);
 
-    if (write(pipes[1], "fail", strlen("fail")) < 0)
+    if (write_ac_socket(pipes[1], "fail", strlen("fail")) < 0)
       perror(__func__);
 
     close(pipes[1]);
@@ -8221,7 +8222,7 @@ void fork_demux(
     close(im_mom_stdout);
     close(im_mom_stderr);
     
-    if (write(pipes[1], "fail", strlen("fail")) < 0)
+    if (write_ac_socket(pipes[1], "fail", strlen("fail")) < 0)
       perror(__func__);
 
     close(pipes[1]);
@@ -8238,7 +8239,7 @@ void fork_demux(
     close(im_mom_stderr);
     close(fd1);
 
-    if (write(pipes[1], "fail", strlen("fail")) < 0)
+    if (write_ac_socket(pipes[1], "fail", strlen("fail")) < 0)
       perror(__func__);
 
     close(pipes[1]);
@@ -8246,7 +8247,7 @@ void fork_demux(
     _exit(5);
     }
 
-  if (write(pipes[1], "success", strlen("success")) < 0)
+  if (write_ac_socket(pipes[1], "success", strlen("success")) < 0)
     perror(__func__);
 
   close(pipes[1]);
diff --git a/src/resmom/mom_inter.c b/src/resmom/mom_inter.c
index f92bf6f463..d49fac672d 100644
--- a/src/resmom/mom_inter.c
+++ b/src/resmom/mom_inter.c
@@ -97,6 +97,7 @@
 
 #include "portability.h"
 #include "pbs_ifl.h"
+#include "../lib/Libifl/lib_ifl.h"
 #include "server_limits.h"
 #include "net_connect.h"
 #include "log.h"
@@ -138,7 +139,7 @@ static int read_net(
 
   while (amt > 0)
     {
-    got = read(sock, buf, amt);
+    got = read_ac_socket(sock, buf, amt);
 
     if (got == 0)
       {
@@ -367,7 +368,7 @@ int mom_reader(
 
       while (c > 0)
         {
-        if ((wc = write(ptc, p, c)) < 0)
+        if ((wc = write_ac_socket(ptc, p, c)) < 0)
           {
           if (errno == EINTR)
             {
@@ -439,7 +440,7 @@ int mom_writer(
 
   while (1)
     {
-    c = read(ptc, buf, sizeof(buf));
+    c = read_ac_socket(ptc, buf, sizeof(buf));
 
     if (c > 0)
       {
@@ -448,7 +449,7 @@ int mom_writer(
 
       while (c > 0)
         {
-        if ((wc = write(s, p, c)) < 0)
+        if ((wc = write_ac_socket(s, p, c)) < 0)
           {
           if (errno == EINTR)
             {
diff --git a/src/resmom/mom_main.c b/src/resmom/mom_main.c
index 81fd78c157..40d7133db2 100644
--- a/src/resmom/mom_main.c
+++ b/src/resmom/mom_main.c
@@ -62,6 +62,7 @@
 #include "../lib/Liblog/chk_file_sec.h"
 #include "../lib/Liblog/setup_env.h"
 #include "../lib/Libnet/lib_net.h" /* socket_avail_bytes_on_descriptor */
+#include "../lib/Libifl/lib_ifl.h"
 #include "net_connect.h"
 #include "dis.h"
 #include "dis_init.h"
@@ -1037,7 +1038,7 @@ static const char *reqvarattr(
 
         while (child_len < TMAX_VARBUF)
           {
-          len = read(fd, child_spot, TMAX_VARBUF - child_len);
+          len = read_ac_socket(fd, child_spot, TMAX_VARBUF - child_len);
 
           if ((len <= 0) &&
               (errno != EINTR))
@@ -4084,7 +4085,7 @@ char *conf_res(
 
 retryread:
 
-  while ((len = read(fd, child_spot, ret_size - child_len)) > 0)
+  while ((len = read_ac_socket(fd, child_spot, ret_size - child_len)) > 0)
     {
     for (i = 0;i < len;i++)
       {
@@ -7375,7 +7376,7 @@ int setup_program_environment(void)
 
   sprintf(log_buffer, "%ld\n", (long)getpid());
 
-  if (write(lockfds, log_buffer, strlen(log_buffer) + 1) !=
+  if (write_ac_socket(lockfds, log_buffer, strlen(log_buffer) + 1) !=
       (ssize_t)(strlen(log_buffer) + 1))
     {
     log_err(errno, msg_daemonname, "failed to write to lockfile");
@@ -8525,7 +8526,7 @@ int read_layout_file()
   char           line[MAX_LINE];
   char          *delims = " \t\n\r=";
   char          *tok = NULL;
-  char          *val = NULL;
+  const char    *val = NULL;
   int            i = 0;
   int            empty_line;
   hwloc_bitmap_t nodeset = NULL;
diff --git a/src/resmom/mom_req_quejob.c b/src/resmom/mom_req_quejob.c
index d7e33211f1..e71e93dab6 100644
--- a/src/resmom/mom_req_quejob.c
+++ b/src/resmom/mom_req_quejob.c
@@ -102,6 +102,7 @@
 #include "pbs_error.h"
 #include "log.h"
 #include "../lib/Liblog/pbs_log.h"
+#include "../lib/Libifl/lib_ifl.h"
 #include "svrfunc.h"
 #include "mom_job_func.h" /* mom_job_purge */
 
@@ -159,7 +160,7 @@ extern int    reject_job_submit;
 
 extern  char *msg_daemonname;
 
-extern int decode_arst_merge(struct pbs_attribute *,const char *,char *,char *);
+extern int decode_arst_merge(struct pbs_attribute *,const char *,const char *,const char *);
 
 
 /* Private Functions in this file */
@@ -669,7 +670,7 @@ void req_jobscript(
     return;
     }
 
-  if (write(
+  if (write_ac_socket(
         fds,
         preq->rq_ind.rq_jobfile.rq_data,
         (unsigned)preq->rq_ind.rq_jobfile.rq_size) != preq->rq_ind.rq_jobfile.rq_size)
@@ -778,7 +779,7 @@ void req_mvjobfile(
     return;
     }
 
-  if (write(
+  if (write_ac_socket(
         fds,
         preq->rq_ind.rq_jobfile.rq_data,
         preq->rq_ind.rq_jobfile.rq_size) != preq->rq_ind.rq_jobfile.rq_size)
diff --git a/src/resmom/pbs_demux.c b/src/resmom/pbs_demux.c
index 61af02a135..e8bb18d107 100644
--- a/src/resmom/pbs_demux.c
+++ b/src/resmom/pbs_demux.c
@@ -102,6 +102,7 @@
 #if defined(FD_SET_IN_SYS_SELECT_H)
 #  include <sys/select.h>
 #endif
+#include "../lib/Libifl/lib_ifl.h"
 
 
 enum rwhere {invalid, new_out, new_err, old_out, old_err};
@@ -134,7 +135,7 @@ void readit(
 
   i = 0;
 
-  if ((amt = read(sock, buf, 256)) > 0)
+  if ((amt = read_ac_socket(sock, buf, 256)) > 0)
     {
     /* disable cookie search PW - mpiexec patch */
 
diff --git a/src/resmom/prolog.c b/src/resmom/prolog.c
index 2967b3dd57..f8a720689f 100644
--- a/src/resmom/prolog.c
+++ b/src/resmom/prolog.c
@@ -97,6 +97,7 @@
 #include "pbs_job.h"
 #include "log.h"
 #include "../lib/Liblog/pbs_log.h"
+#include "../lib/Libifl/lib_ifl.h"
 #include "mom_mach.h"
 #include "mom_func.h"
 #include "resource.h"
@@ -906,7 +907,7 @@ int run_pelog(
           strerror(errno),
           which == PE_PROLOGUSER ? "prologue" : "epilogue");
 
-        if (write(2, log_buffer, strlen(log_buffer)) == -1) {}
+        if (write_ac_socket(2, log_buffer, strlen(log_buffer)) == -1) {}
 
         fsync(2);
         }
@@ -1270,7 +1271,7 @@ int run_pelog(
       pelog,
       strerror(errno));
 
-    if (write(2, log_buffer, strlen(log_buffer)) == -1) 
+    if (write_ac_socket(2, log_buffer, strlen(log_buffer)) == -1)
       {
       /* cannot write message to stderr */
 
diff --git a/src/resmom/release_reservation.c b/src/resmom/release_reservation.c
index dc70d8bafb..d7e1e2d702 100644
--- a/src/resmom/release_reservation.c
+++ b/src/resmom/release_reservation.c
@@ -77,8 +77,6 @@
 * without reference to its choice of law rules.
 */
 
-
-
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -90,6 +88,7 @@
 #include "alps_constants.h"
 #include "utils.h"
 
+#include "../lib/Libifl/lib_ifl.h"
 
 
 
diff --git a/src/resmom/requests.c b/src/resmom/requests.c
index 7133cba852..1625e32386 100644
--- a/src/resmom/requests.c
+++ b/src/resmom/requests.c
@@ -109,6 +109,7 @@
 #include "log.h"
 #include "../lib/Liblog/pbs_log.h"
 #include "../lib/Liblog/log_event.h"
+#include "../lib/Libifl/lib_ifl.h"
 #include "checkpoint.h" /* start_checkpoint */
 #include "resmon.h"
 #include "net_connect.h"
@@ -658,7 +659,7 @@ int return_file(
 
   strcpy(prq->rq_ind.rq_jobfile.rq_jobid, pjob->ji_qs.ji_jobid);
 
-  while ((amt = read(fds, buf, RT_BLK_SZ)) > 0)
+  while ((amt = read_ac_socket(fds, buf, RT_BLK_SZ)) > 0)
     {
     /* prq->rq_ind.rq_jobfile.rq_sequence = seq++; */
     /* prq->rq_ind.rq_jobfile.rq_type = (int)which; */
@@ -1317,7 +1318,7 @@ int message_job(
   rc = PBSE_NONE;
 
   alarm(alarm_time);
-  if (write(fds, text, len) != len)
+  if (write_ac_socket(fds, text, len) != len)
     {
     log_err(errno, "message_job", (char *)"unable to write message to job");
 
diff --git a/src/resmom/solaris7/mom_mach.c b/src/resmom/solaris7/mom_mach.c
index b0e62263d3..441c48e6df 100644
--- a/src/resmom/solaris7/mom_mach.c
+++ b/src/resmom/solaris7/mom_mach.c
@@ -808,7 +808,7 @@ mom_get_sample(void)
     if ((fd = open(procname, O_RDONLY)) == -1)
       continue;
 
-    if (read(fd, pi, sizeof(psinfo_t)) != sizeof(psinfo_t))
+    if (read_ac_socket(fd, pi, sizeof(psinfo_t)) != sizeof(psinfo_t))
       {
       sprintf(log_buffer, "read of %s failed", procname);
       log_err(errno, id, log_buffer);
diff --git a/src/resmom/start_exec.c b/src/resmom/start_exec.c
index b2577ec3b5..7dbaa2797f 100644
--- a/src/resmom/start_exec.c
+++ b/src/resmom/start_exec.c
@@ -105,6 +105,7 @@
 #include "log.h"
 #include "../lib/Liblog/pbs_log.h"
 #include "../lib/Liblog/log_event.h"
+#include "../lib/Libifl/lib_ifl.h"
 #include "mom_mach.h"
 #include "mom_func.h"
 #include "pbs_error.h"
@@ -616,7 +617,7 @@ int become_the_user(
       (unsigned long)pjob->ji_qs.ji_un.ji_momt.ji_exuid,
       strerror(errno));
 
-    if (write(2, log_buffer, strlen(log_buffer)) == -1)
+    if (write_ac_socket(2, log_buffer, strlen(log_buffer)) == -1)
       {
       }
     
@@ -635,7 +636,7 @@ int become_the_user(
       (unsigned long)pjob->ji_qs.ji_un.ji_momt.ji_exuid,
       strerror(errno));
 
-    if (write(2, log_buffer, strlen(log_buffer)) == -1)
+    if (write_ac_socket(2, log_buffer, strlen(log_buffer)) == -1)
       {
       }
     
@@ -653,7 +654,7 @@ int become_the_user(
       (unsigned long)pjob->ji_qs.ji_un.ji_momt.ji_exuid,
       strerror(errno));
 
-    if (write(2, log_buffer, strlen(log_buffer)) == -1)
+    if (write_ac_socket(2, log_buffer, strlen(log_buffer)) == -1)
       {
       }
     
@@ -2372,7 +2373,7 @@ int TMomFinalizeJob2(
     
     while (j < i)
       {
-      if ((k = write(TJE->pipe_script[1], buf + j, i - j)) < 0)
+      if ((k = write_ac_socket(TJE->pipe_script[1], buf + j, i - j)) < 0)
         {
         if (errno == EINTR)
           continue;
@@ -3103,7 +3104,7 @@ int start_interactive_session(
   
   /* send jobid as validation to qsub */
   if ((*qsub_sock_ptr < 0)||
-      (write(*qsub_sock_ptr, pjob->ji_qs.ji_jobid, PBS_MAXSVRJOBID + 1) != PBS_MAXSVRJOBID + 1))
+      (write_ac_socket(*qsub_sock_ptr, pjob->ji_qs.ji_jobid, PBS_MAXSVRJOBID + 1) != PBS_MAXSVRJOBID + 1))
     {
     log_err(errno, __func__, "cannot write jobid");
     
@@ -3457,7 +3458,7 @@ void attempt_to_set_limits(
       {
       /* report error to user via stderr file */
 
-      if (write(2, log_buffer, strlen(log_buffer)) == -1)
+      if (write_ac_socket(2, log_buffer, strlen(log_buffer)) == -1)
         {
         }
 
@@ -3516,7 +3517,7 @@ void go_to_init_dir(
       idir,
       strerror(errno));
     
-    if (write(2, log_buffer, strlen(log_buffer)) == -1)
+    if (write_ac_socket(2, log_buffer, strlen(log_buffer)) == -1)
       {
       }
     
@@ -3560,7 +3561,7 @@ int setup_x11_forwarding(
       {
       sprintf(log_buffer, "PBS: X11 forwarding init failed\n");
 
-      if (write(2, log_buffer, strlen(log_buffer)) == -1)
+      if (write_ac_socket(2, log_buffer, strlen(log_buffer)) == -1)
         {
         }
 
@@ -4022,7 +4023,7 @@ int TMomFinalizeChild(
 
     sprintf(log_buffer, "PBS: site specific job setup failed\n");
 
-    if (write(2, log_buffer, strlen(log_buffer)) == -1)
+    if (write_ac_socket(2, log_buffer, strlen(log_buffer)) == -1)
       {
       }
 
@@ -4055,7 +4056,7 @@ int TMomFinalizeChild(
         idir,
         strerror(errno));
 
-      if (write(2, log_buffer, strlen(log_buffer)) == -1)
+      if (write_ac_socket(2, log_buffer, strlen(log_buffer)) == -1)
         {
         }
 
@@ -4225,7 +4226,7 @@ int TMomFinalizeChild(
 
   sprintf(log_buffer, "PBS: exec of shell '%.256s' failed\n", shell);
 
-  if (write(2, log_buffer, strlen(log_buffer)) == -1)
+  if (write_ac_socket(2, log_buffer, strlen(log_buffer)) == -1)
     {
     }
 
@@ -4340,7 +4341,7 @@ int TMomFinalizeJob3(
 
   /* send back as an acknowledgement that MOM got it */
 
-  if (write(TJE->mjspipe[1], &sjr, sizeof(sjr)) == -1)
+  if (write_ac_socket(TJE->mjspipe[1], &sjr, sizeof(sjr)) == -1)
     {
     }
 
@@ -4665,7 +4666,7 @@ int start_process(
 
     for (;;)
       {
-      i = read(parent_read, (char *) & sjr, sizeof(sjr));
+      i = read_ac_socket(parent_read, (char *) & sjr, sizeof(sjr));
 
       if ((i == -1) && (errno == EINTR))
         continue;
@@ -4674,7 +4675,7 @@ int start_process(
         {
         gotsuccess = 1;
 
-        if (write(parent_write, &sjr, sizeof(sjr)) == -1)
+        if (write_ac_socket(parent_write, &sjr, sizeof(sjr)) == -1)
           {
           }
 
@@ -5058,10 +5059,10 @@ int start_process(
     /* never send cookie - PW mpiexec patch */
 
     /*
-    if (write(1,pjob->ji_wattr[JOB_ATR_Cookie].at_val.at_str,
+    if (write_ac_socket(1,pjob->ji_wattr[JOB_ATR_Cookie].at_val.at_str,
       strlen(pjob->ji_wattr[JOB_ATR_Cookie].at_val.at_str)) == -1) {}
 
-    if (write(2,pjob->ji_wattr[JOB_ATR_Cookie].at_val.at_str,
+    if (write_ac_socket(2,pjob->ji_wattr[JOB_ATR_Cookie].at_val.at_str,
       strlen(pjob->ji_wattr[JOB_ATR_Cookie].at_val.at_str)) == -1) {}
     */
     }
@@ -5159,7 +5160,7 @@ int start_process(
     if (log_buffer[0] != '\0')
       {
       /* report error to user via stderr file */
-      if (write(2, log_buffer, strlen(log_buffer)) == -1)
+      if (write_ac_socket(2, log_buffer, strlen(log_buffer)) == -1)
         {
         }
 
@@ -5170,7 +5171,7 @@ int start_process(
 
             i);
 
-    if (write(2, log_buffer, strlen(log_buffer)) == -1)
+    if (write_ac_socket(2, log_buffer, strlen(log_buffer)) == -1)
       {
       }
 
@@ -5194,7 +5195,7 @@ int start_process(
         idir,
         strerror(errno));
       
-      if (write(2, log_buffer, strlen(log_buffer)) == -1)
+      if (write_ac_socket(2, log_buffer, strlen(log_buffer)) == -1)
         {
         }
 
@@ -5223,7 +5224,7 @@ int start_process(
         idir,
         strerror(errno));
 
-      if (write(2, log_buffer, strlen(log_buffer)) == -1)
+      if (write_ac_socket(2, log_buffer, strlen(log_buffer)) == -1)
         {
         }
 
@@ -5244,7 +5245,7 @@ int start_process(
         pjob->ji_grpcache->gc_homedir,
         strerror(errno));
 
-      if (write(2, log_buffer, strlen(log_buffer)) == -1)
+      if (write_ac_socket(2, log_buffer, strlen(log_buffer)) == -1)
         {
         }
 
@@ -5277,7 +5278,7 @@ int start_process(
     argv[0],
     strerror(errno));
 
-  if (write(2, log_buffer, strlen(log_buffer)) == -1)
+  if (write_ac_socket(2, log_buffer, strlen(log_buffer)) == -1)
     {
     }
 
@@ -6418,7 +6419,7 @@ static void starter_return(
 
   sjrtn->sj_code = code;
 
-  if (write(upfds, (char *)sjrtn, sizeof(*sjrtn)) == -1)
+  if (write_ac_socket(upfds, (char *)sjrtn, sizeof(*sjrtn)) == -1)
     {
     }
 
@@ -6439,7 +6440,7 @@ static void starter_return(
   do
     {
     alarm(120);
-    i = read(downfds, &ack, sizeof(ack));
+    i = read_ac_socket(downfds, &ack, sizeof(ack));
     alarmsecs = alarm(0);
 
     if ((i == -1) && (errno != EINTR))
@@ -7681,7 +7682,7 @@ int TMomCheckJobChild(
 
   for (;;)
     {
-    i = read(TJE->jsmpipe[0], (char *) &TJE->sjr, read_size);
+    i = read_ac_socket(TJE->jsmpipe[0], (char *) &TJE->sjr, read_size);
 
     if ((i == -1) && (errno == EINTR))
       continue;
diff --git a/src/resmom/test/alps_reservations/scaffolding.c b/src/resmom/test/alps_reservations/scaffolding.c
index bf36b5cf07..91ef1ec7ee 100644
--- a/src/resmom/test/alps_reservations/scaffolding.c
+++ b/src/resmom/test/alps_reservations/scaffolding.c
@@ -64,7 +64,7 @@ int resize_if_needed(
     /* need to resize */
     difference = new_size - ds->size;
 
-    if ((tmp = realloc(ds->str, new_size)) == NULL)
+    if ((tmp = (char *)realloc(ds->str, new_size)) == NULL)
       return(ENOMEM);
 
     ds->str = tmp;
@@ -293,7 +293,7 @@ dynamic_string *get_dynamic_string(
   const char *str)          /* I (optional) */
 
   {
-  dynamic_string *ds = calloc(1, sizeof(dynamic_string));
+  dynamic_string *ds = (dynamic_string *)calloc(1, sizeof(dynamic_string));
 
   if (ds == NULL)
     return(ds);
@@ -303,7 +303,7 @@ dynamic_string *get_dynamic_string(
   else
     ds->size = DS_INITIAL_SIZE;
     
-  ds->str = calloc(1, ds->size);
+  ds->str = (char *)calloc(1, ds->size);
 
   if (ds->str == NULL)
     {
@@ -514,7 +514,7 @@ int check_and_resize(
     /* double the size if we're out of space */
     size = (ra->max * 2) * sizeof(slot);
 
-    if ((tmp = realloc(ra->slots,size)) == NULL)
+    if ((tmp = (slot *)realloc(ra->slots,size)) == NULL)
       {
       return(ENOMEM);
       }
@@ -888,7 +888,7 @@ resizable_array *initialize_resizable_array(
     int               size)
 
   {
-  resizable_array *ra = calloc(1, sizeof(resizable_array));
+  resizable_array *ra = (resizable_array *)calloc(1, sizeof(resizable_array));
   size_t           amount = sizeof(slot) * size;
 
   ra->max       = size;
@@ -896,7 +896,7 @@ resizable_array *initialize_resizable_array(
   ra->next_slot = 1;
   ra->last      = 0;
 
-  ra->slots = calloc(1, amount);
+  ra->slots = (slot *)calloc(1, amount);
 
   return(ra);
   } /* END initialize_resizable_array() */
@@ -1029,3 +1029,13 @@ void *get_thing_from_index(
   } /* END get_thing_from_index() */
 
 
+
+ssize_t write_ac_socket(int fd, const void *buf, ssize_t count)
+  {
+  return(0);
+  }
+
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
+  {
+  return(0);
+  }
diff --git a/src/resmom/test/alps_reservations/test_alps_reservations.c b/src/resmom/test/alps_reservations/test_alps_reservations.c
index 2208b71b6e..4b53c40531 100644
--- a/src/resmom/test/alps_reservations/test_alps_reservations.c
+++ b/src/resmom/test/alps_reservations/test_alps_reservations.c
@@ -219,7 +219,7 @@ START_TEST(execute_reservation_test)
 
   snprintf(cmdbuf, sizeof(cmdbuf), "%s %d", cmd, rid);
   rc = execute_reservation(cmdbuf, &rsv_id);
-  snprintf(buf, sizeof(buf), "Failed to execute the command '%s'", cmdbuf);
+  snprintf(buf, sizeof(buf), "Failed to execute the command '%s', rc=%d", cmdbuf, rc);
   fail_unless(rc == 0, buf);
   snprintf(buf, sizeof(buf), "Reservation id should be 30 but is '%s'", rsv_id);
   fail_unless(!strcmp(rsv_id, "30"), buf);
diff --git a/src/resmom/test/catch_child/scaffolding.c b/src/resmom/test/catch_child/scaffolding.c
index 592cea9c94..00e83aed1c 100644
--- a/src/resmom/test/catch_child/scaffolding.c
+++ b/src/resmom/test/catch_child/scaffolding.c
@@ -54,7 +54,7 @@ resource_def *svr_resc_def; /* resc_def_all.c */
 char        *path_epiloguser; /* mom_main.c */
 char        *path_epilog; /* mom_main.c */
 int PBSNodeCheckEpilog = 1; /* mom_main.c */ /* 1 to trigger conditions */
-char *msg_daemonname = "unset"; /* pbs_log.c */
+const char *msg_daemonname = "unset"; /* pbs_log.c */
 char *path_jobs; /* mom_main.c */
 tlist_head mom_polljobs; /* mom_main.c */
 char        *path_epiloguserp; /* mom_main.c */
@@ -1235,7 +1235,7 @@ u_long addclient(const char *name)
   return 0;
   }
 
-int find_attr(struct attribute_def *attr_def, char *name, int limit)
+int find_attr(struct attribute_def *attr_def, const char *name, int limit)
   {
   int rc = 0;
   if (func_num == INIT_ABORT_JOBS)
diff --git a/src/resmom/test/checkpoint/scaffolding.c b/src/resmom/test/checkpoint/scaffolding.c
index baf052fb47..16ca5d2c04 100644
--- a/src/resmom/test/checkpoint/scaffolding.c
+++ b/src/resmom/test/checkpoint/scaffolding.c
@@ -97,7 +97,7 @@ int mom_does_checkpoint()
  exit(1);
  }
 
-int decode_str(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_str(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
  {
  fprintf(stderr, "The call to decode_str needs to be mocked!!\n");
  exit(1);
@@ -121,7 +121,7 @@ int pbs_alterjob(int c, char *jobid, struct attrl *attrib, char *extend)
  exit(1);
  }
 
-char * csv_find_value(char *csv_str, char *search_str)
+char * csv_find_value(const char *csv_str, char *search_str)
  {
  fprintf(stderr, "The call to csv_find_value needs to be mocked!!\n");
  exit(1);
@@ -187,7 +187,7 @@ int remtree(char *dirname)
  exit(1);
  }
 
-char * csv_find_string(char *csv_str, char *search_str)
+char * csv_find_string(const char *csv_str, char *search_str)
  {
  fprintf(stderr, "The call to csv_find_string needs to be mocked!!\n");
  exit(1);
diff --git a/src/resmom/test/generate_alps_status/scaffolding.c b/src/resmom/test/generate_alps_status/scaffolding.c
index 93343c37b1..22b705ff4a 100644
--- a/src/resmom/test/generate_alps_status/scaffolding.c
+++ b/src/resmom/test/generate_alps_status/scaffolding.c
@@ -111,7 +111,7 @@ int resize_if_needed(
     /* need to resize */
     difference = new_size - ds->size;
 
-    if ((tmp = realloc(ds->str, new_size)) == NULL)
+    if ((tmp = (char *)realloc(ds->str, new_size)) == NULL)
       return(ENOMEM);
 
     ds->str = tmp;
@@ -168,7 +168,7 @@ dynamic_string *get_dynamic_string(
   const char *str)          /* I (optional) */
 
   {
-  dynamic_string *ds = calloc(1, sizeof(dynamic_string));
+  dynamic_string *ds = (dynamic_string *)calloc(1, sizeof(dynamic_string));
 
   if (ds == NULL)
     return(ds);
@@ -178,7 +178,7 @@ dynamic_string *get_dynamic_string(
   else
     ds->size = DS_INITIAL_SIZE;
     
-  ds->str = calloc(1, ds->size);
+  ds->str = (char *)calloc(1, ds->size);
 
   if (ds->str == NULL)
     {
diff --git a/src/resmom/test/generate_alps_status/test_generate_alps_status.c b/src/resmom/test/generate_alps_status/test_generate_alps_status.c
index fab70c2052..fa8d515ccd 100644
--- a/src/resmom/test/generate_alps_status/test_generate_alps_status.c
+++ b/src/resmom/test/generate_alps_status/test_generate_alps_status.c
@@ -33,9 +33,9 @@ char *sample_start24 = "<Label name='MOAB:FEATURE=regmem' type='SOFT' dispositio
 
 
 int search_dynamic_string_status(dynamic_string *status, char *str);
-int generate_alps_status(dynamic_string *status, char *path, char *protocol);
+int generate_alps_status(dynamic_string *status, const char *path, const char *protocol);
+
 
-/*
 START_TEST(parse_alps_output_test)
   {
   dynamic_string *output = get_dynamic_string(-1, NULL);
@@ -92,21 +92,21 @@ START_TEST(full_generate_test)
   fail_unless(search_dynamic_string_status(status, "GPU") == 1, "Couldn't find the GPUs reported in the status");
   fail_unless(search_dynamic_string_status(status, "cheeseburger") == 1, "Couldn't find the feature cheeseburger in the status");
   }
-END_TEST */
+END_TEST 
 
 Suite *node_func_suite(void)
   {
   Suite *s = suite_create("alps helper suite methods");
-  /*TCase *tc_core;*/
+  TCase *tc_core;
  
-  /*
+  
   tc_core = tcase_create("parse_alps_output_test");
   tcase_add_test(tc_core, parse_alps_output_test);
   suite_add_tcase(s, tc_core);
   
   tc_core = tcase_create("full_generate_test");
   tcase_add_test(tc_core, full_generate_test);
-  suite_add_tcase(s, tc_core); */
+  suite_add_tcase(s, tc_core); 
   
   return s;
   }
diff --git a/src/resmom/test/mom_comm/scaffolding.c b/src/resmom/test/mom_comm/scaffolding.c
index 5f258156e1..a5fc705028 100644
--- a/src/resmom/test/mom_comm/scaffolding.c
+++ b/src/resmom/test/mom_comm/scaffolding.c
@@ -203,7 +203,7 @@ void DIS_tcp_setup(int fd)
   exit(1);
   }
 
-int find_attr(struct attribute_def *attr_def, char *name, int limit)
+int find_attr(struct attribute_def *attr_def, const char *name, int limit)
   {
   fprintf(stderr, "The call to find_attr needs to be mocked!!\n");
   exit(1);
@@ -461,3 +461,13 @@ void DIS_tcp_close(struct tcp_chan *chan) {}
 void DIS_tcp_cleanup(struct tcp_chan *chan) {}
 
 void free_dynamic_string(dynamic_string *ds) {}
+
+ssize_t write_ac_socket(int fd, const void *buf, ssize_t count)
+  {
+  return(0);
+  }
+
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
+  {
+  return(0);
+  }
diff --git a/src/resmom/test/mom_inter/scaffolding.c b/src/resmom/test/mom_inter/scaffolding.c
index 9825ae8a1d..e367ac5c24 100644
--- a/src/resmom/test/mom_inter/scaffolding.c
+++ b/src/resmom/test/mom_inter/scaffolding.c
@@ -7,7 +7,7 @@ int mom_reader_go;
 int DEBUGMODE;
 char *xauth_path;
 
-ssize_t read_nonblocking_socket(int fd, void *buf, ssize_t count)
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
   {
   fprintf(stderr, "The call to read_nonblocking_socket needs to be mocked!!\n");
   exit(1);
@@ -15,8 +15,7 @@ ssize_t read_nonblocking_socket(int fd, void *buf, ssize_t count)
 
 ssize_t read_blocking_socket(int fd, void *buf, ssize_t count)
   {
-  fprintf(stderr, "The call to read_blocking_socket needs to be mocked!!\n");
-  exit(1);
+  return(0);
   }
 
 void port_forwarder( struct pfwdsock *socks, int (*connfunc)(char *, long, char *), char *phost, int pport, char *EMsg)
@@ -25,7 +24,7 @@ void port_forwarder( struct pfwdsock *socks, int (*connfunc)(char *, long, char
   exit(1);
   }
 
-ssize_t write_nonblocking_socket(int fd, const void *buf, ssize_t count)
+ssize_t write_ac_socket(int fd, const void *buf, ssize_t count)
   {
   fprintf(stderr, "The call to write_nonblocking_socket needs to be mocked!!\n");
   exit(1);
diff --git a/src/resmom/test/mom_main/scaffolding.c b/src/resmom/test/mom_main/scaffolding.c
index a19f5871e8..f4cd9275f1 100644
--- a/src/resmom/test/mom_main/scaffolding.c
+++ b/src/resmom/test/mom_main/scaffolding.c
@@ -23,10 +23,10 @@
 mom_server     mom_servers[PBS_MAXSERVER];
 resizable_array *received_statuses;
 int mom_server_count = 0;
-char *msg_daemonname = "unset";
+const char *msg_daemonname = "unset";
 struct sig_tbl sig_tbl[2];
 char pbs_current_user[PBS_MAXUSER];
-char *server_alias;
+extern char *server_alias;
 const char *dis_emsg[10];
 long *log_event_mask = NULL;
 int rpp_dbprt = 0;
@@ -36,7 +36,7 @@ struct config standard_config[2];
 struct config dependent_config[2];
 long MaxConnectTimeout = 5000000;
 tlist_head svr_requests;
-char *msg_info_mom = "Torque Mom Version = %s, loglevel = %d";
+const char *msg_info_mom = "Torque Mom Version = %s, loglevel = %d";
 hash_table_t *received_table;
 threadpool_t *request_pool;
 AvlTree okclients;
@@ -232,13 +232,13 @@ int tm_request(struct tcp_chan *chan, int version)
   exit(1);
   }
 
-int csv_length(char *csv_str)
+int csv_length(const char *csv_str)
   {
   fprintf(stderr, "The call to csv_length needs to be mocked!!\n");
   exit(1);
   }
 
-char *csv_nth(char *csv_str, int n)
+char *csv_nth(const char *csv_str, int n)
   {
   fprintf(stderr, "The call to csv_nth needs to be mocked!!\n");
   exit(1);
@@ -682,3 +682,13 @@ int insert_thing_after(resizable_array *ra, void *thing, int i)
   {
   return(0);
   }
+
+ssize_t write_ac_socket(int fd, const void *buf, ssize_t count)
+  {
+  return(0);
+  }
+
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
+  {
+  return(0);
+  }
diff --git a/src/resmom/test/mom_process_request/scaffolding.c b/src/resmom/test/mom_process_request/scaffolding.c
index 8ed2ba7bf0..5a291fa818 100644
--- a/src/resmom/test/mom_process_request/scaffolding.c
+++ b/src/resmom/test/mom_process_request/scaffolding.c
@@ -12,10 +12,10 @@
 #include "pbs_job.h" /* job */
 
 time_t time_now;
-char *msg_err_malloc = "malloc failed";
+const char *msg_err_malloc = "malloc failed";
 struct connection svr_conn[PBS_NET_MAX_CONNECTIONS];
 tlist_head svr_newjobs;
-char *msg_request = "Type %s request received from %s@%s, sock=%d";
+const char *msg_request = "Type %s request received from %s@%s, sock=%d";
 AvlTree okclients = NULL;
 int LOGLEVEL = 1;
 
diff --git a/src/resmom/test/mom_req_quejob/scaffolding.c b/src/resmom/test/mom_req_quejob/scaffolding.c
index bc43f9a734..d4476dd3a0 100644
--- a/src/resmom/test/mom_req_quejob/scaffolding.c
+++ b/src/resmom/test/mom_req_quejob/scaffolding.c
@@ -15,12 +15,12 @@
 
 const char *PJobSubState[10];
 char *path_jobs;
-char *msg_script_write = "Unable to write script file";
+const char *msg_script_write = "Unable to write script file";
 int svr_resc_size = 0;
 int multi_mom = 0;
 time_t time_now;
 attribute_def job_attr_def[10];
-char *msg_script_open = "Unable to open script file";
+const char *msg_script_open = "Unable to open script file";
 tlist_head svr_newjobs;
 resource_def *svr_resc_def;
 char mom_host[PBS_MAXHOSTNAME + 1];
@@ -82,7 +82,7 @@ void log_record(int eventtype, int objclass, const char *objname, const char *te
   exit(1);
   }
 
-int decode_arst_merge(struct pbs_attribute *patr, const char *name, char *rescn, char *val)
+int decode_arst_merge(struct pbs_attribute *patr, const char *name, const char *rescn, const char *val)
   {
   fprintf(stderr, "The call to decode_arst_merge needs to be mocked!!\n");
   exit(1);
@@ -94,7 +94,7 @@ ssize_t write_nonblocking_socket(int fd, const void *buf, ssize_t count)
   exit(1);
   }
 
-int find_attr(struct attribute_def *attr_def, char *name, int limit)
+int find_attr(struct attribute_def *attr_def, const char *name, int limit)
   {
   fprintf(stderr, "The call to find_attr needs to be mocked!!\n");
   exit(1);
@@ -213,3 +213,13 @@ pbs_net_t get_connectaddr(int sock, int mutex)
   fprintf(stderr, "The call to get_connectaddr needs to be mocked!!\n");
   exit(1);
   }
+
+ssize_t write_ac_socket(int fd, const void *buf, ssize_t count)
+  {
+  return(0);
+  }
+
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
+  {
+  return(0);
+  }
diff --git a/src/resmom/test/mom_server/scaffolding.c b/src/resmom/test/mom_server/scaffolding.c
index f0f715654c..693a0cdeda 100644
--- a/src/resmom/test/mom_server/scaffolding.c
+++ b/src/resmom/test/mom_server/scaffolding.c
@@ -36,7 +36,6 @@ float max_load_val = -1.0;
 char TMOMRejectConn[MAXLINE];
 int PBSNodeCheckInterval;
 int UpdateFailCount = 0;
-time_t first_update_time;
 char *auto_ideal_load = NULL;
 char *path_spool;
 char *auto_max_load = NULL;
diff --git a/src/resmom/test/pbs_demux/scaffolding.c b/src/resmom/test/pbs_demux/scaffolding.c
index a44174d8bc..df227f24c6 100644
--- a/src/resmom/test/pbs_demux/scaffolding.c
+++ b/src/resmom/test/pbs_demux/scaffolding.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <stdio.h> /* fprintf */
 
-ssize_t read_nonblocking_socket(int fd, void *buf, ssize_t count)
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
   {
   fprintf(stderr, "The call to read_nonblocking_socket needs to be mocked!!\n");
   exit(1);
diff --git a/src/resmom/test/prolog/scaffolding.c b/src/resmom/test/prolog/scaffolding.c
index c2c409d7ad..59d9c8842f 100644
--- a/src/resmom/test/prolog/scaffolding.c
+++ b/src/resmom/test/prolog/scaffolding.c
@@ -124,3 +124,13 @@ resource *find_resc_entry(pbs_attribute *pattr, resource_def *rscdf)
   fprintf(stderr, "The call to find_resc_entry needs to be mocked!!\n");
   exit(1);
   }
+
+ssize_t write_ac_socket(int fd, const void *buf, ssize_t count)
+  {
+  return(0);
+  }
+
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
+  {
+  return(0);
+  }
diff --git a/src/resmom/test/requests/scaffolding.c b/src/resmom/test/requests/scaffolding.c
index 3a33463aba..dbeb2c2bd0 100644
--- a/src/resmom/test/requests/scaffolding.c
+++ b/src/resmom/test/requests/scaffolding.c
@@ -20,7 +20,7 @@ char *apbasil_protocol;
 char *apbasil_path;
 struct cphosts *pcphosts = NULL;
 char *path_undeliv;
-char *msg_err_unlink = "Unlink of %s file %s failed";
+const char *msg_err_unlink = "Unlink of %s file %s failed";
 time_t time_now;
 struct sig_tbl sig_tbl[5];
 attribute_def job_attr_def[10];
@@ -28,7 +28,7 @@ int exiting_tasks = 0;
 char pbs_current_user[PBS_MAXUSER];
 char rcp_path[MAXPATHLEN];
 char rcp_args[MAXPATHLEN];
-char *msg_jobmod = "Job Modified";
+const char *msg_jobmod = "Job Modified";
 int cphosts_num = 0;
 struct var_table vtable; 
 char mom_host[PBS_MAXHOSTNAME + 1];
@@ -39,7 +39,7 @@ unsigned int alarm_time = 10;
 char *TNoSpoolDirList[TMAX_NSDCOUNT];
 tlist_head svr_alljobs;
 int LOGLEVEL = 7; /* force logging code to be exercised as tests run */
-char *msg_manager = "%s at request of %s@%s";
+const char *msg_manager = "%s at request of %s@%s";
 int multi_mom = 1;
 char MOMUNameMissing[64];
 
@@ -68,7 +68,7 @@ int job_save(job *pjob, int updatetype, int mom_port)
   exit(1);
   }
 
-ssize_t read_nonblocking_socket(int fd, void *buf, ssize_t count)
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
   {
   fprintf(stderr, "The call to read_nonblocking_socket needs to be mocked!!\n");
   exit(1);
@@ -134,7 +134,7 @@ int InitUserEnv(job *pjob, task *ptask, char **envp, struct passwd *pwdp, char *
   exit(1);
   }
 
-ssize_t write_nonblocking_socket(int fd, const void *buf, ssize_t count)
+ssize_t write_ac_socket(int fd, const void *buf, ssize_t count)
   {
   fprintf(stderr, "The call to write_nonblocking_socket needs to be mocked!!\n");
   exit(1);
diff --git a/src/resmom/test/start_exec/scaffolding.c b/src/resmom/test/start_exec/scaffolding.c
index 44fdaf4408..286df4967e 100644
--- a/src/resmom/test/start_exec/scaffolding.c
+++ b/src/resmom/test/start_exec/scaffolding.c
@@ -221,7 +221,7 @@ void DIS_tcp_setup(int fd)
   exit(1);
   }
 
-int find_attr(struct attribute_def *attr_def, char *name, int limit)
+int find_attr(struct attribute_def *attr_def, const char *name, int limit)
   {
   fprintf(stderr, "The call to find_attr needs to be mocked!!\n");
   exit(1);
@@ -347,7 +347,7 @@ int tcp_connect_sockaddr(struct sockaddr *sa, size_t sa_size)
   exit(1);
   }
 
-void append_link(tlist_head *head, list_link *new, void *pobj)
+void append_link(tlist_head *head, list_link *newLink, void *pobj)
   {
   fprintf(stderr, "The call to append_link needs to be mocked!!\n");
   exit(1);
@@ -470,3 +470,13 @@ int create_alps_reservation(
   {
   return(0);
   }
+
+ssize_t write_ac_socket(int fd, const void *buf, ssize_t count)
+  {
+  return(0);
+  }
+
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
+  {
+  return(0);
+  }
diff --git a/src/resmom/test/tmsock_recov/scaffolding.c b/src/resmom/test/tmsock_recov/scaffolding.c
index 283b83e5f4..9db56da3de 100644
--- a/src/resmom/test/tmsock_recov/scaffolding.c
+++ b/src/resmom/test/tmsock_recov/scaffolding.c
@@ -20,3 +20,13 @@ int save_struct(char *pobj, unsigned int objsize, int fds, char *buf, size_t *bu
   fprintf(stderr, "The call to save_struct needs to be mocked!!\n");
   exit(1);
   }
+
+ssize_t write_ac_socket(int fd, const void *buf, ssize_t count)
+  {
+  return(0);
+  }
+
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
+  {
+  return(0);
+  }
diff --git a/src/resmom/tmsock_recov.c b/src/resmom/tmsock_recov.c
index f39635dec7..fcb9cb60c2 100644
--- a/src/resmom/tmsock_recov.c
+++ b/src/resmom/tmsock_recov.c
@@ -20,6 +20,7 @@
 #include "log.h"
 #include "../lib/Liblog/pbs_log.h"
 #include "../lib/Liblog/log_event.h"
+#include "../lib/Libifl/lib_ifl.h"
 #include "svrfunc.h"
 
 
@@ -81,28 +82,28 @@ int recov_tmsock(
 
   static int sizeofint = sizeof(int);
 
-  if (read(fds, (char *)&pjob->ji_stdout, sizeofint) != sizeofint)
+  if (read_ac_socket(fds, (char *)&pjob->ji_stdout, sizeofint) != sizeofint)
     {
     log_err(errno, id, (char *)"read");
 
     return(1);
     }
 
-  if (read(fds, (char *)&pjob->ji_stderr, sizeofint) != sizeofint)
+  if (read_ac_socket(fds, (char *)&pjob->ji_stderr, sizeofint) != sizeofint)
     {
     log_err(errno, id, (char *)"read");
 
     return(1);
     }
 
-  if (read(fds, (char *)&pjob->ji_taskid, sizeof(tm_task_id)) != sizeof(tm_task_id))
+  if (read_ac_socket(fds, (char *)&pjob->ji_taskid, sizeof(tm_task_id)) != sizeof(tm_task_id))
     {
     log_err(errno, id, (char *)"read");
 
     return(1);
     }
 
-  if (read(fds, (char *)&pjob->ji_nodeid, sizeof(tm_node_id)) != sizeof(tm_node_id))
+  if (read_ac_socket(fds, (char *)&pjob->ji_nodeid, sizeof(tm_node_id)) != sizeof(tm_node_id))
     {
     log_err(errno, id, (char *)"read");
 
diff --git a/src/scheduler.basl/af_server.c b/src/scheduler.basl/af_server.c
index 4df1dd7868..db041109a0 100644
--- a/src/scheduler.basl/af_server.c
+++ b/src/scheduler.basl/af_server.c
@@ -224,7 +224,7 @@ get_4byte(
     } un;
 
   un.unl = 0;
-  amt = read(sock, (char *)(un.unc + sizeof(unsigned long) - 4), 4);
+  amt = read_ac_socket(sock, (char *)(un.unc + sizeof(unsigned long) - 4), 4);
 
   if (amt == 4)
     {
diff --git a/src/scheduler.basl/af_system.c b/src/scheduler.basl/af_system.c
index 9ce908adc7..2021cb760a 100644
--- a/src/scheduler.basl/af_system.c
+++ b/src/scheduler.basl/af_system.c
@@ -758,7 +758,7 @@ SystemInit(int argc, char *argv[])
 
   /* write schedulers pid into lockfile */
   (void)sprintf(log_buffer, "%ld\n", pid);
-  (void)write(lockfds, log_buffer, strlen(log_buffer) + 1);
+  (void)write_ac_socket(lockfds, log_buffer, strlen(log_buffer) + 1);
 
 #if (PLOCK_DAEMONS & 2)
   (void)plock(PROCLOCK);  /* lock daemon into memory */
diff --git a/src/scheduler.cc/get_4byte.c b/src/scheduler.cc/get_4byte.c
index 6ec597dd07..ca004ad0b4 100644
--- a/src/scheduler.cc/get_4byte.c
+++ b/src/scheduler.cc/get_4byte.c
@@ -83,15 +83,7 @@
 #if defined(NTOHL_NEEDS_ARPA_INET_H) && defined(HAVE_ARPA_INET_H)
 #include <arpa/inet.h>
 #endif
-
-
-
-/* FIXME: needs to move to a header file */
-#ifndef NEED_BLOCKING_CONNECTIONS
-extern ssize_t read_nonblocking_socket(int, void *, ssize_t);
-#endif
-
-
+#include "../lib/Libifl/lib_ifl.h"
 
 
 /*
@@ -122,7 +114,7 @@ int get_4byte(
 
   un.unl = 0;
 
-  amt = read(sock, (char *)(un.unc + sizeof(unsigned int) - 4), 4);
+  amt = read_ac_socket(sock, (char *)(un.unc + sizeof(unsigned int) - 4), 4);
 
   if (amt == 4)
     {
diff --git a/src/scheduler.cc/pbs_sched.c b/src/scheduler.cc/pbs_sched.c
index 199076b943..0790add99c 100644
--- a/src/scheduler.cc/pbs_sched.c
+++ b/src/scheduler.cc/pbs_sched.c
@@ -118,6 +118,7 @@
 #include "../lib/Liblog/pbs_log.h"
 #include "../lib/Liblog/setup_env.h"
 #include "../lib/Liblog/chk_file_sec.h"
+#include "../lib/Libifl/lib_ifl.h"
 #include "resmon.h"
 #include "sched_cmds.h"
 #include "server_limits.h"
@@ -162,7 +163,7 @@ void die(
   int sig)
 
   {
-  char *id = "die";
+  const char *id = "die";
 
   if (sig > 0)
     {
@@ -265,7 +266,7 @@ void toolong(
   int sig)
 
   {
-  char *id = "toolong";
+  const char *id = "toolong";
 
   struct stat sb;
   pid_t cpid;
@@ -363,7 +364,7 @@ socket_to_conn(int sock)
 
 int restricted(
 
-  char  *name)
+  const char  *name)
 
   {
   static  char    id[] = "restricted";
@@ -385,11 +386,11 @@ int restricted(
 
   if (mask_num > 0)
     {
-    newclients = realloc(maskclient, sizeof(pbs_net_t) * (mask_num + 1));
+    newclients = (pbs_net_t*)realloc(maskclient, sizeof(pbs_net_t) * (mask_num + 1));
     }
   else
     {
-    newclients = malloc(sizeof(pbs_net_t));
+    newclients = (pbs_net_t*)malloc(sizeof(pbs_net_t));
     }
 
   if (newclients == NULL)
@@ -412,7 +413,7 @@ int restricted(
 
 int addclient(
 
-  char *name)
+  const char *name)
 
   {
   static char     id[] = "addclient";
@@ -435,7 +436,7 @@ int addclient(
     {
     pbs_net_t *newclients;
 
-    newclients = realloc(okclients,
+    newclients = (pbs_net_t*)realloc(okclients,
                          sizeof(pbs_net_t) * (numclients + 1));
 
     if (newclients == NULL)
@@ -472,7 +473,7 @@ static int read_config(
   char *file)
 
   {
-  static char *id = "read_config";
+  static const char *id = "read_config";
 
   FILE *conf;
   int i;
@@ -481,8 +482,8 @@ static int read_config(
 
   struct specialconfig
     {
-    char *name;
-    int (*handler)();
+    const char *name;
+    int (*handler)(const char *name);
     } special[] =
 
     {
@@ -521,7 +522,7 @@ static int read_config(
       {
 
       if ((token = strtok(line, " \t")) == NULL)
-        token = "";
+        token = (char *)"";
 
       for (i = 0; special[i].name; i++)
         {
@@ -569,7 +570,7 @@ static int read_config(
 void
 restart(int sig)
   {
-  char    *id = "restart";
+  const char *id = "restart";
 
   if (sig)
     {
@@ -594,7 +595,7 @@ restart(int sig)
   }
 
 void
-badconn(char *msg)
+badconn(const char *msg)
   {
   static char id[] = "badconn";
 
@@ -648,7 +649,7 @@ int
 server_command(void)
 
   {
-  char *id = "server_command";
+  const char *id = "server_command";
 
   int           new_socket;
   torque_socklen_t slen;
@@ -759,7 +760,7 @@ int main(
   char *argv[])
 
   {
-  char  *id = "main";
+  const char  *id = "main";
 
   struct hostent *hp;
   int  go, c, errflg = 0;
@@ -767,9 +768,9 @@ int main(
   int  t = 1;
   pid_t  pid;
   char  host[100];
-  char  *homedir = PBS_SERVER_HOME;
+  const char  *homedir = PBS_SERVER_HOME;
   unsigned int port;
-  char  *dbfile = "sched_out";
+  const char  *dbfile = "sched_out";
 
   struct sigaction act;
   sigset_t oldsigs;
@@ -1173,7 +1174,7 @@ int main(
 
   (void)sprintf(log_buffer, "%ld\n", (long)pid);
 
-  if (write(lockfds, log_buffer, strlen(log_buffer) + 1) != (ssize_t)(strlen(log_buffer) + 1))
+  if (write_ac_socket(lockfds, log_buffer, strlen(log_buffer) + 1) != (ssize_t)(strlen(log_buffer) + 1))
     {
     perror("writing to lockfile");
 
diff --git a/src/scheduler.cc/samples/fifo/check.c b/src/scheduler.cc/samples/fifo/check.c
index 1f0ca114d6..6bdaddb302 100644
--- a/src/scheduler.cc/samples/fifo/check.c
+++ b/src/scheduler.cc/samples/fifo/check.c
@@ -497,7 +497,7 @@ int check_nodes(int pbs_sd, job_info *jinfo, node_info **ninfo_arr)
      */
 
     /* 7 = strlen("nodes=")  + '\0' */
-    if ((node_str = malloc(strlen(nodes -> res_str) + 7)) == NULL)
+    if ((node_str = (char *)malloc(strlen(nodes -> res_str) + 7)) == NULL)
       return SCHD_ERROR;
 
     sprintf(node_str, "nodes=%s", nodes -> res_str);
diff --git a/src/scheduler.cc/samples/fifo/fairshare.c b/src/scheduler.cc/samples/fifo/fairshare.c
index b0b44e010c..845f1a626d 100644
--- a/src/scheduler.cc/samples/fifo/fairshare.c
+++ b/src/scheduler.cc/samples/fifo/fairshare.c
@@ -139,7 +139,7 @@ void add_unknown(group_info *ginfo)
  * returns the found group_info or NULL
  *
  */
-group_info *find_group_info(char *name, group_info *root)
+group_info *find_group_info(const char *name, group_info *root)
   {
   group_info *ginfo;  /* the found group */
 
@@ -197,7 +197,7 @@ group_info *new_group_info()
   {
   group_info *new_group_info;  /* the new group */
 
-  if ((new_group_info = malloc(sizeof(group_info))) == NULL)
+  if ((new_group_info = (group_info *)malloc(sizeof(group_info))) == NULL)
     {
     perror("Error allocating memory");
     return NULL ;
@@ -358,7 +358,7 @@ preload_tree(void)
   if ((unknown = new_group_info()) == NULL)
     return 0;
 
-  if ((conf.group_root -> name = malloc(5 * sizeof(char))) == NULL)
+  if ((conf.group_root -> name = (char *)malloc(5 * sizeof(char))) == NULL)
     {
     perror("Memory allocation error");
     return 0;
diff --git a/src/scheduler.cc/samples/fifo/fairshare.h b/src/scheduler.cc/samples/fifo/fairshare.h
index 1d3482e7b1..ebb60daa71 100644
--- a/src/scheduler.cc/samples/fifo/fairshare.h
+++ b/src/scheduler.cc/samples/fifo/fairshare.h
@@ -90,7 +90,7 @@ void add_child(group_info *ginfo, group_info *parent);
  *      find_group_info - recursive function to find a ginfo in the
      resgroup tree
  */
-group_info *find_group_info(char *name, group_info *root);
+group_info *find_group_info(const char *name, group_info *root);
 
 /*
  *      find_alloc_ginfo - trys to find a ginfo in the fair share tree.  If it
diff --git a/src/scheduler.cc/samples/fifo/job_info.c b/src/scheduler.cc/samples/fifo/job_info.c
index 545c6d1ce6..3064f2b591 100644
--- a/src/scheduler.cc/samples/fifo/job_info.c
+++ b/src/scheduler.cc/samples/fifo/job_info.c
@@ -112,7 +112,7 @@ job_info **query_jobs(int pbs_sd, queue_info *qinfo)
 
   struct attropl opl =
     {
-    NULL, ATTR_q, NULL, NULL, EQ
+    NULL, (char *)ATTR_q, NULL, NULL, EQ
     };
 
   /* linked list of jobs returned from pbs_selstat() */
@@ -684,7 +684,7 @@ int update_job_comment(int pbs_sd, job_info *jinfo, char *comment)
 
   struct attrl attr =
     {
-    NULL, ATTR_comment, NULL, NULL, 0
+    NULL, ATTR_comment, NULL, NULL, SET
     };
 
   int         local_errno = 0;
@@ -789,7 +789,7 @@ job_info **job_filter(job_info** jobs, int size,
   job_info **tmp = NULL;
   int i, j = 0;
 
-  if ((new_jobs = malloc((size + 1) * sizeof(job_info *))) == NULL)
+  if ((new_jobs = (job_info **)malloc((size + 1) * sizeof(job_info *))) == NULL)
     {
     perror("Memory allocation error");
     return NULL;
@@ -804,7 +804,7 @@ job_info **job_filter(job_info** jobs, int size,
       }
     }
 
-  if ((tmp = realloc(new_jobs, (j + 1) * sizeof(job_info *))) == NULL)
+  if ((tmp = (job_info **)realloc(new_jobs, (j + 1) * sizeof(job_info *))) == NULL)
     {
     free(new_jobs);
     perror("Memory Allocation Error");
diff --git a/src/scheduler.cc/samples/fifo/misc.c b/src/scheduler.cc/samples/fifo/misc.c
index f42263bcc6..c0ee36b082 100644
--- a/src/scheduler.cc/samples/fifo/misc.c
+++ b/src/scheduler.cc/samples/fifo/misc.c
@@ -229,10 +229,10 @@ int skip_line(char *line)
  *
  */
 
-void sched_log(int event, int class, char *name, char *text)
+void sched_log(int event, int cls, const char *name, const char *text)
   {
   if (!(conf.log_filter & event) && text[0] != '\0')
-    log_record(event, class, name, text);
+    log_record(event, cls, name, text);
   }
 
 /*
diff --git a/src/scheduler.cc/samples/fifo/misc.h b/src/scheduler.cc/samples/fifo/misc.h
index 58fe095d2c..17fcc8fbf9 100644
--- a/src/scheduler.cc/samples/fifo/misc.h
+++ b/src/scheduler.cc/samples/fifo/misc.h
@@ -108,7 +108,7 @@ int skip_line(char *line);
  *      sched_log - write a log entry to the scheduler log file using log_record
  */
 
-void sched_log(int event, int class, char *name, char *text);
+void sched_log(int event, int cls, const char *name, const char *text);
 
 /*
  *      break_comma_list - break apart a comma delemetd string into an arary
diff --git a/src/scheduler.cc/samples/fifo/node_info.c b/src/scheduler.cc/samples/fifo/node_info.c
index 687cc51b85..447e2c3a09 100644
--- a/src/scheduler.cc/samples/fifo/node_info.c
+++ b/src/scheduler.cc/samples/fifo/node_info.c
@@ -546,7 +546,7 @@ node_info **node_filter(node_info **nodes, int size,
     free(new_nodes);
     new_nodes = NULL;
     }
-  else if ((tmp = realloc(new_nodes, (j + 1) * sizeof(node_info *))) == NULL)
+  else if ((tmp = (node_info **)realloc(new_nodes, (j + 1) * sizeof(node_info *))) == NULL)
     {
     perror("Memory Allocation Error");
     free(new_nodes);
diff --git a/src/scheduler.cc/samples/fifo/parse.c b/src/scheduler.cc/samples/fifo/parse.c
index 8a5ff856dd..b9081b859e 100644
--- a/src/scheduler.cc/samples/fifo/parse.c
+++ b/src/scheduler.cc/samples/fifo/parse.c
@@ -361,7 +361,7 @@ init_config(void)
   memset(&conf, 0, sizeof(struct config));
   memset(&cstat, 0, sizeof(struct status));
 
-  if ((conf.prime_sort = malloc((num_sorts + 1) * sizeof(struct sort_info)))
+  if ((conf.prime_sort = (struct sort_info *)malloc((num_sorts + 1) * sizeof(struct sort_info)))
       == NULL)
     {
     perror("Error Allocating Memory");
@@ -370,7 +370,7 @@ init_config(void)
 
   memset(conf.prime_sort, 0, (num_sorts + 1) * sizeof(struct sort_info));
 
-  if ((conf.non_prime_sort = malloc((num_sorts + 1) * sizeof(struct sort_info)
+  if ((conf.non_prime_sort = (struct sort_info *)malloc((num_sorts + 1) * sizeof(struct sort_info)
                                    )) == NULL)
     {
     perror("Error Allocating Memory");
diff --git a/src/scheduler.cc/samples/fifo/queue_info.c b/src/scheduler.cc/samples/fifo/queue_info.c
index ab24b06cb0..fc38618949 100644
--- a/src/scheduler.cc/samples/fifo/queue_info.c
+++ b/src/scheduler.cc/samples/fifo/queue_info.c
@@ -355,7 +355,7 @@ queue_info *new_queue_info()
   {
   queue_info *qinfo;
 
-  if ((qinfo = malloc(sizeof(queue_info))) == NULL)
+  if ((qinfo = (queue_info *)malloc(sizeof(queue_info))) == NULL)
     return NULL;
 
   qinfo -> is_started  = 0;
diff --git a/src/scheduler.cc/samples/fifo/server_info.c b/src/scheduler.cc/samples/fifo/server_info.c
index bbbd9a85ef..ce61679dff 100644
--- a/src/scheduler.cc/samples/fifo/server_info.c
+++ b/src/scheduler.cc/samples/fifo/server_info.c
@@ -474,7 +474,7 @@ resource *new_resource()
   {
   resource *resp;  /* the new resource */
 
-  if ((resp = malloc(sizeof(resource))) == NULL)
+  if ((resp = (resource *)malloc(sizeof(resource))) == NULL)
     return NULL;
 
   resp -> next = NULL;
diff --git a/src/scheduler.tcl/pbs_sched.c b/src/scheduler.tcl/pbs_sched.c
index ac7e3afd77..7fce80903d 100644
--- a/src/scheduler.tcl/pbs_sched.c
+++ b/src/scheduler.tcl/pbs_sched.c
@@ -394,7 +394,7 @@ start_tcl(void)
     die(0);
     }
 
-  for (tot = 0; (len = read(fd, buf, sizeof(buf))) > 0; tot += len)
+  for (tot = 0; (len = read_ac_socket(fd, buf, sizeof(buf))) > 0; tot += len)
     {
     if ((body = realloc(body, tot + len + 1)) == NULL)
       {
@@ -1112,7 +1112,7 @@ char *argv[];
 
   /* write schedulers pid into lockfile */
   (void)sprintf(log_buffer, "%d\n", pid);
-  (void)write(lockfds, log_buffer, strlen(log_buffer) + 1);
+  (void)write_ac_socket(lockfds, log_buffer, strlen(log_buffer) + 1);
 
 #if (PLOCK_DAEMONS & 2)
   (void)plock(PROCLOCK); /* lock daemon into memory */
diff --git a/src/server/accounting.c b/src/server/accounting.c
index 1259a89dea..a2f9adcd84 100644
--- a/src/server/accounting.c
+++ b/src/server/accounting.c
@@ -191,14 +191,14 @@ int acct_job(
     {
     /* queue name */
     sprintf(local_buf, "queue=%s ", pque->qu_qs.qu_name);
-    unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+    unlock_queue(pque, __func__, NULL, LOGLEVEL);
 
     if ((rc = append_dynamic_string(ds, local_buf)) != PBSE_NONE)
       return(rc);
     }
   else if (pjob == NULL)
     {
-    log_err(PBSE_JOBNOTFOUND, __func__, (char *)"Job lost while acquiring queue 1");
+    log_err(PBSE_JOBNOTFOUND, __func__, "Job lost while acquiring queue 1");
     return(PBSE_JOBNOTFOUND);
     }
 
@@ -421,7 +421,7 @@ void account_record(
 
   int   acctype, /* accounting record type */
   job  *pjob,
-  char *text)  /* text to log, may be null */
+  const char *text)  /* text to log, may be null */
 
   {
   time_t     time_now = time(NULL);
@@ -611,7 +611,7 @@ void acct_cleanup(
 
   if (log_remove_old(path_acct,(days_to_keep * SECS_PER_DAY)) != 0)
     {
-    log_err(-1, __func__, (char *)"failure occurred when checking for old accounting logs");
+    log_err(-1, __func__, "failure occurred when checking for old accounting logs");
     }
 
   return;
diff --git a/src/server/accounting.h b/src/server/accounting.h
index 3c9c846ceb..976b12077d 100644
--- a/src/server/accounting.h
+++ b/src/server/accounting.h
@@ -10,7 +10,7 @@ int acct_open(char *filename);
 
 void acct_close(void);
 
-void account_record(int acctype, job *pjob, char *text);
+void account_record(int acctype, job *pjob, const char *text);
 
 void account_jobstr(job *pjob);
 
diff --git a/src/server/array_func.c b/src/server/array_func.c
index 7b66bd66b9..f09c66f15a 100644
--- a/src/server/array_func.c
+++ b/src/server/array_func.c
@@ -33,6 +33,7 @@
 #include "log.h"
 #include "../lib/Liblog/pbs_log.h"
 #include "../lib/Liblog/log_event.h"
+#include "../lib/Libifl/lib_ifl.h"
 #include "list_link.h"
 #include "attribute.h"
 #include "server_limits.h"
@@ -47,6 +48,7 @@
 #include "svr_func.h"
 #include "job_func.h" /* svr_job_purge */
 #include "ji_mutex.h"
+#include "batch_request.h"
 
 extern int array_upgrade(job_array *, int, int, int *);
 extern char *get_correct_jobname(const char *jobid);
@@ -161,7 +163,7 @@ job_array *get_array(
   pa = (job_array *)get_from_hash_map(allarrays.hm, id);
 
   if (pa != NULL)
-    lock_ai_mutex(pa, __func__, (char *)NULL, LOGLEVEL);
+    lock_ai_mutex(pa, __func__, NULL, LOGLEVEL);
 
   pthread_mutex_unlock(allarrays.allarrays_mutex);
 
@@ -191,7 +193,7 @@ int array_save(
     return -1;
     }
 
-  if (write(fds,  &(pa->ai_qs), sizeof(struct array_info)) == -1)
+  if (write_ac_socket(fds,  &(pa->ai_qs), sizeof(struct array_info)) == -1)
     {
     unlink(namebuf);
     close(fds);
@@ -204,7 +206,7 @@ int array_save(
        rn = (array_request_node*)GET_NEXT(rn->request_tokens_link), num_tokens++);
 
 
-  if (write(fds, &num_tokens, sizeof(num_tokens)) == -1)
+  if (write_ac_socket(fds, &num_tokens, sizeof(num_tokens)) == -1)
     {
     unlink(namebuf);
     close(fds);
@@ -217,7 +219,7 @@ int array_save(
     for (rn = (array_request_node*)GET_NEXT(pa->request_tokens); rn != NULL;
          rn = (array_request_node*)GET_NEXT(rn->request_tokens_link))
       {
-      if (write(fds, rn, sizeof(array_request_node)) == -1)
+      if (write_ac_socket(fds, rn, sizeof(array_request_node)) == -1)
         {
         unlink(namebuf);
         close(fds);
@@ -298,7 +300,7 @@ int read_and_convert_259_array(
     return PBSE_SYSTEM;
     }
 
-  len = read(fd, &(pa_259->ai_qs), sizeof(pa_259->ai_qs));
+  len = read_ac_socket(fd, &(pa_259->ai_qs), sizeof(pa_259->ai_qs));
   if (len < 0) 
     {
     sprintf(log_buf, "error reading %s", path);
@@ -413,7 +415,7 @@ int array_recov(
     /* read the file into the struct previously allocated.
      */
 
-    len = read(fd, &(pa->ai_qs), sizeof(pa->ai_qs));
+    len = read_ac_socket(fd, &(pa->ai_qs), sizeof(pa->ai_qs));
     if ((len < 0) || ((len < (int)sizeof(pa->ai_qs)) && (pa->ai_qs.struct_version == ARRAY_QS_STRUCT_VERSION)))
       {
       sprintf(log_buf, "error reading %s", path);
@@ -445,7 +447,7 @@ int array_recov(
 
   if (old_version > 1)
     {
-    if (read(fd, &num_tokens, sizeof(int)) != sizeof(int))
+    if (read_ac_socket(fd, &num_tokens, sizeof(int)) != sizeof(int))
       {
       sprintf(log_buf, "error reading token count from %s", path);
       log_err(errno, __func__, log_buf);
@@ -459,7 +461,7 @@ int array_recov(
       {
       rn = (array_request_node *)calloc(1, sizeof(array_request_node));
 
-      if (read(fd, rn, sizeof(array_request_node)) != sizeof(array_request_node))
+      if (read_ac_socket(fd, rn, sizeof(array_request_node)) != sizeof(array_request_node))
         {
         sprintf(log_buf, "error reading array_request_node from %s", path);
         log_err(errno, __func__, log_buf);
@@ -501,7 +503,7 @@ int array_recov(
   pa->ai_mutex = (pthread_mutex_t *)calloc(1, sizeof(pthread_mutex_t));
   pthread_mutex_init(pa->ai_mutex,NULL);
 
-  lock_ai_mutex(pa, __func__, (char *)NULL, LOGLEVEL);
+  lock_ai_mutex(pa, __func__, NULL, LOGLEVEL);
 
   /* link the struct into the servers list of job arrays */
   insert_array(pa);
@@ -534,7 +536,7 @@ int array_delete(
   remove_array(pa);
 
   /* unlock the mutex and free it */
-  unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+  unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
   free(pa->ai_mutex);
 
   /* delete the on disk copy of the struct */
@@ -691,12 +693,12 @@ int setup_array_struct(
 
   pa->ai_mutex = (pthread_mutex_t *)calloc(1, sizeof(pthread_mutex_t));
   pthread_mutex_init(pa->ai_mutex, NULL);
-  lock_ai_mutex(pa, __func__, (char *)NULL, LOGLEVEL);
+  lock_ai_mutex(pa, __func__, NULL, LOGLEVEL);
 
   if (job_save(pjob, SAVEJOB_FULL, 0) != 0)
     {
     /* the array is deleted in svr_job_purge */
-    unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+    unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
     /* Does job array need to be removed? */
 
     if (LOGLEVEL >= 6)
@@ -791,7 +793,7 @@ int setup_array_struct(
 
   insert_array(pa);
 
-  unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+  unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
 
   return(PBSE_NONE);
   } /* END setup_array_struct() */
@@ -1138,7 +1140,7 @@ int delete_array_range(
         if (pjob->ji_qs.ji_state >= JOB_STATE_EXITING)
           {
           /* invalid state for request,  skip */
-          unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
           continue;
           }
 
@@ -1151,7 +1153,7 @@ int delete_array_range(
           {
           /* if the job was deleted, this mutex would be taked care of elsewhere. When it fails,
            * release it here */
-          unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
           num_skipped++;
           }
@@ -1242,7 +1244,7 @@ int delete_whole_array(
       if (pjob->ji_qs.ji_state >= JOB_STATE_EXITING)
         {
         /* invalid state for request,  skip */
-        unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
         continue;
         }
         
@@ -1255,7 +1257,7 @@ int delete_whole_array(
         {
         /* if the job was deleted, this mutex would be taked care of elsewhere.
          * When it fails, release it here */
-        unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
         num_skipped++;
         }
       else if (running == FALSE)
@@ -1408,10 +1410,10 @@ int release_array_range(
         {
         if ((rc = release_job(preq,pjob)))
           {
-          unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
           return(rc);
           }
-        unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
         }
       }
     
@@ -1507,18 +1509,18 @@ int modify_array_range(
                   pjob->ji_qs.ji_jobid);
                 log_err(rc, __func__, log_buf);
                 
-                unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+                unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
                 
                 return(rc); /* unable to get to MOM */
                 }
               else
                 {
-                unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+                unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
                 post_modify_arrayreq(array_req);
                 }
               }
             else
-              unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+              unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
             }
           else
             pa->job_ids[i] = NULL;
@@ -1651,12 +1653,12 @@ void update_array_values(
                 svr_evaljobstate(pj, &newstate, &newsub, 1);
                 svr_setjobstate(pj, newstate, newsub, FALSE);
                 job_save(pj, SAVEJOB_FULL, 0);
-                unlock_ji_mutex(pj, __func__, (char *)"1", LOGLEVEL);
+                unlock_ji_mutex(pj, __func__, "1", LOGLEVEL);
                 
                 break;
                 }
 
-              unlock_ji_mutex(pj, __func__, (char *)"2", LOGLEVEL);
+              unlock_ji_mutex(pj, __func__, "2", LOGLEVEL);
               }
             }
           }
@@ -1709,7 +1711,7 @@ void update_array_statuses()
       }
 
     strcpy(jobid, pa->ai_qs.parent_id);
-    unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+    unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
     
     if ((pjob = svr_find_job(jobid, TRUE)) != NULL)
       {
@@ -1728,7 +1730,7 @@ void update_array_statuses()
         svr_setjobstate(pjob, JOB_STATE_QUEUED, pjob->ji_qs.ji_substate, FALSE);
         }
 
-      unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
       }
     } /* END for each array */
 
@@ -1826,7 +1828,7 @@ int insert_array(
 
   if ((rc = add_to_hash_map(allarrays.hm, pa, pa->ai_qs.parent_id)) == ENOMEM)
     {
-    log_err(rc, __func__, (char *)"No memory to resize the array...SYSTEM FAILURE\n");
+    log_err(rc, __func__, "No memory to resize the array...SYSTEM FAILURE\n");
     }
 
   pthread_mutex_unlock(allarrays.allarrays_mutex);
@@ -1850,13 +1852,13 @@ int remove_array(
     {
     strcpy(arrayid, pa->ai_qs.parent_id);
 
-    unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+    unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
     pthread_mutex_lock(allarrays.allarrays_mutex);
 
     pa = (job_array *)get_from_hash_map(allarrays.hm, arrayid);
 
     if (pa != NULL)
-      lock_ai_mutex(pa, __func__, (char *)"2", LOGLEVEL);
+      lock_ai_mutex(pa, __func__, "2", LOGLEVEL);
     }
 
   if (pa == NULL)
@@ -1885,7 +1887,7 @@ job_array *next_array(
   pa = (job_array *)next_from_hash_map(allarrays.hm, iter);
   
   if (pa != NULL)
-    lock_ai_mutex(pa, __func__, (char *)NULL, LOGLEVEL);
+    lock_ai_mutex(pa, __func__, NULL, LOGLEVEL);
 
   pthread_mutex_unlock(allarrays.allarrays_mutex);
 
@@ -1908,7 +1910,7 @@ job_array *next_array_check(
 
   if ((pa != NULL) &&
       (pa != owned))
-    lock_ai_mutex(pa, __func__, (char *)NULL, LOGLEVEL);
+    lock_ai_mutex(pa, __func__, NULL, LOGLEVEL);
   
   pthread_mutex_unlock(allarrays.allarrays_mutex);
 
diff --git a/src/server/array_upgrade.c b/src/server/array_upgrade.c
index cad13fbf4b..78c64bd7b9 100644
--- a/src/server/array_upgrade.c
+++ b/src/server/array_upgrade.c
@@ -105,7 +105,7 @@ int array_upgrade_v1(job_array *pa, int fds, int version, int *old_version)
   struct array_info_v1 old_array_info;
   array_request_node *rn;
 
-  if (read(fds, (char*)&old_array_info,
+  if (read_ac_socket(fds, (char*)&old_array_info,
            sizeof(old_array_info)) != sizeof(old_array_info))
     {
     return -1;
diff --git a/src/server/attr_recov.c b/src/server/attr_recov.c
index 6fb4c02e55..a54cff5418 100644
--- a/src/server/attr_recov.c
+++ b/src/server/attr_recov.c
@@ -101,6 +101,7 @@
 #include "attribute.h"
 #include "log.h"
 #include "../lib/Liblog/pbs_log.h"
+#include "../lib/Libifl/lib_ifl.h"
 #include "svrfunc.h"
 #include "utils.h"
 #include "server.h"
@@ -158,7 +159,7 @@ int save_struct(
       if (write_buffer(buf_ptr, buf_size, fds) != PBSE_NONE)
         {
         /* FAILURE */
-        log_err(-1, __func__, (char *)"Cannot write the buffer to the file!");
+        log_err(-1, __func__, "Cannot write the buffer to the file!");
         return(-1);
         }
       else
@@ -381,11 +382,11 @@ int recov_attr(
 
   while (1)
     {
-    i = read(fd, (char *) & tempal, sizeof(tempal));
+    i = read_ac_socket(fd, (char *) & tempal, sizeof(tempal));
 
     if (i != sizeof(tempal))
       {
-      log_err(errno, __func__, (char *)"read1");
+      log_err(errno, __func__, "read1");
 
       return(-1);
       }
@@ -395,7 +396,7 @@ int recov_attr(
 
     if (tempal.al_tsize <= (int)sizeof(tempal))
       {
-      log_err(-1, __func__, (char *)"attr size too small");
+      log_err(-1, __func__, "attr size too small");
 
       return(-1);
       }
@@ -408,7 +409,7 @@ int recov_attr(
 
     if (pal == NULL)
       {
-      log_err(errno, __func__, (char *)"calloc failed");
+      log_err(errno, __func__, "calloc failed");
 
       return(-1);
       }
@@ -421,11 +422,11 @@ int recov_attr(
 
     amt = pal->al_tsize - sizeof(svrattrl);
 
-    i = read(fd, (char *)pal + sizeof(svrattrl), amt);
+    i = read_ac_socket(fd, (char *)pal + sizeof(svrattrl), amt);
 
     if (i != amt)
       {
-      log_err(errno, __func__, (char *)"read2");
+      log_err(errno, __func__, "read2");
 
       free(pal);
 
@@ -468,7 +469,7 @@ int recov_attr(
         }
       else
         {
-        log_err(-1, __func__, (char *)"unknown attribute discarded");
+        log_err(-1, __func__, "unknown attribute discarded");
 
         free(pal);
 
diff --git a/src/server/batch_request.c b/src/server/batch_request.c
index 93c554b0ac..ce2a22f12c 100644
--- a/src/server/batch_request.c
+++ b/src/server/batch_request.c
@@ -113,7 +113,7 @@ void initialize_batch_request_holder()
   {
   brh.brh_ra = initialize_resizable_array(INITIAL_REQUEST_HOLDER_SIZE);
 
-  brh.brh_mutex = calloc(1, sizeof(pthread_mutex_t));
+  brh.brh_mutex = (pthread_mutex_t*)calloc(1, sizeof(pthread_mutex_t));
   pthread_mutex_init(brh.brh_mutex, NULL);
 
   brh.brh_ht = create_hash(INITIAL_HASH_SIZE);
diff --git a/src/server/display_alps_status.c b/src/server/display_alps_status.c
index 6af33c4a9b..816edb0f15 100644
--- a/src/server/display_alps_status.c
+++ b/src/server/display_alps_status.c
@@ -24,7 +24,7 @@ int get_alps_statuses(
   while ((alps_node = next_host(&(parent->alps_subnodes), &iter, NULL)) != NULL)
     {
     rc = status_node(alps_node, preq, bad, pstathd);
-    unlock_node(alps_node, __func__, (char *)NULL, 0);
+    unlock_node(alps_node, __func__, NULL, 0);
 
     if (rc != PBSE_NONE)
       break;
diff --git a/src/server/exiting_jobs.c b/src/server/exiting_jobs.c
index 0f5ef395aa..4ea411feea 100644
--- a/src/server/exiting_jobs.c
+++ b/src/server/exiting_jobs.c
@@ -105,7 +105,7 @@ int record_job_as_exiting(
   job *pjob)
 
   {
-  job_exiting_retry_info *jeri = calloc(1, sizeof(job_exiting_retry_info));
+  job_exiting_retry_info *jeri = (job_exiting_retry_info*)calloc(1, sizeof(job_exiting_retry_info));
 
   if (jeri == NULL)
     return(ENOMEM);
@@ -124,7 +124,7 @@ int remove_job_from_exiting_list(
   job *pjob)
 
   {
-  job_exiting_retry_info *jeri = get_remove_from_hash_map(exiting_jobs_info, pjob->ji_qs.ji_jobid);
+  job_exiting_retry_info *jeri = (job_exiting_retry_info*)get_remove_from_hash_map(exiting_jobs_info, pjob->ji_qs.ji_jobid);
 
   if (jeri != NULL)
     {
@@ -209,11 +209,11 @@ int check_exiting_jobs()
         if (pjob->ji_qs.ji_state == JOB_STATE_COMPLETE)
           {
           remove_entry_from_exiting_list(jeri);
-          unlock_ji_mutex(pjob, __func__, (char *)NULL, LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, NULL, LOGLEVEL);
           }
         else
           {
-          unlock_ji_mutex(pjob, __func__, (char *)NULL, LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, NULL, LOGLEVEL);
           retry_job_exit(jeri);
           }
         }
diff --git a/src/server/geteusernam.c b/src/server/geteusernam.c
index 75ada42cdf..759aa689b3 100644
--- a/src/server/geteusernam.c
+++ b/src/server/geteusernam.c
@@ -640,7 +640,7 @@ int set_jobexid(
       }
     else
       {
-      log_err(errno, __func__, (char *)"getpwnam failed");
+      log_err(errno, __func__, "getpwnam failed");
 
       if (EMsg != NULL)
         snprintf(EMsg, 1024, "user does not exist in server password file");
diff --git a/src/server/issue_request.c b/src/server/issue_request.c
index 10b8a144f2..9b3444c5b4 100644
--- a/src/server/issue_request.c
+++ b/src/server/issue_request.c
@@ -98,11 +98,11 @@
 #include "list_link.h"
 #include "attribute.h"
 #include "credential.h"
-#include "batch_request.h"
 #include "log.h"
 #include "../lib/Liblog/pbs_log.h"
 #include "../lib/Liblog/log_event.h"
 #include "work_task.h"
+#include "batch_request.h"
 #include "net_connect.h"
 #include "svrfunc.h"
 #include "pbs_nodes.h"
@@ -184,7 +184,7 @@ int relay_to_mom(
   if ((node != NULL) &&
       (node->nd_state & INUSE_DOWN))
     {
-    unlock_node(node, __func__, (char *)"no rely mom", LOGLEVEL);
+    unlock_node(node, __func__, "no rely mom", LOGLEVEL);
     return(PBSE_NORELYMOM);
     }
 
@@ -198,7 +198,7 @@ int relay_to_mom(
     free(tmp);
     }
 
-  unlock_node(node, __func__, (char *)"after svr_connect", LOGLEVEL);
+  unlock_node(node, __func__, "after svr_connect", LOGLEVEL);
   handle = svr_connect(
            pjob->ji_qs.ji_un.ji_exect.ji_momaddr,
            pjob->ji_qs.ji_un.ji_exect.ji_momport,
@@ -216,7 +216,7 @@ int relay_to_mom(
     }
 
   strcpy(jobid, pjob->ji_qs.ji_jobid);
-  unlock_ji_mutex(pjob, __func__, (char *)NULL, LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, NULL, LOGLEVEL);
 
   request->rq_orgconn = request->rq_conn; /* save client socket */
 
diff --git a/src/server/issue_request.h b/src/server/issue_request.h
index cf5ca6bebd..5f2f339918 100644
--- a/src/server/issue_request.h
+++ b/src/server/issue_request.h
@@ -3,8 +3,8 @@
 #include "license_pbs.h" /* See here for the software license */
 
 #include "pbs_job.h" /* job */
-#include "batch_request.h" /* batch_request */
 #include "work_task.h" /* work_task */
+#include "batch_request.h" /* batch_request */
 
 /* static void reissue_to_svr(struct work_task *pwt); */
 
diff --git a/src/server/job_container.c b/src/server/job_container.c
index 875bd43803..f7d2ad52e6 100644
--- a/src/server/job_container.c
+++ b/src/server/job_container.c
@@ -136,7 +136,7 @@ char *get_correct_jobname(
   if (display_suffix == FALSE)
     server_suffix = FALSE;
 
-  if ((dot = strchr(jobid,'.')) != NULL)
+  if ((dot = strchr((char *)jobid,'.')) != NULL)
     {
     first_suffix = dot + 1;
 
@@ -163,7 +163,7 @@ char *get_correct_jobname(
         correct = strdup(jobid);
 
         if (correct == NULL)
-          log_err(-1, __func__, (char *)"ERROR:    Fatal - Cannot allocate memory\n");
+          log_err(-1, __func__, "ERROR:    Fatal - Cannot allocate memory\n");
 
         return(correct);
         }
@@ -172,11 +172,11 @@ char *get_correct_jobname(
       {
       /* alloc memory and sprint, add 3 for 2 '.' and NULL terminator */
       len = strlen(jobid) + strlen(server_name) + strlen(alias) + 3;
-      correct = calloc(1, len);
+      correct = (char *)calloc(1, len);
 
       if (correct == NULL)
         {
-        log_err(-1, __func__, (char *)"ERROR:    Fatal - Cannot allocate memory\n");
+        log_err(-1, __func__, "ERROR:    Fatal - Cannot allocate memory\n");
         return(NULL);
         }
 
@@ -188,11 +188,11 @@ char *get_correct_jobname(
       /* add 2 for null terminator and '.' */
       len = strlen(alias) + 2 + strlen(jobid);
 
-      correct = calloc(1, len);
+      correct = (char *)calloc(1, len);
 
       if (correct == NULL)
         {
-        log_err(-1, __func__, (char *)"ERROR:    Fatal - Cannot allocate memory\n");
+        log_err(-1, __func__, "ERROR:    Fatal - Cannot allocate memory\n");
         return(NULL);
         }
 
@@ -211,11 +211,11 @@ char *get_correct_jobname(
 
       len = strlen(jobid) + 1 ;
 
-      correct = calloc(1, len);
+      correct = (char *)calloc(1, len);
 
       if (correct == NULL)
         {
-        log_err(-1, __func__, (char *)"ERROR:    Fatal - Cannot allocate memory\n");
+        log_err(-1, __func__, "ERROR:    Fatal - Cannot allocate memory\n");
         return(NULL);
         }
 
@@ -228,7 +228,7 @@ char *get_correct_jobname(
 
       if (correct == NULL)
         {
-        log_err(-1, __func__, (char *)"ERROR:    Fatal - Cannot allocate memory\n");
+        log_err(-1, __func__, "ERROR:    Fatal - Cannot allocate memory\n");
         return(NULL);
         }
       }
@@ -236,11 +236,11 @@ char *get_correct_jobname(
       {
       len = strlen(jobid) + strlen(server_name) + 2;
 
-      correct = calloc(1, len);
+      correct = (char *)calloc(1, len);
 
       if (correct == NULL)
         {
-        log_err(-1, __func__, (char *)"ERROR:    Fatal - Cannot allocate memory\n");
+        log_err(-1, __func__, "ERROR:    Fatal - Cannot allocate memory\n");
         return(NULL);
         }
 
@@ -256,11 +256,11 @@ char *get_correct_jobname(
       {
       len = strlen(jobid) + strlen(alias) + 2;
 
-      correct = calloc(1, len);
+      correct = (char *)calloc(1, len);
 
       if (correct == NULL)
         {
-        log_err(-1, __func__, (char *)"ERROR:    Fatal - Cannot allocate memory\n");
+        log_err(-1, __func__, "ERROR:    Fatal - Cannot allocate memory\n");
         return(NULL);
         }
 
@@ -274,11 +274,11 @@ char *get_correct_jobname(
       *dot = '\0';
 
       len += strlen(jobid);
-      correct = calloc(1, len);
+      correct = (char *)calloc(1, len);
 
       if (correct == NULL)
         {
-        log_err(-1, __func__, (char *)"ERROR:    Fatal - Cannot allocate memory\n");
+        log_err(-1, __func__, "ERROR:    Fatal - Cannot allocate memory\n");
         return(NULL);
         }
 
@@ -299,11 +299,11 @@ char *get_correct_jobname(
       }
 
     len = strlen(jobid) + 1;
-    correct = calloc(1, len);
+    correct = (char *)calloc(1, len);
 
     if (correct == NULL)
       {
-      log_err(-1, __func__, (char *)"ERROR:    Fatal - Cannot allocate memory\n");
+      log_err(-1, __func__, "ERROR:    Fatal - Cannot allocate memory\n");
       return(NULL);
       }
 
@@ -342,7 +342,7 @@ job *find_job_by_array(
   if (i >= 0)
     pj = (job *)aj->ra->slots[i].item;
   if (pj != NULL)
-    lock_ji_mutex(pj, __func__, (char *)NULL, LOGLEVEL);
+    lock_ji_mutex(pj, __func__, NULL, LOGLEVEL);
   
   pthread_mutex_unlock(aj->alljobs_mutex);
   
@@ -353,14 +353,14 @@ job *find_job_by_array(
       if (pj->ji_cray_clone != NULL)
         {
         pj = pj->ji_cray_clone;
-        unlock_ji_mutex(pj->ji_parent_job, __func__, (char *)NULL, LOGLEVEL);
-        lock_ji_mutex(pj, __func__, (char *)NULL, LOGLEVEL);
+        unlock_ji_mutex(pj->ji_parent_job, __func__, NULL, LOGLEVEL);
+        lock_ji_mutex(pj, __func__, NULL, LOGLEVEL);
         }
       }
 
     if (pj->ji_being_recycled == TRUE)
       {
-      unlock_ji_mutex(pj, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pj, __func__, "1", LOGLEVEL);
       pj = NULL;
       }
     }
@@ -467,18 +467,18 @@ job *svr_find_job(
         {
         pj = pj->ji_external_clone;
         
-        lock_ji_mutex(pj, __func__, (char *)NULL, 0);
-        unlock_ji_mutex(pj->ji_parent_job, __func__, (char *)NULL, 0);
+        lock_ji_mutex(pj, __func__, NULL, 0);
+        unlock_ji_mutex(pj->ji_parent_job, __func__, NULL, 0);
 
         if (pj->ji_being_recycled == TRUE)
           {
-          unlock_ji_mutex(pj, __func__, (char *)NULL, 0);
+          unlock_ji_mutex(pj, __func__, NULL, 0);
           pj = NULL;
           }
         }
       else
         {
-        unlock_ji_mutex(pj, __func__, (char *)NULL, 0);
+        unlock_ji_mutex(pj, __func__, NULL, 0);
         pj = NULL;
         }
       }
@@ -502,7 +502,7 @@ void initialize_all_jobs_array(
   aj->ra = initialize_resizable_array(INITIAL_JOB_SIZE);
   aj->ht = create_hash(INITIAL_HASH_SIZE);
 
-  aj->alljobs_mutex = calloc(1, sizeof(pthread_mutex_t));
+  aj->alljobs_mutex = (pthread_mutex_t*)calloc(1, sizeof(pthread_mutex_t));
   pthread_mutex_init(aj->alljobs_mutex, NULL);
   } /* END initialize_all_jobs_array() */
 
@@ -528,7 +528,7 @@ int insert_job(
   if ((rc = insert_thing(aj->ra,pjob)) == -1)
     {
     rc = ENOMEM;
-    log_err(rc, __func__, (char *)"No memory to resize the array...SYSTEM FAILURE\n");
+    log_err(rc, __func__, "No memory to resize the array...SYSTEM FAILURE\n");
     }
   else
     {
@@ -574,7 +574,7 @@ int insert_job_after(
     if ((rc = insert_thing_after(aj->ra,pjob,i)) == -1)
       {
       rc = ENOMEM;
-      log_err(rc, __func__, (char *)"No memory to resize the array...SYSTEM FAILURE");
+      log_err(rc, __func__, "No memory to resize the array...SYSTEM FAILURE");
       }
     else
       {
@@ -605,7 +605,7 @@ int insert_job_after_index(
   if ((rc = insert_thing_after(aj->ra, pjob, index)) == -1)
     {
     rc = ENOMEM;
-    log_err(rc, __func__, (char *)"No memory to resize the array...SYSTEM FAILURE");
+    log_err(rc, __func__, "No memory to resize the array...SYSTEM FAILURE");
     }
   else
     {
@@ -637,7 +637,7 @@ int insert_job_first(
   if ((rc = insert_thing_after(aj->ra,pjob,ALWAYS_EMPTY_INDEX)) == -1)
     {
     rc = ENOMEM;
-    log_err(rc, __func__, (char *)"No memory to resize the array...SYSTEM FAILURE");
+    log_err(rc, __func__, "No memory to resize the array...SYSTEM FAILURE");
     }
   else
     {
@@ -667,14 +667,14 @@ int get_jobs_index(
 
   if (pthread_mutex_trylock(aj->alljobs_mutex))
     {
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
     pthread_mutex_lock(aj->alljobs_mutex);
-    lock_ji_mutex(pjob, __func__, (char *)NULL, LOGLEVEL);
+    lock_ji_mutex(pjob, __func__, NULL, LOGLEVEL);
 
     if (pjob->ji_being_recycled == TRUE)
       {
       pthread_mutex_unlock(aj->alljobs_mutex);
-      unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
       return(-1);
       }
     }
@@ -705,14 +705,14 @@ int has_job(
 
   if (pthread_mutex_trylock(aj->alljobs_mutex))
     {
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
     pthread_mutex_lock(aj->alljobs_mutex);
-    lock_ji_mutex(pjob, __func__, (char *)NULL, LOGLEVEL);
+    lock_ji_mutex(pjob, __func__, NULL, LOGLEVEL);
 
     if (pjob->ji_being_recycled == TRUE)
       {
       pthread_mutex_unlock(aj->alljobs_mutex);
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
       return(PBSE_JOB_RECYCLED);
       }
@@ -752,14 +752,14 @@ int  remove_job(
     LOG_EVENT(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, __func__, pjob->ji_qs.ji_jobid);
   if (pthread_mutex_trylock(aj->alljobs_mutex))
     {
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
     pthread_mutex_lock(aj->alljobs_mutex);
-    lock_ji_mutex(pjob, __func__, (char *)NULL, LOGLEVEL);
+    lock_ji_mutex(pjob, __func__, NULL, LOGLEVEL);
 
     if (pjob->ji_being_recycled == TRUE)
       {
       pthread_mutex_unlock(aj->alljobs_mutex);
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
       return(PBSE_JOB_RECYCLED);
       }
     }
@@ -797,11 +797,11 @@ job *next_job(
 
   if (pjob != NULL)
     {
-    lock_ji_mutex(pjob, __func__, (char *)NULL, LOGLEVEL);
+    lock_ji_mutex(pjob, __func__, NULL, LOGLEVEL);
 
     if (pjob->ji_being_recycled == TRUE)
       {
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
       pjob = next_job(aj,iter);
       }
@@ -826,7 +826,7 @@ job *next_job_from_back(
 
   pjob = (job *)next_thing_from_back(aj->ra,iter);
   if (pjob != NULL)
-    lock_ji_mutex(pjob, __func__, (char *)NULL, LOGLEVEL);
+    lock_ji_mutex(pjob, __func__, NULL, LOGLEVEL);
 
   pthread_mutex_unlock(aj->alljobs_mutex);
 
@@ -834,7 +834,7 @@ job *next_job_from_back(
     {
     if (pjob->ji_being_recycled == TRUE)
       {
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
       pjob = next_job_from_back(aj,iter);
       }
diff --git a/src/server/job_func.c b/src/server/job_func.c
index a5b32a7a1a..9844c9d8a0 100644
--- a/src/server/job_func.c
+++ b/src/server/job_func.c
@@ -134,6 +134,7 @@
 #include "log.h"
 #include "../lib/Liblog/pbs_log.h"
 #include "../lib/Liblog/log_event.h"
+#include "../lib/Libifl/lib_ifl.h"
 #include "pbs_error.h"
 #include "svrfunc.h"
 #include "acct.h"
@@ -169,7 +170,7 @@ extern struct batch_request *setup_cpyfiles(struct batch_request *,job *,char*,c
 extern int job_log_open(char *, char *);
 extern int log_job_record(const char *buf);
 extern void check_job_log(struct work_task *ptask);
-int issue_signal(job **, char *, void(*)(batch_request *), void *);
+int issue_signal(job **, const char *, void(*)(batch_request *), void *);
 
 /* Local Private Functions */
 
@@ -223,12 +224,12 @@ void send_qsub_delmsg(
     return;
     }
 
-  if (write(qsub_sock, "PBS: ", 5) == -1)
+  if (write_ac_socket(qsub_sock, "PBS: ", 5) == -1)
     {
     return;
     }
 
-  if (write(qsub_sock, text, strlen(text)) == -1)
+  if (write_ac_socket(qsub_sock, text, strlen(text)) == -1)
     {
     return;
     }
@@ -276,7 +277,7 @@ int remtree(
     {
 
     if (errno != ENOENT)
-      log_err(errno, __func__, (char *)"stat");
+      log_err(errno, __func__, "stat");
 
     return(-1);
     }
@@ -286,7 +287,7 @@ int remtree(
     if ((dir = opendir(dirname)) == NULL)
       {
       if (errno != ENOENT)
-        log_err(errno, __func__, (char *)"opendir");
+        log_err(errno, __func__, "opendir");
 
       return(-1);
       }
@@ -313,7 +314,7 @@ int remtree(
       if (lstat(namebuf, &sb) == -1)
 #endif
         {
-        log_err(errno, __func__, (char *)"stat");
+        log_err(errno, __func__, "stat");
 
         rtnv = -1;
 
@@ -440,7 +441,7 @@ int job_abt(
     {
     /* req_delete sends own mail and acct record */
 
-    account_record(PBS_ACCT_ABT, pjob, (char *)"");
+    account_record(PBS_ACCT_ABT, pjob, "");
     svr_mailowner(pjob, MAIL_ABORT, MAIL_NORMAL, text);
 
     if ((pjob->ji_qs.ji_state == JOB_STATE_QUEUED) &&
@@ -457,7 +458,7 @@ int job_abt(
     {
     svr_setjobstate(pjob, JOB_STATE_RUNNING, JOB_SUBSTATE_ABORT, FALSE);
 
-    if ((rc = issue_signal(&pjob, (char *)"SIGKILL", free_br, NULL)) != 0)
+    if ((rc = issue_signal(&pjob, "SIGKILL", free_br, NULL)) != 0)
       {
       if (pjob != NULL)
         {
@@ -476,7 +477,7 @@ int job_abt(
         
         if (pjob->ji_wattr[JOB_ATR_depend].at_flags & ATR_VFLAG_SET)
           {
-          unlock_ji_mutex(pjob, __func__, (char *)"1a",LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, "1a",LOGLEVEL);
           depend_on_term(job_id);
           pjob = svr_find_job(job_id, TRUE);
           }
@@ -492,11 +493,11 @@ int job_abt(
             {
             job_atr_hold = pjob->ji_wattr[JOB_ATR_hold].at_val.at_long;
             job_exit_status = pjob->ji_qs.ji_un.ji_exect.ji_exitstat;
-            unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+            unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
             update_array_values(pa,old_state,aeTerminate,
                 job_id, job_atr_hold, job_exit_status);
             
-            unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+            unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
             pjob = svr_find_job(job_id, TRUE);
             }
           }
@@ -517,7 +518,7 @@ int job_abt(
       pjob->ji_qs.ji_jobid,
       old_substate);
     log_err(-1, __func__, log_buf);
-    unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
     }
   else
     {
@@ -533,7 +534,7 @@ int job_abt(
     if (pjob->ji_wattr[JOB_ATR_depend].at_flags & ATR_VFLAG_SET)
       {
       strcpy(job_id, pjob->ji_qs.ji_jobid);
-      unlock_ji_mutex(pjob, __func__, (char *)"1b", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1b", LOGLEVEL);
       depend_on_term(job_id);
       pjob = svr_find_job(job_id, TRUE);
       }
@@ -549,7 +550,7 @@ int job_abt(
         {
         job_atr_hold = pjob->ji_wattr[JOB_ATR_hold].at_val.at_long;
         job_exit_status = pjob->ji_qs.ji_un.ji_exect.ji_exitstat;
-        unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
         update_array_values(pa,old_state,aeTerminate,
             job_id, job_atr_hold, job_exit_status);
         
@@ -656,14 +657,14 @@ job *job_alloc(void)
   
   if (pj == NULL)
     {
-    log_err(errno, __func__, (char *)"no memory");
+    log_err(errno, __func__, "no memory");
     
     return(NULL);
     }
 
   pj->ji_mutex = (pthread_mutex_t *)calloc(1, sizeof(pthread_mutex_t));
   pthread_mutex_init(pj->ji_mutex,NULL);
-  lock_ji_mutex(pj, __func__, (char *)NULL, LOGLEVEL);
+  lock_ji_mutex(pj, __func__, NULL, LOGLEVEL);
 
   pj->ji_qs.qs_version = PBS_QS_VERSION;
 
@@ -705,13 +706,13 @@ void job_free(
 
   if (pj->ji_cray_clone != NULL)
     {
-    lock_ji_mutex(pj->ji_cray_clone, __func__, (char *)NULL, 0);
+    lock_ji_mutex(pj->ji_cray_clone, __func__, NULL, 0);
     job_free(pj->ji_cray_clone, TRUE);
     }
 
   if (pj->ji_external_clone != NULL)
     {
-    lock_ji_mutex(pj->ji_external_clone, __func__, (char *)NULL, 0);
+    lock_ji_mutex(pj->ji_external_clone, __func__, NULL, 0);
     job_free(pj->ji_external_clone, TRUE);
     }
 
@@ -774,7 +775,7 @@ job *copy_job(
 
   if ((pnewjob = job_alloc()) == NULL)
     {
-    log_err(errno, __func__, (char *)"no memory");
+    log_err(errno, __func__, "no memory");
 
     return(NULL);
     }
@@ -845,14 +846,14 @@ job *job_clone(
 
   if (taskid > PBS_MAXJOBARRAY)
     {
-    log_err(-1, __func__, (char *)"taskid out of range");
+    log_err(-1, __func__, "taskid out of range");
 
     return(NULL);
     }
 
   if ((pnewjob = job_alloc()) == NULL)
     {
-    log_err(errno, __func__, (char *)"no memory");
+    log_err(errno, __func__, "no memory");
 
     return(NULL);
     }
@@ -870,7 +871,7 @@ job *job_clone(
   /* find the job id for the cloned job */
   if ((oldid = strdup(template_job->ji_qs.ji_jobid)) == NULL)
     {
-    log_err(ENOMEM, __func__, (char *)"no memory");
+    log_err(ENOMEM, __func__, "no memory");
     job_free(pnewjob, FALSE);
 
     return(NULL);
@@ -927,7 +928,7 @@ job *job_clone(
         {
         /* FAILURE */
 
-        log_err(errno, __func__, (char *)"cannot create job file");
+        log_err(errno, __func__, "cannot create job file");
         job_free(pnewjob, FALSE);
 
         return(NULL);
@@ -1035,7 +1036,7 @@ job *job_clone(
 
   if (release_mutex == TRUE)
     {
-    unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+    unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
     }
 
   return(pnewjob);
@@ -1081,7 +1082,7 @@ void *job_clone_wt(
 
   if (jobid == NULL)
     {
-    log_err(ENOMEM, __func__, (char *)"Can't malloc");
+    log_err(ENOMEM, __func__, "Can't malloc");
     return(NULL);
     }
 
@@ -1092,7 +1093,7 @@ void *job_clone_wt(
     free(jobid);
 
     if (template_job != NULL)
-      unlock_ji_mutex(template_job, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(template_job, __func__, "1", LOGLEVEL);
     return(NULL);
     }
 
@@ -1102,7 +1103,7 @@ void *job_clone_wt(
 
   snprintf(namebuf, sizeof(namebuf), "%s%s.AR",
     path_jobs, template_job->ji_qs.ji_fileprefix);
-  unlock_ji_mutex(template_job, __func__, (char *)"2", LOGLEVEL);
+  unlock_ji_mutex(template_job, __func__, "2", LOGLEVEL);
 
   while ((rn = (array_request_node *)GET_NEXT(pa->request_tokens)) != NULL)
     {
@@ -1119,13 +1120,13 @@ void *job_clone_wt(
         continue;
         }
 
-      lock_ji_mutex(template_job, __func__, (char *)NULL, LOGLEVEL);
+      lock_ji_mutex(template_job, __func__, NULL, LOGLEVEL);
       pjobclone = job_clone(template_job, pa, i);
-      unlock_ji_mutex(template_job, __func__, (char *)"3", LOGLEVEL);
+      unlock_ji_mutex(template_job, __func__, "3", LOGLEVEL);
 
       if (pjobclone == NULL)
         {
-        log_err(-1, __func__, (char *)"unable to clone job in job_clone_wt");
+        log_err(-1, __func__, "unable to clone job in job_clone_wt");
         continue;
         }
       else if (pjobclone == (job *)1)
@@ -1150,7 +1151,7 @@ void *job_clone_wt(
       if ((rc = svr_enquejob(pjobclone, FALSE, prev_index)))
         {
         /* XXX need more robust error handling */
-        unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+        unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
 
         if (rc != PBSE_JOB_RECYCLED)
           svr_job_purge(pjobclone);
@@ -1162,7 +1163,7 @@ void *job_clone_wt(
       if (job_save(pjobclone, SAVEJOB_FULL, 0) != 0)
         {
         /* XXX need more robust error handling */
-        unlock_ai_mutex(pa, __func__, (char *)"2", LOGLEVEL);
+        unlock_ai_mutex(pa, __func__, "2", LOGLEVEL);
         svr_job_purge(pjobclone);
        
         pa = get_array(arrayid);
@@ -1177,7 +1178,7 @@ void *job_clone_wt(
       rn->start++;
       
       if (prev_index != -1)
-        unlock_ji_mutex(pjobclone, __func__, (char *)"4", LOGLEVEL);
+        unlock_ji_mutex(pjobclone, __func__, "4", LOGLEVEL);
       }  /* END for (i) */
 
     if (rn->start > rn->end)
@@ -1232,11 +1233,11 @@ void *job_clone_wt(
       svr_evaljobstate(pjob, &newstate, &newsub, 1);
       svr_setjobstate(pjob, newstate, newsub, FALSE);
       
-      unlock_ji_mutex(pjob, __func__, (char *)"5", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "5", LOGLEVEL);
       }
     }
 
-  unlock_ai_mutex(pa, __func__, (char *)"3", LOGLEVEL);
+  unlock_ai_mutex(pa, __func__, "3", LOGLEVEL);
   return(NULL);
   }  /* END job_clone_wt */
 
@@ -1523,14 +1524,14 @@ int record_jobinfo(
   if ((rc = job_log_open(job_log_file, path_jobinfo_log)) < 0)
     {
     pthread_mutex_unlock(job_log_mutex);
-    log_err(rc, __func__, (char *)"Could not open job log ");
+    log_err(rc, __func__, "Could not open job log ");
     return(rc);
     }
   pthread_mutex_unlock(job_log_mutex);
 
   if ((buffer = get_dynamic_string(MAXLINE << 3, NULL)) == NULL)
     {
-    log_err(ENOMEM, __func__, (char *)"Can't allocate memory");
+    log_err(ENOMEM, __func__, "Can't allocate memory");
     return(-1);
     }
  
@@ -1606,7 +1607,7 @@ int record_jobinfo(
       {
       memset(job_script_buf, 0, sizeof(job_script_buf));
 
-      while ((bytes_read = read(fd, job_script_buf, sizeof(job_script_buf) - 1)) > 0)
+      while ((bytes_read = read_ac_socket(fd, job_script_buf, sizeof(job_script_buf) - 1)) > 0)
         {
         rc = append_dynamic_string(buffer, job_script_buf);
         memset(job_script_buf, 0, sizeof(job_script_buf));
@@ -1637,7 +1638,7 @@ int record_jobinfo(
 
   if ((rc = append_dynamic_string(buffer, "</Jobinfo>\n")) != PBSE_NONE)
     {
-    log_err(rc, __func__, (char *)"");
+    log_err(rc, __func__, "");
     free_dynamic_string(buffer);
     return(rc);
     }
@@ -1677,6 +1678,9 @@ int svr_job_purge(
   int           job_is_array_template;
   unsigned int  job_has_checkpoint_file;
   int           job_has_arraystruct;
+  int           do_delete_array = FALSE;
+  job_array     *pa = NULL;
+  char          array_id[PBS_MAXSVRJOBID+1];
  
   strcpy(job_id, pjob->ji_qs.ji_jobid);
   strcpy(job_fileprefix, pjob->ji_qs.ji_fileprefix);
@@ -1721,7 +1725,7 @@ int svr_job_purge(
     {
     /* pa->ai_mutex will come out locked after 
        the call to get_jobs_array */
-    job_array *pa = get_jobs_array(&pjob);
+    pa = get_jobs_array(&pjob);
 
     if (pjob != NULL)
       {
@@ -1737,13 +1741,15 @@ int svr_job_purge(
         if (pa->ai_qs.num_purged == pa->ai_qs.num_jobs)
           {
           /* array_delete will unlock pa->ai_mutex */
-          array_delete(pa);
+          strcpy(array_id, pjob->ji_arraystructid);
+          do_delete_array = TRUE;
+          unlock_ai_mutex(pa, __func__, "1a", LOGLEVEL);
           }
         else
           {
           array_save(pa);
           
-          unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+          unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
           }
         }
       }
@@ -1771,7 +1777,7 @@ int svr_job_purge(
       if (pjob->ji_being_recycled == FALSE)
         job_free(pjob, TRUE);
       else
-        unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
       }
     }
   else
@@ -1882,6 +1888,13 @@ int svr_job_purge(
     log_record(PBSEVENT_DEBUG, PBS_EVENTCLASS_JOB, job_id, log_buf);
     }
 
+  if (do_delete_array == TRUE)
+    {
+    pa = get_array(array_id);
+    if (pa != NULL)
+      array_delete(pa);
+    }
+
   return(PBSE_NONE);
   }  /* END svr_job_purge() */
 
@@ -1914,7 +1927,7 @@ job_array *get_jobs_array(
   if (pjob->ji_arraystructid[0] != '\0')
     {
     strcpy(arrayid, pjob->ji_arraystructid);
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
   
     if (LOGLEVEL >= 7)
       {
@@ -1926,7 +1939,7 @@ job_array *get_jobs_array(
 
     if ((pjob = svr_find_job(jobid, TRUE)) == NULL)
       {
-      unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+      unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
       pa = NULL;
       *pjob_ptr = NULL;
       }
@@ -2148,7 +2161,7 @@ int split_job(
     change_external_job_name(external);
     external->ji_parent_job = pjob;
     pjob->ji_external_clone = external;
-    unlock_ji_mutex(external, __func__, (char *)NULL, 0);
+    unlock_ji_mutex(external, __func__, NULL, 0);
     }
 
   if (pjob->ji_cray_clone == NULL)
@@ -2157,7 +2170,7 @@ int split_job(
     fix_cray_exec_hosts(cray);
     cray->ji_parent_job     = pjob;
     pjob->ji_cray_clone     = cray;
-    unlock_ji_mutex(cray, __func__, (char *)NULL, 0);
+    unlock_ji_mutex(cray, __func__, NULL, 0);
     }
 
   return(PBSE_NONE);
diff --git a/src/server/job_qs_upgrade.c b/src/server/job_qs_upgrade.c
index 8344ea9cbc..a728adcc79 100644
--- a/src/server/job_qs_upgrade.c
+++ b/src/server/job_qs_upgrade.c
@@ -20,6 +20,8 @@
 #include "pbs_job.h"
 #include "array.h"
 #include "../lib/Liblog/pbs_log.h"
+#include "../lib/Libifl/lib_ifl.h"
+
 
 extern char *path_jobs;
 extern char *path_arrays;
@@ -342,7 +344,7 @@ int upgrade_v1(
   ji_qs_v1 qs_old;
 
 
-  if (read(fds, (char*)&qs_old, sizeof(qs_old)) != sizeof(qs_old))
+  if (read_ac_socket(fds, (char*)&qs_old, sizeof(qs_old)) != sizeof(qs_old))
     {
     return (-1);
     }
@@ -382,7 +384,7 @@ int upgrade_2_3_X(
   ji_qs_2_3_X qs_old;
 
 
-  if (read(fds, (char*)&qs_old, sizeof(qs_old)) != sizeof(qs_old))
+  if (read_ac_socket(fds, (char*)&qs_old, sizeof(qs_old)) != sizeof(qs_old))
     {
     return (-1);
     }
@@ -427,7 +429,7 @@ int upgrade_2_2_X(
 
 
 
-  if (read(fds, (char*)&qs_old, sizeof(qs_old)) != sizeof(qs_old))
+  if (read_ac_socket(fds, (char*)&qs_old, sizeof(qs_old)) != sizeof(qs_old))
     {
     return (-1);
     }
@@ -467,7 +469,7 @@ int upgrade_2_1_X(
   ji_qs_2_1_X qs_old;
 
 
-  if (read(fds, (char*)&qs_old, sizeof(qs_old)) != sizeof(qs_old))
+  if (read_ac_socket(fds, (char*)&qs_old, sizeof(qs_old)) != sizeof(qs_old))
     {
     return (-1);
     }
diff --git a/src/server/job_recov.c b/src/server/job_recov.c
index 0119b345d7..66d15ca390 100644
--- a/src/server/job_recov.c
+++ b/src/server/job_recov.c
@@ -108,6 +108,7 @@
 #include "log.h"
 #include "../lib/Liblog/pbs_log.h"
 #include "../lib/Liblog/log_event.h"
+#include "../lib/Libifl/lib_ifl.h"
 #include "svrfunc.h"
 #include "server.h"
 #if __STDC__ != 1
@@ -251,7 +252,7 @@ int job_save(
 
     /* just write the "critical" base structure to the file */
 
-    while ((i = write(fds, (char *)&pjob->ji_qs, sizeof(pjob->ji_qs))) != sizeof(pjob->ji_qs))
+    while ((i = write_ac_socket(fds, (char *)&pjob->ji_qs, sizeof(pjob->ji_qs))) != sizeof(pjob->ji_qs))
       {
       if ((i < 0) && (errno == EINTR))
         {
@@ -450,7 +451,7 @@ job *job_recov(
     log_err(errno, __func__, log_buf);
 
 #ifndef PBS_MOM
-    unlock_ji_mutex(pj, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pj, __func__, "1", LOGLEVEL);
     free(pj->ji_mutex);
 #endif
 
@@ -463,7 +464,7 @@ job *job_recov(
 
   /* read in job quick save sub-structure */
 
-  if (read(fds, (char *)&pj->ji_qs, sizeof(pj->ji_qs)) != sizeof(pj->ji_qs) &&
+  if (read_ac_socket(fds, (char *)&pj->ji_qs, sizeof(pj->ji_qs)) != sizeof(pj->ji_qs) &&
       pj->ji_qs.qs_version == PBS_QS_VERSION)
     {
     snprintf(log_buf, LOCAL_LOG_BUF_SIZE, "Unable to read %s", namebuf);
@@ -471,7 +472,7 @@ job *job_recov(
     log_err(errno, __func__, log_buf);
 
 #ifndef PBS_MOM
-    unlock_ji_mutex(pj, __func__, (char *)"2", LOGLEVEL);
+    unlock_ji_mutex(pj, __func__, "2", LOGLEVEL);
     free(pj->ji_mutex);
 #endif
 
@@ -500,7 +501,7 @@ job *job_recov(
       log_err(-1, __func__, log_buf);
 
 #ifndef PBS_MOM
-      unlock_ji_mutex(pj, __func__, (char *)"3", LOGLEVEL);
+      unlock_ji_mutex(pj, __func__, "3", LOGLEVEL);
       free(pj->ji_mutex);
 #endif
 
@@ -529,7 +530,7 @@ job *job_recov(
     log_err(-1, __func__, log_buf);
 
 #ifndef PBS_MOM
-    unlock_ji_mutex(pj, __func__, (char *)"4", LOGLEVEL);
+    unlock_ji_mutex(pj, __func__, "4", LOGLEVEL);
     free(pj->ji_mutex);
 #endif
 
@@ -556,7 +557,7 @@ job *job_recov(
     log_err(-1, __func__, log_buf);
 
 #ifndef PBS_MOM
-    unlock_ji_mutex(pj, __func__, (char *)"5", LOGLEVEL);
+    unlock_ji_mutex(pj, __func__, "5", LOGLEVEL);
     job_free(pj, FALSE);
 #else
     mom_job_free(pj);
@@ -643,7 +644,7 @@ job *job_recov(
 
     if (pa != NULL)
       {
-      unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+      unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
       }
     }
 
diff --git a/src/server/job_recycler.c b/src/server/job_recycler.c
index 42325e7145..c4367eb528 100644
--- a/src/server/job_recycler.c
+++ b/src/server/job_recycler.c
@@ -96,7 +96,7 @@ void initialize_recycler()
   initialize_all_jobs_array(&recycler.rc_jobs);
   recycler.rc_iter = -1;
 
-  recycler.rc_mutex = calloc(1, sizeof(pthread_mutex_t));
+  recycler.rc_mutex = (pthread_mutex_t *)calloc(1, sizeof(pthread_mutex_t));
   pthread_mutex_init(recycler.rc_mutex,NULL);
   } /* END initialize_recycler() */
 
@@ -112,11 +112,11 @@ job *next_job_from_recycler(
   job *pjob;
 
   pthread_mutex_lock(aj->alljobs_mutex);
-  pjob = next_thing(aj->ra, iter);
+  pjob = (job *)next_thing(aj->ra, iter);
   pthread_mutex_unlock(aj->alljobs_mutex);
 
   if (pjob != NULL)
-    lock_ji_mutex(pjob, __func__, (char *)NULL, LOGLEVEL);
+    lock_ji_mutex(pjob, __func__, NULL, LOGLEVEL);
 
   return(pjob);
   } /* END next_job_from_recycler() */
@@ -146,7 +146,7 @@ void *remove_some_recycle_jobs(
       log_event(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, __func__, pjob->ji_qs.ji_jobid);
 
     remove_job(&recycler.rc_jobs, pjob);
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
     free(pjob->ji_mutex);
     memset(pjob, 255, sizeof(job));
     free(pjob);
diff --git a/src/server/job_route.c b/src/server/job_route.c
index b9b872efd8..1d2146e0cb 100644
--- a/src/server/job_route.c
+++ b/src/server/job_route.c
@@ -552,17 +552,17 @@ void *queue_route(
     /* the second condition says we only want to try if routing
      * has been tried once - this is to let req_commit have the 
      * first crack at routing always */
-    unlock_queue(pque, __func__, (char *)NULL, 0);
+    unlock_queue(pque, __func__, NULL, 0);
     if ((pjob->ji_qs.ji_un.ji_routet.ji_rteretry <= time_now - ROUTE_RETRY_TIME) &&
         (pjob->ji_qs.ji_un.ji_routet.ji_rteretry != 0))
       {
       reroute_job(pjob, pque);
       }
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
     }
 
   free(queue_name);
-  unlock_queue(pque, __func__, (char *)NULL, 0);
+  unlock_queue(pque, __func__, NULL, 0);
   pthread_mutex_unlock(reroute_job_mutex);
   return(NULL);
   } /* END queue_route() */
diff --git a/src/server/login_nodes.c b/src/server/login_nodes.c
index 206ce1ccbc..57d14ae889 100644
--- a/src/server/login_nodes.c
+++ b/src/server/login_nodes.c
@@ -94,7 +94,7 @@ void initialize_login_holder()
   {
   logins.ra = initialize_resizable_array(LOGIN_INITIAL_SIZE);
   logins.next_node = 0;
-  logins.ln_mutex = calloc(1, sizeof(pthread_mutex_t));
+  logins.ln_mutex = (pthread_mutex_t*)calloc(1, sizeof(pthread_mutex_t));
   pthread_mutex_init(logins.ln_mutex, NULL);
   }
 
@@ -105,7 +105,7 @@ int add_to_login_holder(
   struct pbsnode *pnode)
 
   {
-  login_node *ln = calloc(1, sizeof(login_node));
+  login_node *ln = (login_node *)calloc(1, sizeof(login_node));
   int         rc;
 
   ln->pnode = pnode;
@@ -132,7 +132,7 @@ struct pbsnode *check_node(
   {
   struct pbsnode *pnode = ln->pnode;
 
-  lock_node(pnode, __func__, (char *)NULL, 20);
+  lock_node(pnode, __func__, NULL, 20);
 
   if ((hasprop(pnode, needed) == TRUE) &&
       (pnode->nd_nsn - pnode->nd_np_to_be_used >= 1) &&
@@ -141,7 +141,7 @@ struct pbsnode *check_node(
     return(pnode);
   else
     {
-    unlock_node(pnode, __func__, (char *)NULL, 20);
+    unlock_node(pnode, __func__, NULL, 20);
     return(NULL);
     }
   } /* END check_node() */
@@ -163,7 +163,7 @@ struct pbsnode *find_fitting_node(
   resizable_array *ordered = initialize_resizable_array(logins.ra->num + 1);
 
   /* create a sorted list of the logins */
-  while ((ln = next_thing(logins.ra, &iter)) != NULL)
+  while ((ln = (login_node *)next_thing(logins.ra, &iter)) != NULL)
     {
     /* if ordered is empty just insert without attempting to sort */
     if (ordered->num == 0)
@@ -173,7 +173,7 @@ struct pbsnode *find_fitting_node(
       ordered_iter = -1;
       index = ordered->slots[ALWAYS_EMPTY_INDEX].next;
 
-      while ((ordered_ln = next_thing(ordered, &ordered_iter)) != NULL)
+      while ((ordered_ln = (login_node *)next_thing(ordered, &ordered_iter)) != NULL)
         {
         if (ln->times_used <= ordered_ln->times_used)
           {
@@ -192,7 +192,7 @@ struct pbsnode *find_fitting_node(
 
   iter = -1;
 
-  while ((ln = next_thing(ordered, &iter)) != NULL)
+  while ((ln = (login_node *)next_thing(ordered, &iter)) != NULL)
     {
     if ((pnode = check_node(ln, needed)) != NULL)
       {
@@ -219,7 +219,7 @@ void update_next_node_index(
   int         prev_index = logins.ra->slots[ALWAYS_EMPTY_INDEX].next;
   login_node *ln;
 
-  while ((ln = next_thing(logins.ra, &iter)) != NULL)
+  while ((ln = (login_node *)next_thing(logins.ra, &iter)) != NULL)
     {
     if (ln->times_used < to_beat)
       {
@@ -252,7 +252,7 @@ struct pbsnode *get_next_login_node(
   if (ln != NULL)
     {
     pnode = ln->pnode;
-    lock_node(pnode, __func__, (char *)NULL, 0);
+    lock_node(pnode, __func__, NULL, 0);
     
     if (needed != NULL)
       {
@@ -272,7 +272,7 @@ struct pbsnode *get_next_login_node(
     
     if (node_fits == FALSE)
       {
-      unlock_node(pnode, __func__, (char *)NULL, 0);
+      unlock_node(pnode, __func__, NULL, 0);
       pnode = find_fitting_node(needed);
       }
     else
diff --git a/src/server/node_func.c b/src/server/node_func.c
index 3c9f805574..19c98ed5a2 100644
--- a/src/server/node_func.c
+++ b/src/server/node_func.c
@@ -176,7 +176,7 @@ void bad_node_warning(
    
     /* only release the mutex if we obtained it in this function */
     if (node_possessed == NULL)
-      unlock_node(pnode, __func__, (char *)"attained in function", LOGLEVEL);
+      unlock_node(pnode, __func__, "attained in function", LOGLEVEL);
     }
 
   } /* END bad_node_warning() */
@@ -248,7 +248,7 @@ int addr_ok(
     }
 
   if (release_mutex == TRUE)
-    unlock_node(pnode, __func__, (char *)"release_mutex = TRUE", LOGLEVEL);
+    unlock_node(pnode, __func__, "release_mutex = TRUE", LOGLEVEL);
 
   return(status);
   }  /* END addr_ok() */
@@ -291,7 +291,7 @@ struct pbsnode *find_node_in_allnodes(
 
 struct pbsnode *find_nodebyname(
 
-  char *nodename) /* I */
+  const char *nodename) /* I */
 
   {
   char           *pslash;
@@ -305,12 +305,12 @@ struct pbsnode *find_nodebyname(
   int             numa_index;
   long            cray_enabled = FALSE;
 
-  if ((pslash = strchr(nodename, (int)'/')) != NULL)
+  if ((pslash = strchr((char *)nodename, (int)'/')) != NULL)
     *pslash = '\0';
 
   pthread_mutex_lock(allnodes.allnodes_mutex);
 
-  i = get_value_hash(allnodes.ht, nodename);
+  i = get_value_hash(allnodes.ht, (void *)nodename);
 
   if (i >= 0)
     pnode = (struct pbsnode *)allnodes.ra->slots[i].item;
@@ -326,7 +326,7 @@ struct pbsnode *find_nodebyname(
         {
         lock_node(alps_reporter, __func__, NULL, 0);
         
-        if ((i = get_value_hash(alps_reporter->alps_subnodes.ht, nodename)) >= 0)
+        if ((i = get_value_hash(alps_reporter->alps_subnodes.ht, (void *)nodename)) >= 0)
           {
           if ((pnode = (struct pbsnode *)alps_reporter->alps_subnodes.ra->slots[i].item) != NULL)
             {
@@ -340,7 +340,7 @@ struct pbsnode *find_nodebyname(
     else
       {
       /* check if it was a numa node */
-      tmp = nodename;
+      tmp = (char *)nodename;
       while ((tmp = strchr(tmp, '-')) != NULL)
         {
         dash = tmp;
@@ -352,7 +352,7 @@ struct pbsnode *find_nodebyname(
         *dash = '\0';
         numa_index = atoi(dash + 1);
         
-        if ((i = get_value_hash(allnodes.ht, nodename)) >= 0)
+        if ((i = get_value_hash(allnodes.ht, (void *)nodename)) >= 0)
           {
           if ((pnode = (struct pbsnode *)allnodes.ra->slots[i].item) != NULL)
             {
@@ -513,7 +513,7 @@ int login_encode_jobs(
       if (pjob != NULL)
         {
         login_id = pjob->ji_wattr[JOB_ATR_login_node_id].at_val.at_str;
-        unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
         }
 
       if ((login_id == NULL) ||
@@ -531,11 +531,11 @@ int login_encode_jobs(
 
   if ((pal = attrlist_create((char *)ATTR_NODE_jobs, (char *)NULL, strlen(job_str->str) + 1)) == NULL)
     {
-    log_err(ENOMEM, __func__, (char *)"");
+    log_err(ENOMEM, __func__, "");
     return(ENOMEM);
     }
 
-  strcpy(pal->al_value, job_str->str);
+  strcpy((char *)pal->al_value, job_str->str);
   pal->al_flags = ATR_VFLAG_SET;
 
   free_dynamic_string(job_str);
@@ -788,7 +788,7 @@ int initialize_pbsnode(
   pnode->nd_mutex = (pthread_mutex_t *)calloc(1, sizeof(pthread_mutex_t));
   if (pnode->nd_mutex == NULL)
     {
-    log_err(ENOMEM, __func__, (char *)"Could not allocate memory for the node's mutex");
+    log_err(ENOMEM, __func__, "Could not allocate memory for the node's mutex");
     
     return(ENOMEM);
     }
@@ -1235,13 +1235,13 @@ int update_nodes_file(
       fclose(nin);
     
       if (held != np)
-        unlock_node(np, __func__, (char *)"error", LOGLEVEL);
+        unlock_node(np, __func__, "error", LOGLEVEL);
 
       return(-1);
       }
     
     if (held != np)
-      unlock_node(np, __func__, (char *)"loop", LOGLEVEL);
+      unlock_node(np, __func__, "loop", LOGLEVEL);
     } /* for each node */
 
   fclose(nin);
@@ -1403,7 +1403,7 @@ int create_a_gpusubnode(
   pnode->nd_gpusn[pnode->nd_ngpus].inuse = FALSE;
   pnode->nd_gpusn[pnode->nd_ngpus].mode = gpu_normal;
   pnode->nd_gpusn[pnode->nd_ngpus].state = gpu_unallocated;
-  pnode->nd_gpusn[pnode->nd_ngpus].flag = 0;
+  pnode->nd_gpusn[pnode->nd_ngpus].flag = okay;
   pnode->nd_gpusn[pnode->nd_ngpus].index = pnode->nd_ngpus;
   pnode->nd_gpusn[pnode->nd_ngpus].gpuid = NULL;
 
@@ -1587,7 +1587,7 @@ int setup_node_boards(
     if (allocd_name == NULL)
       {
       /* no memory error */
-      log_err(PBSE_SYSTEM, __func__, (char *)"Cannot allocate memory for node name\n");
+      log_err(PBSE_SYSTEM, __func__, "Cannot allocate memory for node name\n");
 
       return(PBSE_SYSTEM);
       }
@@ -1742,7 +1742,7 @@ int create_pbs_node(
 
     if (host_info == NULL)
       {
-      log_err(-1, __func__, (char *)"create_pbs_node calloc failed");
+      log_err(-1, __func__, "create_pbs_node calloc failed");
       return(PBSE_MEM_MALLOC);
       }
 
@@ -1757,14 +1757,14 @@ int create_pbs_node(
       pattrl = attrlist_create(pal->al_atopl.name, 0, strlen(pal->al_atopl.value) + 1);
       if (pattrl == NULL)
         {
-        log_err(-1, __func__, (char *)"cannot create node attribute");
+        log_err(-1, __func__, "cannot create node attribute");
         free(host_info);
         if (pul != NULL)
           free(pul);
         return(PBSE_MEM_MALLOC);
         }
 
-      strcpy(pattrl->al_value, pal->al_atopl.value);
+      strcpy((char *)pattrl->al_value, pal->al_atopl.value);
       pattrl->al_flags = SET;
 
       append_link(&host_info->atrlist, &pattrl->al_link, pattrl);
@@ -1783,7 +1783,7 @@ int create_pbs_node(
         free(host_info);
         if (pul != NULL)
           free(pul);
-        log_err(-1, __func__, (char *)"create_pbs_node calloc failed");
+        log_err(-1, __func__, "create_pbs_node calloc failed");
         return(PBSE_MEM_MALLOC);
         }
 
@@ -2116,7 +2116,7 @@ int setup_nodes(void)
           goto errtoken2;
           }
 
-        strcpy(pal->al_value, val);
+        strcpy((char *)pal->al_value, val);
 
         pal->al_flags = SET;
 
@@ -2162,7 +2162,7 @@ int setup_nodes(void)
         return(-1);
         }
       
-      strcpy(pal->al_value, propstr);
+      strcpy((char *)pal->al_value, propstr);
       
       pal->al_flags = SET;
       
@@ -2330,12 +2330,12 @@ int setup_nodes(void)
           /* exclusive bits are calculated later in set_old_nodes() */
           np->nd_state &= ~INUSE_JOB;
 
-          unlock_node(np, __func__, (char *)"match", LOGLEVEL);
+          unlock_node(np, __func__, "match", LOGLEVEL);
 
           break;
           }
 
-        unlock_node(np, __func__, (char *)"no match", LOGLEVEL);
+        unlock_node(np, __func__, "no match", LOGLEVEL);
         }
       }
 
@@ -2363,7 +2363,7 @@ int setup_nodes(void)
           log_record(PBSEVENT_SCHED, PBS_EVENTCLASS_REQUEST, __func__, log_buf);
           }
         
-        unlock_node(np, __func__, (char *)"init - no note", LOGLEVEL);
+        unlock_node(np, __func__, "init - no note", LOGLEVEL);
         }
       }
 
@@ -2995,9 +2995,9 @@ struct pbsnode *get_my_next_node_board(
   iter->numa_index++;
   numa = AVL_find(iter->numa_index, pnode->nd_mom_port, pnode->node_boards);
   
-  unlock_node(pnode, __func__, (char *)"pnode", LOGLEVEL);
+  unlock_node(pnode, __func__, "pnode", LOGLEVEL);
   if (numa != NULL)
-    lock_node(numa, __func__, (char *)"numa", LOGLEVEL);
+    lock_node(numa, __func__, "numa", LOGLEVEL);
 
   return(numa);
   } /* END get_my_next_node_board() */
@@ -3013,7 +3013,7 @@ struct pbsnode *get_my_next_alps_node(
   {
   struct pbsnode *alps_node = next_host(&(pnode->alps_subnodes), &(iter->alps_index), NULL);
 
-  unlock_node(pnode, __func__, (char *)NULL, 0);
+  unlock_node(pnode, __func__, NULL, 0);
 
   return(alps_node);
   } /* END get_my_next_alps_node() */
@@ -3184,7 +3184,7 @@ int insert_node(
   if ((rc = insert_thing(an->ra,pnode)) == -1)
     {
     rc = ENOMEM;
-    log_err(rc, __func__, (char *)"No memory to resize the array...SYSTEM FAILURE");
+    log_err(rc, __func__, "No memory to resize the array...SYSTEM FAILURE");
     }
   else
     {
diff --git a/src/server/node_func.h b/src/server/node_func.h
index d048018b33..72d0c76d29 100644
--- a/src/server/node_func.h
+++ b/src/server/node_func.h
@@ -22,7 +22,7 @@ void bad_node_warning(pbs_net_t addr, struct pbsnode *);
 
 int addr_ok(pbs_net_t addr, struct pbsnode *pnode);
 
-struct pbsnode *find_nodebyname(char *nodename);
+struct pbsnode *find_nodebyname(const char *nodename);
 
 struct pbssubn *find_subnodebyname(char *nodename);
 
diff --git a/src/server/node_manager.c b/src/server/node_manager.c
index 2368b4b3b3..2ce7cea99d 100644
--- a/src/server/node_manager.c
+++ b/src/server/node_manager.c
@@ -235,7 +235,7 @@ struct pbsnode *tfind_addr(
   if (pn == NULL)
     return(NULL);
 
-  lock_node(pn, __func__, (char *)"pn", LOGLEVEL);
+  lock_node(pn, __func__, "pn", LOGLEVEL);
 
   if (pn->num_node_boards == 0)
     return(pn);
@@ -263,7 +263,7 @@ struct pbsnode *tfind_addr(
     if (dash == NULL)
       {
       /* node has numa nodes but no dashes in exec host?? */
-      log_err(-1, __func__, (char *)"Numa node but there's no dash in exec_host?");
+      log_err(-1, __func__, "Numa node but there's no dash in exec_host?");
 
       return(pn);
       }
@@ -272,8 +272,8 @@ struct pbsnode *tfind_addr(
 
     numa = AVL_find(index, pn->nd_mom_port, pn->node_boards);
 
-    unlock_node(pn, __func__, (char *)"pn->numa", LOGLEVEL);
-    lock_node(numa, __func__, (char *)"numa", LOGLEVEL);
+    unlock_node(pn, __func__, "pn->numa", LOGLEVEL);
+    lock_node(numa, __func__, "numa", LOGLEVEL);
 
     if (plus != NULL)
       *plus = '+';
@@ -622,9 +622,9 @@ int is_job_on_node(
       {
       numa = AVL_find(i,pnode->nd_mom_port,pnode->node_boards);
 
-      lock_node(numa, __func__, (char *)"before check_node_for_job numa", LOGLEVEL);
+      lock_node(numa, __func__, "before check_node_for_job numa", LOGLEVEL);
       present = check_node_for_job(pnode,jobid);
-      unlock_node(numa, __func__, (char *)"after check_node_for_job numa", LOGLEVEL);
+      unlock_node(numa, __func__, "after check_node_for_job numa", LOGLEVEL);
 
       /* leave loop if we found the job */
       if (present != FALSE)
@@ -717,7 +717,7 @@ int kill_job_on_mom(
     {
     if ((preq = alloc_br(PBS_BATCH_SignalJob)) == NULL)
       {
-      log_err(-1, __func__, (char *)"unable to allocate SignalJob request-trouble!");
+      log_err(-1, __func__, "unable to allocate SignalJob request-trouble!");
       svr_disconnect(conn);
       }
     else
@@ -725,10 +725,10 @@ int kill_job_on_mom(
       strcpy(preq->rq_ind.rq_signal.rq_jid, jobid);
       strcpy(preq->rq_ind.rq_signal.rq_signame, "SIGKILL");
       
-      unlock_node(pnode, __func__, (char *)NULL, 0);
+      unlock_node(pnode, __func__, NULL, 0);
       rc = issue_Drequest(conn, preq);
       free_br(preq);
-      lock_node(pnode, __func__, (char *)NULL, 0);
+      lock_node(pnode, __func__, NULL, 0);
       }
     }
 
@@ -752,9 +752,9 @@ int job_should_be_on_node(
     if ((is_job_on_node(pnode, jobid)) == FALSE)
       {
       /* must lock the job before the node */
-      unlock_node(pnode, __func__, (char *)NULL, 0);
+      unlock_node(pnode, __func__, NULL, 0);
       pjob = svr_find_job(jobid, TRUE);
-      lock_node(pnode, __func__, (char *)NULL, 0);
+      lock_node(pnode, __func__, NULL, 0);
       
       if (pjob != NULL)
         {
@@ -764,18 +764,18 @@ int job_should_be_on_node(
          * of data staging, suspend, or rerun */            
         if (pjob->ji_wattr[JOB_ATR_exec_host].at_val.at_str == NULL)
           {
-          unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
           
           should_be_on_node = FALSE;
           }
         else if (node_in_exechostlist(pnode->nd_name, pjob->ji_wattr[JOB_ATR_exec_host].at_val.at_str) == FALSE)
           {
-          unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
           
           should_be_on_node = FALSE;
           }
         else
-          unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
         }
       else
         should_be_on_node = FALSE;
@@ -835,9 +835,9 @@ int remove_jobs_that_have_disappeared(
     job *pjob;
 
     /* locking priority is job before node */
-    unlock_node(pnode, __func__, (char *)NULL, 0);
+    unlock_node(pnode, __func__, NULL, 0);
     pjob = svr_find_job(jobid, TRUE);
-    lock_node(pnode, __func__, (char *)NULL, 0);
+    lock_node(pnode, __func__, NULL, 0);
 
     if (pjob == NULL)
       {
@@ -855,11 +855,11 @@ int remove_jobs_that_have_disappeared(
       {
       free(jobid);
 
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
       continue;
       }
 
-    unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
     /* mom didn't report this job - it has exited unexpectedly */
     snprintf(log_buf, sizeof(log_buf),
       "Server thinks job %s is on node %s, but the mom doesn't. Terminating job",
@@ -968,7 +968,7 @@ void *sync_node_jobs(
 
   /*free_resizable_array(ms_jobs);*/
 
-  unlock_node(np, __func__, (char *)NULL, 0);
+  unlock_node(np, __func__, NULL, 0);
 
   return(NULL);
   }  /* END sync_node_jobs() */
@@ -1003,7 +1003,7 @@ void setup_notification(
       
       if (nnew == NULL)
         {
-        unlock_node(pnode, __func__, (char *)"nnew == NULL", LOGLEVEL);
+        unlock_node(pnode, __func__, "nnew == NULL", LOGLEVEL);
         return;
         }
       
@@ -1013,7 +1013,7 @@ void setup_notification(
       
       append_link(&svr_newnodes, &nnew->nn_link, nnew);
       
-      unlock_node(pnode, __func__, (char *)"nnew != NULL", LOGLEVEL);
+      unlock_node(pnode, __func__, "nnew != NULL", LOGLEVEL);
       }
     }
 
@@ -1066,7 +1066,7 @@ void clear_nvidia_gpus(
 
     if (decode_arst(&temp, NULL, NULL, NULL, 0))
       {
-      log_err(-1, __func__, (char *)"clear_nvidia_gpus:  cannot initialize attribute\n");
+      log_err(-1, __func__, "clear_nvidia_gpus:  cannot initialize attribute\n");
 
       return;
       }
@@ -1120,11 +1120,11 @@ void stream_eof(
     }
 
   /* Before we mark this node down see if we can connect */
-  lock_node(np, __func__, (char *)"parent", LOGLEVEL);
+  lock_node(np, __func__, "parent", LOGLEVEL);
   conn = svr_connect(addr, port, &my_err, np, NULL, cntype);
   if(conn >= 0)
     {
-    unlock_node(np, __func__, (char *)"parent", LOGLEVEL);
+    unlock_node(np, __func__, "parent", LOGLEVEL);
     svr_disconnect(conn);
     return;
     }
@@ -1148,15 +1148,15 @@ void stream_eof(
       {
       pnode = AVL_find(i,np->nd_mom_port,np->node_boards);
 
-      lock_node(pnode, __func__, (char *)"subs", LOGLEVEL);
+      lock_node(pnode, __func__, "subs", LOGLEVEL);
       update_node_state(pnode,INUSE_DOWN);
-      unlock_node(pnode, __func__, (char *)"subs", LOGLEVEL);
+      unlock_node(pnode, __func__, "subs", LOGLEVEL);
       }
     }
   else
     update_node_state(np, INUSE_DOWN);
 
-  unlock_node(np, __func__, (char *)"parent", LOGLEVEL);
+  unlock_node(np, __func__, "parent", LOGLEVEL);
 
   return;
   }  /* END stream_eof() */
@@ -1244,7 +1244,7 @@ void check_nodes(
 
   if (rc)
     {
-    log_err(rc, __func__, (char *)"Unable to enqueue check nodes task into the threadpool");
+    log_err(rc, __func__, "Unable to enqueue check nodes task into the threadpool");
     }
   }  /* END check_nodes() */
 
@@ -1283,7 +1283,7 @@ void *write_node_state_work(
 
     if (ftruncate(fileno(nstatef), (off_t)0) != 0)
       {
-      log_err(errno, __func__, (char *)"could not truncate file");
+      log_err(errno, __func__, "could not truncate file");
 
       pthread_mutex_unlock(node_state_mutex);
       
@@ -1296,7 +1296,7 @@ void *write_node_state_work(
 
     if ((nstatef = fopen(path_nodestate, "w+")) == NULL)
       {
-      log_err(errno, __func__, (char *)"could not open file");
+      log_err(errno, __func__, "could not open file");
 
       pthread_mutex_unlock(node_state_mutex);
       
@@ -1316,12 +1316,12 @@ void *write_node_state_work(
       fprintf(nstatef, fmt, np->nd_name, np->nd_state & savemask);
       }
 
-    unlock_node(np, __func__, (char *)NULL, LOGLEVEL);
+    unlock_node(np, __func__, NULL, LOGLEVEL);
     } /* END for each node */
 
   if (fflush(nstatef) != 0)
     {
-    log_err(errno, __func__, (char *)"failed saving node state to disk");
+    log_err(errno, __func__, "failed saving node state to disk");
     }
 
   fclose(nstatef);
@@ -1343,7 +1343,7 @@ void write_node_state(void)
 
   if (rc)
     {
-    log_err(rc, __func__, (char *)"Unable to enqueue write_node_state_work task into the threadpool");
+    log_err(rc, __func__, "Unable to enqueue write_node_state_work task into the threadpool");
     }
   }  /* END write_node_state() */
 
@@ -1372,7 +1372,7 @@ int write_node_note(void)
   if ((svr_totnodes == 0))
     {
     log_event(
-      PBSEVENT_ADMIN, PBS_EVENTCLASS_SERVER, __func__, (char *)"Server has empty nodes list");
+      PBSEVENT_ADMIN, PBS_EVENTCLASS_SERVER, __func__, "Server has empty nodes list");
 
     fclose(nin);
 
@@ -1389,7 +1389,7 @@ int write_node_note(void)
       fprintf(nin, "%s %s\n", np->nd_name, np->nd_note);
       }
     
-    unlock_node(np, __func__, (char *)NULL, LOGLEVEL);
+    unlock_node(np, __func__, NULL, LOGLEVEL);
     }
 
   fflush(nin);
@@ -1501,7 +1501,7 @@ void node_unreserve(
 
   if (rc)
     {
-    log_err(rc, __func__, (char *)"Unable to enqueue node_unreserve task into the threadpool");
+    log_err(rc, __func__, "Unable to enqueue node_unreserve task into the threadpool");
     }
   }  /* END node_unreserve() */
 
@@ -2374,7 +2374,7 @@ int save_node_for_adding(
     /* second */
     if ((to_add = (node_job_add_info *)calloc(1, sizeof(node_job_add_info))) == NULL)
       {
-      log_err(ENOMEM, __func__, (char *)"Cannot allocate memory!");
+      log_err(ENOMEM, __func__, "Cannot allocate memory!");
 
       return(ENOMEM);
       }
@@ -2497,7 +2497,7 @@ int is_compute_node(
   if ((pnode = find_nodebyname(node_id)) != NULL)
     {
     rc = TRUE;
-    unlock_node(pnode, __func__, (char *)NULL, 0);
+    unlock_node(pnode, __func__, NULL, 0);
     }
 
   if (colon != NULL)
@@ -2528,7 +2528,7 @@ void release_node_allocation(
       pnode->nd_np_to_be_used    -= current->ppn_needed;
       pnode->nd_ngpus_to_be_used -= current->gpu_needed;
       pnode->nd_nmics_to_be_used -= current->mic_needed;
-      unlock_node(pnode, __func__, (char *)NULL, LOGLEVEL);
+      unlock_node(pnode, __func__, NULL, LOGLEVEL);
       }
     current = current->next;
     }
@@ -2553,7 +2553,7 @@ int check_for_node_type(
   if (reporter == NULL)
     {
     /* this shouldn't be possible */
-    log_err(-1, __func__, (char *)"Checking for node types with a non-cray enabled pbs_server??");
+    log_err(-1, __func__, "Checking for node types with a non-cray enabled pbs_server??");
     return(-1);
     }
 
@@ -2568,13 +2568,13 @@ int check_for_node_type(
           (!strcmp(p->name, alps_starter_feature)))
         continue;
 
-      lock_node(reporter, __func__, (char *)NULL, 0);
+      lock_node(reporter, __func__, NULL, 0);
       pnode = find_node_in_allnodes(&(reporter->alps_subnodes), p->name);
-      unlock_node(reporter, __func__, (char *)NULL, 0);
+      unlock_node(reporter, __func__, NULL, 0);
 
       if (pnode != NULL)
         {
-        unlock_node(pnode, __func__, (char *)NULL, 0);
+        unlock_node(pnode, __func__, NULL, 0);
 
         if (nt == ND_TYPE_CRAY)
           {
@@ -2594,7 +2594,7 @@ int check_for_node_type(
           if (pnode->nd_is_alps_login == TRUE)
             login = TRUE;
 
-          unlock_node(pnode, __func__, (char *)NULL, 0);
+          unlock_node(pnode, __func__, NULL, 0);
 
           if (nt == ND_TYPE_EXTERNAL)
             {
@@ -2671,7 +2671,7 @@ int add_login_node_if_needed(
     if (login->nd_is_alps_login == FALSE)
       need_to_add_login = TRUE;
 
-    unlock_node(login, __func__, (char *)NULL, 0);
+    unlock_node(login, __func__, NULL, 0);
     }
 
   if (need_to_add_login == TRUE)
@@ -2698,7 +2698,7 @@ int add_login_node_if_needed(
       
       rc = PBSE_NONE;
 
-      unlock_node(login, __func__, (char *)NULL, 0);
+      unlock_node(login, __func__, NULL, 0);
       }
 
     if (prop != NULL)
@@ -2864,7 +2864,7 @@ int node_spec(
     else if (all_reqs.req_start != NULL)
       free(all_reqs.req_start);
 
-    log_err(ENOMEM, __func__, (char *)"Cannot allocate memory!");
+    log_err(ENOMEM, __func__, "Cannot allocate memory!");
     free(spec);
     return(-1);
     }
@@ -3782,7 +3782,7 @@ int translate_howl_to_string(
 
   if ((str = (char *)calloc(1, len + 1)) == NULL)
     {
-    log_err(ENOMEM, __func__, (char *)"Cannot allocate memory!");
+    log_err(ENOMEM, __func__, "Cannot allocate memory!");
 
     if (EMsg != NULL)
       sprintf(EMsg,"no nodes can be allocated to job");
@@ -3797,7 +3797,7 @@ int translate_howl_to_string(
     /* port list will have a string of sister port addresses */
     if ((portlist = (char *)calloc(1, (count * PBS_MAXPORTNUM) + count)) == NULL)
       {
-      log_err(ENOMEM, __func__, (char *)"Cannot allocate memory!");
+      log_err(ENOMEM, __func__, "Cannot allocate memory!");
       
       if (EMsg != NULL)
         sprintf(EMsg,"no nodes can be allocated to job");
@@ -3969,7 +3969,7 @@ int build_hostlist_nodes_req(
           }
         }
 
-      unlock_node(pnode, __func__, (char *)NULL, LOGLEVEL);
+      unlock_node(pnode, __func__, NULL, LOGLEVEL);
       }
 
     current = current->next;
@@ -4075,7 +4075,7 @@ int add_to_ms_list(
     {
     insert_thing(pnode->nd_ms_jobs, strdup(pjob->ji_qs.ji_jobid));
 
-    unlock_node(pnode, __func__, (char *)NULL, 0);
+    unlock_node(pnode, __func__, NULL, 0);
     }
 
   return(PBSE_NONE);
@@ -4228,7 +4228,7 @@ int set_nodes(
   else if (i < 0)
     {
     /* request failed, corrupt request */
-    log_err(PBSE_UNKNODE, __func__, (char *)"request failed, corrupt request");
+    log_err(PBSE_UNKNODE, __func__, "request failed, corrupt request");
     free_naji(naji);
     free_alps_req_data_array(ard_array, num_reqs);
     return(PBSE_UNKNODE);
@@ -4574,7 +4574,7 @@ int node_avail(
 
   if (spec == NULL)
     {
-    log_event(PBSEVENT_ADMIN, PBS_EVENTCLASS_SERVER, __func__, (char *)"no spec");
+    log_event(PBSEVENT_ADMIN, PBS_EVENTCLASS_SERVER, __func__, "no spec");
 
     return(RM_ERR_NOPARAM);
     }
@@ -4693,7 +4693,7 @@ int node_reserve(
 
   if ((nspec == NULL) || (*nspec == '\0'))
     {
-    log_event(PBSEVENT_ADMIN, PBS_EVENTCLASS_SERVER, __func__, (char *)"no spec");
+    log_event(PBSEVENT_ADMIN, PBS_EVENTCLASS_SERVER, __func__, "no spec");
 
     return(-1);
     }
@@ -4991,7 +4991,7 @@ void free_nodes(
       remove_job_from_node(pnode, pjob);
       remove_job_from_nodes_gpus(pnode, pjob);
       remove_job_from_nodes_mics(pnode, pjob);
-      unlock_node(pnode, __func__, (char *)NULL, 0);
+      unlock_node(pnode, __func__, NULL, 0);
       }
     }
 
@@ -5002,7 +5002,7 @@ void free_nodes(
     if ((pnode = find_nodebyname(pjob->ji_wattr[JOB_ATR_login_node_id].at_val.at_str)) != NULL)
       {
       remove_job_from_node(pnode, pjob);
-      unlock_node(pnode, __func__, (char *)NULL, 0);
+      unlock_node(pnode, __func__, NULL, 0);
       }
     }
 
@@ -5033,9 +5033,9 @@ struct pbsnode *get_compute_node(
       }
     }
 
-  lock_node(ar, __func__, (char *)NULL, 0);
+  lock_node(ar, __func__, NULL, 0);
   compute_node = create_alps_subnode(ar, node_name);
-  unlock_node(ar, __func__, (char *)NULL, 0);
+  unlock_node(ar, __func__, NULL, 0);
 
   return(compute_node);
   } /* END get_compute_node() */
@@ -5125,7 +5125,7 @@ void set_one_old(
         }    /* END for (snp) */
       }
 
-    unlock_node(pnode, __func__, (char *)NULL, LOGLEVEL);
+    unlock_node(pnode, __func__, NULL, LOGLEVEL);
     }
 
   return;
@@ -5194,9 +5194,9 @@ job *get_job_from_jobinfo(
   {
   job *pjob;
 
-  unlock_node(pnode, __func__, (char *)NULL, LOGLEVEL);
+  unlock_node(pnode, __func__, NULL, LOGLEVEL);
   pjob = svr_find_job(jp->jobid, TRUE);
-  lock_node(pnode, __func__, (char *)NULL, LOGLEVEL);
+  lock_node(pnode, __func__, NULL, LOGLEVEL);
 
   return(pjob);
   } /* END get_job_from_jobinfo() */
diff --git a/src/server/pbsd_init.c b/src/server/pbsd_init.c
index dc288597d4..18dacd33b1 100644
--- a/src/server/pbsd_init.c
+++ b/src/server/pbsd_init.c
@@ -98,6 +98,7 @@
 #include "../lib/Liblog/log_event.h"
 #include "../lib/Liblog/setup_env.h"
 #include "../lib/Liblog/chk_file_sec.h"
+#include "../lib/Libifl/lib_ifl.h"
 #include "list_link.h"
 #include "attribute.h"
 #include "server_limits.h"
@@ -396,7 +397,7 @@ void  update_default_np()
       npfreediff = pnode->nd_nsn - pnode->nd_nsnfree;
       pnode->nd_nsn = default_np;
       pnode->nd_nsnfree = default_np - npfreediff;
-      unlock_node(pnode, __func__, (char *)NULL, LOGLEVEL);
+      unlock_node(pnode, __func__, NULL, LOGLEVEL);
       }
     }
 
@@ -466,7 +467,7 @@ dynamic_string *make_default_hierarchy()
   if (((default_hierarchy = get_dynamic_string(-1, NULL)) == NULL) ||
       ((level_ds = get_dynamic_string(-1, NULL)) == NULL))
     {
-    log_err(ENOMEM, __func__, (char *)"Cannot allocate memory");
+    log_err(ENOMEM, __func__, "Cannot allocate memory");
     return(NULL);
     }
 
@@ -488,7 +489,7 @@ dynamic_string *make_default_hierarchy()
 
     pnode->nd_hierarchy_level = 0;
 
-    unlock_node(pnode, __func__, (char *)NULL, LOGLEVEL);
+    unlock_node(pnode, __func__, NULL, LOGLEVEL);
     }
 
   copy_to_end_of_dynamic_string(default_hierarchy, level_ds->str);
@@ -596,7 +597,7 @@ void check_if_in_nodes_file(
   if (pnode->nd_hierarchy_level > level_index)
     pnode->nd_hierarchy_level = level_index;
 
-  unlock_node(pnode, __func__, (char *)NULL, LOGLEVEL);
+  unlock_node(pnode, __func__, NULL, LOGLEVEL);
 
   if (colon != NULL)
     *colon = ':';
@@ -620,7 +621,7 @@ int handle_level(
 
   if ((level_buf = get_dynamic_string(-1, NULL)) == NULL)
     {
-    log_err(ENOMEM, __func__, (char *)"Cannot allocate memory");
+    log_err(ENOMEM, __func__, "Cannot allocate memory");
     return(ENOMEM);
     }
 
@@ -732,7 +733,7 @@ dynamic_string *parse_mom_hierarchy(
 
   memset(&buffer, 0, sizeof(buffer));
 
-  if ((bytes_read = read(fds, buffer, sizeof(buffer) - 1)) < 0)
+  if ((bytes_read = read_ac_socket(fds, buffer, sizeof(buffer) - 1)) < 0)
     {
     snprintf(log_buf, sizeof(log_buf),
       "Unable to read from %s", path_mom_hierarchy);
@@ -743,7 +744,7 @@ dynamic_string *parse_mom_hierarchy(
   
   if ((send_format = get_dynamic_string(-1, NULL)) == NULL)
     {
-    log_err(ENOMEM, __func__, (char *)"Cannot allocate memory");
+    log_err(ENOMEM, __func__, "Cannot allocate memory");
     return(NULL);
     }
 
@@ -799,7 +800,7 @@ dynamic_string *parse_mom_hierarchy(
         log_err( -1, __func__, log_buf);
         }
 
-      unlock_node(pnode, __func__, (char *)NULL, LOGLEVEL);
+      unlock_node(pnode, __func__, NULL, LOGLEVEL);
       }
 
     if (first_missing_node == FALSE)
@@ -901,7 +902,7 @@ void add_all_nodes_to_hello_container()
         add_hello_after(&hellos, node_name_dup, level_indices[pnode->nd_hierarchy_level]);
       }
 
-    unlock_node(pnode, __func__, (char *)NULL, LOGLEVEL);
+    unlock_node(pnode, __func__, NULL, LOGLEVEL);
     }
 
   return;
@@ -1002,7 +1003,7 @@ int setup_signal_handling()
 
   if (sigaction(SIGHUP, &act, &oact) != 0)
     {
-    log_err(errno, __func__, (char *)"sigaction for HUP");
+    log_err(errno, __func__, "sigaction for HUP");
 
     return(2);
     }
@@ -1011,14 +1012,14 @@ int setup_signal_handling()
 
   if (sigaction(SIGINT, &act, &oact) != 0)
     {
-    log_err(errno, __func__, (char *)"sigaction for INT");
+    log_err(errno, __func__, "sigaction for INT");
 
     return(2);
     }
 
   if (sigaction(SIGTERM, &act, &oact) != 0)
     {
-    log_err(errno, __func__, (char *)"sigactin for TERM");
+    log_err(errno, __func__, "sigactin for TERM");
 
     return(2);
     }
@@ -1027,7 +1028,7 @@ int setup_signal_handling()
 
   if (sigaction(SIGQUIT, &act, &oact) != 0)
     {
-    log_err(errno, __func__, (char *)"sigactin for QUIT");
+    log_err(errno, __func__, "sigactin for QUIT");
 
     return(2);
     }
@@ -1038,7 +1039,7 @@ int setup_signal_handling()
 
   if (sigaction(SIGSHUTDN, &act, &oact) != 0)
     {
-    log_err(errno, __func__, (char *)"sigactin for SHUTDN");
+    log_err(errno, __func__, "sigactin for SHUTDN");
 
     return(2);
     }
@@ -1072,7 +1073,7 @@ int setup_signal_handling()
 
   if (sigaction(SIGCHLD, &act, &oact) != 0)
     {
-    log_err(errno, __func__, (char *)"sigaction for CHLD");
+    log_err(errno, __func__, "sigaction for CHLD");
 
     return(2);
     }
@@ -1081,7 +1082,7 @@ int setup_signal_handling()
 
   if (sigaction(SIGPIPE, &act, &oact) != 0)
     {
-    log_err(errno, __func__, (char *)"sigaction for PIPE");
+    log_err(errno, __func__, "sigaction for PIPE");
 
     return(2);
     }
@@ -1090,14 +1091,14 @@ int setup_signal_handling()
 
   if (sigaction(SIGUSR1, &act, &oact) != 0)
     {
-    log_err(errno, __func__, (char *)"sigaction for USR1");
+    log_err(errno, __func__, "sigaction for USR1");
 
     return(2);
     }
 
   if (sigaction(SIGUSR2, &act, &oact) != 0)
     {
-    log_err(errno, __func__, (char *)"sigaction for USR2");
+    log_err(errno, __func__, "sigaction for USR2");
 
     return(2);
     }
@@ -1501,7 +1502,7 @@ int handle_queue_recovery(
           que_attr_def[QE_ATR_ResourceAssn].at_free(&pque->qu_attr[QE_ATR_ResourceAssn]);
           }
 
-        unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+        unlock_queue(pque, __func__, NULL, LOGLEVEL);
         }
       }
     }
@@ -1587,7 +1588,7 @@ int handle_array_recovery(
 
         pa->jobs_recovered = 0;
 
-        unlock_ai_mutex(pa, __func__, (char *)"2", LOGLEVEL);
+        unlock_ai_mutex(pa, __func__, "2", LOGLEVEL);
         }
       else
         {
@@ -1699,7 +1700,7 @@ int handle_job_recovery(
             if (type == RECOV_COLD)
               pjob->ji_cold_restart = TRUE;
             
-            unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+            unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
             }
 
           continue;
@@ -1720,7 +1721,7 @@ int handle_job_recovery(
           if (type == RECOV_COLD)
             pjob->ji_cold_restart = TRUE;
 
-          unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
           }
         else
           {
@@ -1733,7 +1734,7 @@ int handle_job_recovery(
 
           if (link(pdirent->d_name, basen) < 0)
             {
-            log_err(errno, __func__, (char *)"failed to link corrupt .JB file to .BD");
+            log_err(errno, __func__, "failed to link corrupt .JB file to .BD");
             }
           else
             {
@@ -1752,7 +1753,7 @@ int handle_job_recovery(
       {
       job *pjob = (job *)Array.Data[Index];
 
-      lock_ji_mutex(pjob, __func__, (char *)NULL, LOGLEVEL);
+      lock_ji_mutex(pjob, __func__, NULL, LOGLEVEL);
 
       job_rc = pbsd_init_job(pjob, type);
 
@@ -1764,7 +1765,7 @@ int handle_job_recovery(
           pjob->ji_qs.ji_jobid,
           msg_script_open);
 
-        unlock_ji_mutex(pjob, __func__, (char *)"4", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "4", LOGLEVEL);
 
         continue;
         }
@@ -1788,11 +1789,11 @@ int handle_job_recovery(
           }
         else
           {
-          unlock_ji_mutex(pjob, __func__, (char *)"5", LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, "5", LOGLEVEL);
           }
         }
       else
-        unlock_ji_mutex(pjob, __func__, (char *)"6", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "6", LOGLEVEL);
       }
 
     DArrayFree(&Array);
@@ -1829,7 +1830,7 @@ int handle_job_recovery(
       
       job_save(pjob, SAVEJOB_FULL, 0);
       
-      unlock_ji_mutex(pjob, __func__, (char *)"7", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "7", LOGLEVEL);
       }
     }
 
@@ -1855,7 +1856,7 @@ int cleanup_recovered_arrays()
     if ((pjob = svr_find_job(pa->ai_qs.parent_id, FALSE)) != NULL)
       {
       job_template_exists = TRUE;
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
       }
 
     /* if no jobs were recovered, delete this array */
@@ -1896,7 +1897,7 @@ int cleanup_recovered_arrays()
             {
             if ((pjob = svr_find_job(pa->job_ids[i], FALSE)) != NULL)
               {
-              unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+              unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
               svr_job_purge(pjob);
 
               pa = get_array(arrayid);
@@ -1923,7 +1924,7 @@ int cleanup_recovered_arrays()
       continue;
       }
 
-    unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+    unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
     } /* END for each array */
 
   return(rc);
@@ -1965,7 +1966,7 @@ int handle_tracking_records()
 
   if ((fd = open(path_track, O_RDONLY | O_CREAT, 0600)) < 0)
     {
-    log_err(errno, __func__, (char *)"unable to open tracking file");
+    log_err(errno, __func__, "unable to open tracking file");
 
     return(-1);
     }
@@ -2005,7 +2006,7 @@ int handle_tracking_records()
     (server.sv_track + i)->tk_mtime = 0;
 
   /* NOTE:  tracking file records are optional */
-  if (read(fd, (char *)server.sv_track, server.sv_tracksize * sizeof(struct tracking)) < 0)
+  if (read_ac_socket(fd, (char *)server.sv_track, server.sv_tracksize * sizeof(struct tracking)) < 0)
     {
     log_err(errno, "pbs_init", "unable to read tracksize from tracking file");
     }
@@ -2415,11 +2416,11 @@ int pbsd_init_job(
           strcpy(job_id, pjob->ji_qs.ji_jobid);
           job_atr_hold = pjob->ji_wattr[JOB_ATR_hold].at_val.at_long;
           job_exit_status = pjob->ji_qs.ji_un.ji_exect.ji_exitstat;
-          unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
           update_array_values(pa,JOB_STATE_RUNNING,aeTerminate,
               job_id, job_atr_hold, job_exit_status);
           
-          unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+          unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
           pjob = svr_find_job(job_id, FALSE);
           }
          
@@ -2796,7 +2797,7 @@ void resume_net_move(
   
     net_move(pjob, 0);
     
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
     free(jobid);
     }
diff --git a/src/server/pbsd_main.c b/src/server/pbsd_main.c
index 6a190d10f8..3a52b54dc0 100644
--- a/src/server/pbsd_main.c
+++ b/src/server/pbsd_main.c
@@ -108,6 +108,7 @@
 #include "../lib/Liblog/pbs_log.h"
 #include "../lib/Liblog/log_event.h"
 #include "../lib/Liblog/chk_file_sec.h"
+#include "../lib/Libifl/lib_ifl.h"
 #include "server_limits.h"
 #include "attribute.h"
 #include "pbs_job.h"
@@ -157,7 +158,7 @@ extern int  schedule_jobs(void);
 extern int  notify_listeners(void);
 extern void svr_shutdown(int);
 extern void acct_close(void);
-extern int  svr_startjob(job *, struct batch_request *, char *, char *);
+extern int  svr_startjob(job *, struct batch_request **, char *, char *);
 extern int RPPConfigure(int, int);
 extern void acct_cleanup(long);
 void stream_eof(int, u_long, uint16_t, int);
@@ -199,6 +200,8 @@ extern int    recov_svr_attr (int);
 extern void  change_logs_handler(int);
 extern void  change_logs();
 
+/* ssize_t write_neverblocking_socket(int, const void *, ssize_t); */
+
 /* Local Private Functions */
 
 static int    get_port (char *, unsigned int *, pbs_net_t *);
@@ -807,7 +810,7 @@ void parse_command_line(
             }
           else
             {
-            log_err(-1, __func__, (char *)"unable to determine full server hostname");
+            log_err(-1, __func__, "unable to determine full server hostname");
             }
 
           exit(1);
@@ -1046,7 +1049,7 @@ pthread_t      route_retry_thread_id = -1;
  * Returns: amount of time till next task
  */
 
-void *check_tasks()
+void *check_tasks(void *notUsed)
 
   {
   work_task *ptask;
@@ -1124,7 +1127,7 @@ static int start_hot_jobs(void)
       ct++;
       }
 
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
     }
 
   return(ct);
@@ -1171,7 +1174,7 @@ void *handle_queue_routing_retries(
         enqueue_threadpool_request(queue_route, queuename);
         }
 
-      unlock_queue(pque, __func__, (char *)NULL, 0);
+      unlock_queue(pque, __func__, NULL, 0);
       }
     }
 
@@ -1538,7 +1541,7 @@ void main_loop(void)
     if (pjob->ji_modified)
       job_save(pjob, SAVEJOB_FULL, 0);
 
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
     }
 
   if (svr_chngNodesfile)
@@ -1566,9 +1569,9 @@ void initialize_globals(void)
 
   msg_daemonname = strdup(pbs_current_user);
 
-  server.sv_qs_mutex = calloc(1, sizeof(pthread_mutex_t));
-  server.sv_attr_mutex = calloc(1, sizeof(pthread_mutex_t));
-  server.sv_jobstates_mutex = calloc(1, sizeof(pthread_mutex_t));
+  server.sv_qs_mutex = (pthread_mutex_t *)calloc(1, sizeof(pthread_mutex_t));
+  server.sv_attr_mutex = (pthread_mutex_t *)calloc(1, sizeof(pthread_mutex_t));
+  server.sv_jobstates_mutex = (pthread_mutex_t *)calloc(1, sizeof(pthread_mutex_t));
 
   pthread_mutex_init(server.sv_qs_mutex,NULL);
   pthread_mutex_init(server.sv_attr_mutex,NULL);
@@ -1876,7 +1879,7 @@ int main(
 
   if (!high_availability_mode)
     {
-    if (write(lockfds, log_buf, strlen(log_buf)) !=
+    if (write_ac_socket(lockfds, log_buf, strlen(log_buf)) !=
         (ssize_t)strlen(log_buf))
       {
       log_err(errno, msg_daemonname, (char *)"failed to write pid to lockfile");
@@ -2342,7 +2345,7 @@ int is_ha_lock_file_valid(
 
   if (GoodPermissions == FALSE)
     {
-    log_err(-1, __func__, (char *)"could not obtain the needed permissions for the lock file");
+    log_err(-1, __func__, "could not obtain the needed permissions for the lock file");
     }
 
   return(GoodPermissions);
@@ -2634,15 +2637,15 @@ int start_update_ha_lock_thread()
 
   if (fds < 0)
     {
-    log_err(-1, __func__, (char *)"Couldn't write the pid to the lockfile\n");
+    log_err(-1, __func__, "Couldn't write the pid to the lockfile\n");
 
     return(FAILURE);
     }
 
   snprintf(smallBuf,sizeof(smallBuf),"%ld\n",(long)sid);
-  if (write(fds,smallBuf,strlen(smallBuf)) != (ssize_t)strlen(smallBuf))
+  if (write_ac_socket(fds,smallBuf,strlen(smallBuf)) != (ssize_t)strlen(smallBuf))
     {
-    log_err(-1, __func__, (char *)"Couldn't write the pid to the lockfile\n");
+    log_err(-1, __func__, "Couldn't write the pid to the lockfile\n");
     close(fds);
 
     return(FAILURE);
@@ -2664,7 +2667,7 @@ int start_update_ha_lock_thread()
     {
     /* error creating thread */
 
-    log_err(-1, __func__, (char *)"Could not create HA Lock Thread\n");
+    log_err(-1, __func__, "Could not create HA Lock Thread\n");
 
     return(FAILURE);
     }
@@ -2883,7 +2886,7 @@ static int daemonize_server(
 
   if ((pid = fork()) == -1)
     {
-    log_err(errno, __func__, (char *)"cannot fork into background");
+    log_err(errno, __func__, "cannot fork into background");
 
     return(FAILURE);
    }
@@ -2906,7 +2909,7 @@ static int daemonize_server(
 
   if ((*sid = setsid()) == -1)
     {
-    log_err(errno, __func__, (char *)"Could not disconnect from controlling terminal");
+    log_err(errno, __func__, "Could not disconnect from controlling terminal");
 
     return(FAILURE);
     }
@@ -2928,7 +2931,7 @@ static int daemonize_server(
 
   if ((pid = fork()) == -1)
     {
-    log_err(errno, __func__, (char *)"cannot fork into background");
+    log_err(errno, __func__, "cannot fork into background");
 
     return(FAILURE);
     }
@@ -3188,7 +3191,7 @@ int svr_restart()
       {
       /* could not calloc */
 
-      log_err(errno, __func__, (char *)"ERROR:   (char *)  cannot allocate memory for full command, cannot restart\n");
+      log_err(errno, __func__, "ERROR:   (char *)  cannot allocate memory for full command, cannot restart\n");
 
       exit(-10);
       }
diff --git a/src/server/process_alps_status.c b/src/server/process_alps_status.c
index 782bdcb8f5..982b2e6af9 100644
--- a/src/server/process_alps_status.c
+++ b/src/server/process_alps_status.c
@@ -141,7 +141,7 @@ struct pbsnode *create_alps_subnode(
   char           *node_id)
 
   {
-  struct pbsnode *subnode = calloc(1, sizeof(struct pbsnode));
+  struct pbsnode *subnode = (struct pbsnode *)calloc(1, sizeof(struct pbsnode));
   svrattrl       *plist = NULL;
   int             bad;
   int             rc;
@@ -149,14 +149,14 @@ struct pbsnode *create_alps_subnode(
   if (initialize_pbsnode(subnode, strdup(node_id), NULL, NTYPE_CLUSTER) != PBSE_NONE)
     {
     free(subnode);
-    log_err(ENOMEM, __func__, (char *)"");
+    log_err(ENOMEM, __func__, "");
     return(NULL);
     }
 
   if (create_subnode(subnode) == NULL)
     {
     free(subnode);
-    log_err(ENOMEM, __func__, (char *)"");
+    log_err(ENOMEM, __func__, "");
     return(NULL);
     }
 
@@ -175,7 +175,7 @@ struct pbsnode *create_alps_subnode(
   if (rc != PBSE_NONE)
     {
     free(subnode);
-    log_err(rc, __func__, (char *)"Couldn't set node attributes");
+    log_err(rc, __func__, "Couldn't set node attributes");
     return(NULL);
     }
 
@@ -303,14 +303,14 @@ int set_ncpus(
   if (current == NULL)
     return(PBSE_BAD_PARAMETER);
   
-  ncpus = atoi(str + cproc_eq_len);
+  ncpus = atoi(str + ac_cproc_eq_len);
   difference = ncpus - current->nd_nsn;
 
   for (i = 0; i < difference; i++)
     {
     if (create_subnode(current) == NULL)
       {
-      log_err(ENOMEM, __func__, (char *)"");
+      log_err(ENOMEM, __func__, "");
       return(PBSE_SYSTEM);
       }
 
@@ -380,7 +380,7 @@ int set_ngpus(
     {
     if (create_a_gpusubnode(pnode) != PBSE_NONE)
       {
-      log_err(ENOMEM, __func__, (char *)"");
+      log_err(ENOMEM, __func__, "");
       return(PBSE_SYSTEM);
       }
     }
@@ -497,7 +497,7 @@ int record_reservation(
         create_alps_reservation(pjob);
         found_job = TRUE;
 
-        unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
         lock_node(pnode, __func__, NULL, 0);
         break;
         }
@@ -621,7 +621,7 @@ int process_alps_status(
         if ((parent = find_nodebyname(nd_name)) == NULL)
           {
           /* reporter node disappeared - this shouldn't be possible */
-          log_err(PBSE_UNKNODE, __func__, (char *)"Alps reporter node disappeared while recording a reservation");
+          log_err(PBSE_UNKNODE, __func__, "Alps reporter node disappeared while recording a reservation");
           free_arst(&temp);
           free_all_keys(rsv_ht);
           free_hash(rsv_ht);
@@ -657,7 +657,7 @@ int process_alps_status(
       }
 
     /* perform any special processing */
-    if (!strncmp(str, cproc_eq, cproc_eq_len))
+    if (!strncmp(str, cproc_eq, ac_cproc_eq_len))
       {
       set_ncpus(current, str);
       }
diff --git a/src/server/process_mom_update.c b/src/server/process_mom_update.c
index 1146fec321..7c8484ebc2 100644
--- a/src/server/process_mom_update.c
+++ b/src/server/process_mom_update.c
@@ -131,7 +131,7 @@ int save_single_mic_status(
     {
     if ((rc = decode_arst(temp, NULL, NULL, single_mic_status->str, 0)) != PBSE_NONE)
       {
-      log_err(ENOMEM, __func__, (char *)"");
+      log_err(ENOMEM, __func__, "");
       free_arst(temp);
       }
     
@@ -196,7 +196,7 @@ int process_mic_status(
 
     if (mic_count > pnode->nd_nmics_alloced)
       {
-      struct jobinfo *tmp = calloc(mic_count, sizeof(struct jobinfo));
+      struct jobinfo *tmp = (struct jobinfo *)calloc(mic_count, sizeof(struct jobinfo));
       
       if (tmp == NULL)
         return(ENOMEM);
@@ -243,7 +243,7 @@ struct pbsnode *get_numa_from_str(
       np->nd_name);
     log_err(-1, __func__, log_buf);
   
-    unlock_node(np, __func__, (char *)"np numa update", LOGLEVEL);
+    unlock_node(np, __func__, "np numa update", LOGLEVEL);
     
     return(NULL);
     }
@@ -262,14 +262,14 @@ struct pbsnode *get_numa_from_str(
       np->nd_name);
     log_err(-1, __func__, log_buf);
     
-    unlock_node(np, __func__, (char *)"np numa update", LOGLEVEL);
+    unlock_node(np, __func__, "np numa update", LOGLEVEL);
     
     return(NULL);
     }
  
   /* SUCCESS */
-  unlock_node(np, __func__, (char *)"np numa update", LOGLEVEL);
-  lock_node(numa, __func__, (char *)"numa numa update", LOGLEVEL);
+  unlock_node(np, __func__, "np numa update", LOGLEVEL);
+  lock_node(numa, __func__, "numa numa update", LOGLEVEL);
   
   numa->nd_lastupdate = time(NULL);
   
@@ -297,7 +297,7 @@ struct pbsnode *get_node_from_str(
   /* don't do anything if the name is the same as this node's name */
   if (strcmp(node_id, np->nd_name))
     {
-    unlock_node(np, __func__, (char *)"np not numa update", LOGLEVEL);
+    unlock_node(np, __func__, "np not numa update", LOGLEVEL);
     
     next = find_nodebyname(node_id);
     
@@ -442,7 +442,7 @@ void update_job_data(
           memset(&tA, 0, sizeof(tA));
 
           tA.al_name  = attr_name;
-          tA.al_resc  = "";
+          tA.al_resc  = (char *)"";
           tA.al_value = attr_value;
           tA.al_op    = SET;
 
@@ -455,7 +455,7 @@ void update_job_data(
           attr_name = threadsafe_tokenizer(&jobdata_ptr, "=");
           }
         
-        unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
         }
       
       if (on_node == FALSE)
@@ -678,7 +678,22 @@ int process_status_info(
       if ((current = get_node_from_str(str, name, current)) == NULL)
         break;
       else
+        {
+        /* There is a race condition if using a mom hierarchy and manually
+         * shutting down a non-level 1 mom: if its message that the mom is
+         * shutting down gets there before its last status update, the node
+         * can incorrectly be set as free again. For that reason, only set
+         * a mom back up if its reporting for itself. */
+        if ((strcmp(name, str + strlen("node=")) != 0) &&
+            (current->nd_mom_reported_down == TRUE))
+          {
+          dont_change_state = TRUE;
+          }
+          
+        current->nd_mom_reported_down = FALSE;
+
         continue;
+        }
       }
 
     /* add the info to the "temp" pbs_attribute */
@@ -741,8 +756,8 @@ int process_status_info(
       {
       /* walk job list reported by mom */
       size_t         len = strlen(str) + strlen(current->nd_name) + 2;
-      char          *jobstr = calloc(1, len);
-      sync_job_info *sji = calloc(1, sizeof(sync_job_info));
+      char          *jobstr = (char *)calloc(1, len);
+      sync_job_info *sji = (sync_job_info *)calloc(1, sizeof(sync_job_info));
 
       if ((jobstr != NULL)&&(sji != NULL))
         {
@@ -777,7 +792,7 @@ int process_status_info(
   if (current != NULL)
     {
     save_node_status(current, &temp);
-    unlock_node(current, __func__, (char *)NULL, 0);
+    unlock_node(current, __func__, NULL, 0);
     }
   
   if ((rc == PBSE_NONE) &&
diff --git a/src/server/process_request.c b/src/server/process_request.c
index 299e2d4b28..de7e0cc50e 100644
--- a/src/server/process_request.c
+++ b/src/server/process_request.c
@@ -614,7 +614,7 @@ int process_request(
             }
 
           }
-        unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
         }
       
       if (!skip)
@@ -1053,7 +1053,7 @@ int close_quejob_by_jobid(
     }
 
   if (pjob != NULL)
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
   return(rc);
   } /* close_quejob_by_jobid() */
diff --git a/src/server/queue_func.c b/src/server/queue_func.c
index 761f1f6de8..7aafe34e2e 100644
--- a/src/server/queue_func.c
+++ b/src/server/queue_func.c
@@ -247,7 +247,7 @@ pbs_queue *que_alloc(
   initialize_all_jobs_array(pq->qu_jobs);
   initialize_all_jobs_array(pq->qu_jobs_array_sum);
   pthread_mutex_init(pq->qu_mutex,NULL);
-  lock_queue(pq, __func__, (char *)NULL, LOGLEVEL);
+  lock_queue(pq, __func__, NULL, LOGLEVEL);
 
   snprintf(pq->qu_qs.qu_name, sizeof(pq->qu_qs.qu_name), "%s", name);
 
@@ -372,7 +372,7 @@ int que_purge(
 
 pbs_queue *find_queuebyname(
 
-  char *quename) /* I */
+  const char *quename) /* I */
 
   {
   char  *pc;
@@ -397,7 +397,7 @@ pbs_queue *find_queuebyname(
     }
   
   if (pque != NULL)
-    lock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+    lock_queue(pque, __func__, NULL, LOGLEVEL);
 
   pthread_mutex_unlock(svr_queues.allques_mutex);
   
@@ -405,7 +405,7 @@ pbs_queue *find_queuebyname(
     {
     if (pque->q_being_recycled != FALSE)
       {
-      unlock_queue(pque, __func__, (char *)"recycled queue", LOGLEVEL);
+      unlock_queue(pque, __func__, "recycled queue", LOGLEVEL);
       pque = NULL;
       }
     }
@@ -482,7 +482,7 @@ int insert_queue(
   if ((rc = insert_thing(aq->ra,pque)) == -1)
     {
     rc = ENOMEM;
-    log_err(rc, __func__, (char *)"No memory to resize the array");
+    log_err(rc, __func__, "No memory to resize the array");
     }
   else
     {
@@ -511,9 +511,9 @@ int remove_queue(
 
   if (pthread_mutex_trylock(aq->allques_mutex))
     {
-    unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+    unlock_queue(pque, __func__, NULL, LOGLEVEL);
     pthread_mutex_lock(aq->allques_mutex);
-    lock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+    lock_queue(pque, __func__, NULL, LOGLEVEL);
     }
 
   if ((index = get_value_hash(aq->ht,pque->qu_qs.qu_name)) < 0)
@@ -555,7 +555,7 @@ pbs_queue *next_queue(
     {
     if (pque->q_being_recycled != FALSE)
       {
-      unlock_queue(pque, __func__, (char *)"recycled queue", LOGLEVEL);
+      unlock_queue(pque, __func__, "recycled queue", LOGLEVEL);
       pque = next_queue(aq, iter);
       }
     }
@@ -566,6 +566,102 @@ pbs_queue *next_queue(
 
 
 
+/* 
+ * gets the locks on both queues without releasing the all_queues mutex lock.
+ * Doing this another way can cause deadlock.
+ *
+ * @return PBSE_NONE on success
+ */
+
+int get_parent_dest_queues(
+
+  char       *queue_parent_name,
+  char       *queue_dest_name,
+  pbs_queue **parent,
+  pbs_queue **dest,
+  job       **pjob_ptr)
+
+  {
+  pbs_queue *pque_parent;
+  pbs_queue *pque_dest;
+  char       jobid[PBS_MAXSVRJOBID + 1];
+  char       log_buf[LOCAL_LOG_BUF_SIZE + 1];
+  job       *pjob = *pjob_ptr;
+  int        index_parent;
+  int        index_dest;
+  int        rc = PBSE_NONE;
+
+  strcpy(jobid, pjob->ji_qs.ji_jobid);
+  *dest   = NULL;
+
+  if ((queue_parent_name != NULL) && (queue_dest_name != NULL))
+    {
+    if (!strcmp(queue_parent_name, queue_dest_name))
+      {
+      /* parent and destination are the same. 
+         Job is already in destnation queue. return */
+      snprintf(log_buf, sizeof(log_buf), "parent and destination queues are the same: parent %s - dest %s. jobid: %s",
+          queue_parent_name,
+          queue_dest_name,
+          jobid);
+      log_event(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, __func__, log_buf);
+      return(-1); 
+      }
+    }
+  else
+    return(-1);
+
+  unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
+
+  unlock_queue(*parent, __func__, NULL, 0);
+
+  *parent = NULL;
+
+  pthread_mutex_lock(svr_queues.allques_mutex);
+
+  index_parent = get_value_hash(svr_queues.ht, queue_parent_name);
+  index_dest   = get_value_hash(svr_queues.ht, queue_dest_name);
+
+  if ((index_parent < 0) ||
+      (index_dest < 0))
+    {
+    rc = -1;
+    }
+  else
+    {
+    /* good path */
+    pque_parent = (pbs_queue *)svr_queues.ra->slots[index_parent].item;
+    pque_dest   = (pbs_queue *)svr_queues.ra->slots[index_dest].item;
+
+    if ((pque_parent == NULL) ||
+        (pque_dest == NULL))
+      {
+      rc = -1;
+      }
+    else
+      {
+      /* SUCCESS! */
+      lock_queue(pque_parent, __func__, NULL, 0);
+      lock_queue(pque_dest,   __func__, (char *)NULL, 0);
+      *parent = pque_parent;
+      *dest = pque_dest;
+
+      rc = PBSE_NONE;
+      }
+    }
+
+  pthread_mutex_unlock(svr_queues.allques_mutex);
+
+  if ((*pjob_ptr = svr_find_job(jobid, TRUE)) == NULL)
+    rc = -1;
+
+  return(rc);
+  } /* END get_parent_dest_queues() */
+
+
+
+
+
 pbs_queue *lock_queue_with_job_held(
 
   pbs_queue  *pque,
@@ -581,12 +677,12 @@ pbs_queue *lock_queue_with_job_held(
       {
       /* if fail */
       strcpy(jobid, pjob->ji_qs.ji_jobid);
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
-      lock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
+      lock_queue(pque, __func__, NULL, LOGLEVEL);
 
       if ((pjob = svr_find_job(jobid, TRUE)) == NULL)
         {
-        unlock_queue(pque, __func__, (char *)NULL, 0);
+        unlock_queue(pque, __func__, NULL, 0);
         pque = NULL;
         *pjob_ptr = NULL;
         }
diff --git a/src/server/queue_func.h b/src/server/queue_func.h
index 8e9c0a1dfa..0dd9b32028 100644
--- a/src/server/queue_func.h
+++ b/src/server/queue_func.h
@@ -15,7 +15,7 @@ void que_free(pbs_queue *pq, int sv_qs_mutex_held);
 
 int que_purge(pbs_queue *pque);
 
-pbs_queue *find_queuebyname(char *quename);
+pbs_queue *find_queuebyname(const char *quename);
 
 pbs_queue *get_dfltque(void);
 
diff --git a/src/server/queue_recov.c b/src/server/queue_recov.c
index 5035251dcd..c2985a8bf4 100644
--- a/src/server/queue_recov.c
+++ b/src/server/queue_recov.c
@@ -106,6 +106,7 @@
 #include "log.h"
 #include "../lib/Liblog/pbs_log.h"
 #include "../lib/Liblog/log_event.h"
+#include "../lib/Libifl/lib_ifl.h"
 #include "utils.h"
 #include <pthread.h>
 #include "queue_func.h" /* que_alloc, que_free */
@@ -137,7 +138,7 @@ int que_save(
   {
   int fds;
   int rc;
-  char   *myid = "que_save_xml";
+  const char   *myid = "que_save_xml";
   char namebuf1[MAXPATHLEN];
   char namebuf2[MAXPATHLEN];
   char buf[MAXLINE<<8];
@@ -236,7 +237,7 @@ pbs_queue *que_recov_xml(
 
   if (pq == NULL)
     {
-    log_err(-1, __func__, (char *)"que_alloc failed");
+    log_err(-1, __func__, "que_alloc failed");
 
     return(NULL);
     }
@@ -247,7 +248,7 @@ pbs_queue *que_recov_xml(
 
   if (fds < 0)
     {
-    log_err(errno, __func__, (char *)"open error");
+    log_err(errno, __func__, "open error");
 
     que_free(pq, TRUE);
 
@@ -255,7 +256,7 @@ pbs_queue *que_recov_xml(
     }
 
   /* read in queue save sub-structure */
-  if (read(fds,buf,sizeof(buf)) < 0)
+  if (read_ac_socket(fds,buf,sizeof(buf)) < 0)
     {
     snprintf(log_buf,sizeof(log_buf),
       "Unable to read from queue file %s",
@@ -288,7 +289,7 @@ pbs_queue *que_recov_xml(
 
   if (end == NULL)
     {
-    log_err(-1, __func__, (char *)"No queue tag found in the queue file???");
+    log_err(-1, __func__, "No queue tag found in the queue file???");
     que_free(pq, TRUE);
     close(fds);
     return(NULL);
@@ -409,7 +410,7 @@ pbs_queue *que_recov(
 
   if (pq == NULL)
     {
-    log_err(-1, __func__, (char *)"que_alloc failed");
+    log_err(-1, __func__, "que_alloc failed");
 
     return(NULL);
     }
@@ -420,7 +421,7 @@ pbs_queue *que_recov(
 
   if (fds < 0)
     {
-    log_err(errno, __func__, (char *)"open error");
+    log_err(errno, __func__, "open error");
 
     que_free(pq, TRUE);
 
@@ -429,10 +430,10 @@ pbs_queue *que_recov(
 
   /* read in queue save sub-structure */
 
-  if (read(fds, (char *)&pq->qu_qs, sizeof(struct queuefix)) !=
-      sizeof(struct queuefix))
+  if (read_ac_socket(fds, (char *)&pq->qu_qs, sizeof(queuefix)) !=
+      sizeof(queuefix))
     {
-    log_err(errno, __func__, (char *)"read error");
+    log_err(errno, __func__, "read error");
     que_free(pq, TRUE);
     close(fds);
     return ((pbs_queue *)0);
@@ -443,7 +444,7 @@ pbs_queue *que_recov(
   if (recov_attr(fds, pq, que_attr_def, pq->qu_attr,
 	               QA_ATR_LAST, 0, TRUE) != 0)
     {
-    log_err(-1, __func__, (char *)"recov_attr[common] failed");
+    log_err(-1, __func__, "recov_attr[common] failed");
     que_free(pq, TRUE);
     close(fds);
     return ((pbs_queue *)0);
diff --git a/src/server/queue_recycler.c b/src/server/queue_recycler.c
index 2fe6fa956f..ae7ac0109d 100644
--- a/src/server/queue_recycler.c
+++ b/src/server/queue_recycler.c
@@ -24,7 +24,7 @@ void initialize_queue_recycler()
   initialize_allques_array(&q_recycler.queues);
   q_recycler.iter = -1;
 
-  q_recycler.mutex = calloc(1, sizeof(pthread_mutex_t));
+  q_recycler.mutex = (pthread_mutex_t*)calloc(1, sizeof(pthread_mutex_t));
   pthread_mutex_init(q_recycler.mutex,&t_attr);
   } /* END initialize_recycler() */
 
@@ -40,9 +40,9 @@ pbs_queue *next_queue_from_recycler(
   pbs_queue *pq;
 
   pthread_mutex_lock(aq->allques_mutex);
-  pq = next_thing(aq->ra, iter);
+  pq = (pbs_queue *)next_thing(aq->ra, iter);
   if (pq != NULL)
-    lock_queue(pq, __func__, (char *)NULL, LOGLEVEL);
+    lock_queue(pq, __func__, NULL, LOGLEVEL);
   pthread_mutex_unlock(aq->allques_mutex);
 
   return(pq);
@@ -67,7 +67,7 @@ void *remove_some_recycle_queues(
     return NULL;
 
   remove_queue(&q_recycler.queues,pq);
-  unlock_queue(pq, __func__, (char *)NULL, LOGLEVEL);
+  unlock_queue(pq, __func__, NULL, LOGLEVEL);
   free(pq->qu_mutex);
   free_alljobs_array(pq->qu_jobs);
   free_alljobs_array(pq->qu_jobs_array_sum);
diff --git a/src/server/receive_mom_communication.c b/src/server/receive_mom_communication.c
index 7c41d28e3e..1ebd197fdc 100644
--- a/src/server/receive_mom_communication.c
+++ b/src/server/receive_mom_communication.c
@@ -238,14 +238,14 @@ int gpu_has_job(
               found_str = strstr (gpu_str, tmp_str);
               if (found_str != NULL)
                 {
-                unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+                unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
                 return(TRUE);
                 }
               }
             }
           
           /* done with job, unlock the mutex */
-          unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
           }
         }
       } /* END for each job on the subnode */
@@ -458,6 +458,11 @@ int svr_is_request(
 
       update_node_state(node, i);
 
+      if ((node->nd_state & INUSE_DOWN) != 0)
+        {
+        node->nd_mom_reported_down = TRUE;
+        }
+
       break;
 
     case IS_STATUS:
@@ -475,13 +480,12 @@ int svr_is_request(
       unlock_node(node, __func__, "before is_stat_get", LOGLEVEL);
 
       ret = is_stat_get(node_name, chan);
-/*      socket_read_flush(chan->sock); */
 
       node = find_nodebyname(node_name);
 
       if (ret == SEND_HELLO)
         {
-        struct hello_info *hi = calloc(1, sizeof(struct hello_info));
+        struct hello_info *hi = (struct hello_info *)calloc(1, sizeof(struct hello_info));
         write_tcp_reply(chan, IS_PROTOCOL, IS_PROTOCOL_VER, IS_STATUS, DIS_SUCCESS);
 
         hi->name = strdup(node_name);
diff --git a/src/server/req_delete.c b/src/server/req_delete.c
index 2e935b7c88..17a02b88ef 100644
--- a/src/server/req_delete.c
+++ b/src/server/req_delete.c
@@ -134,7 +134,7 @@ extern struct server server;
 extern int   LOGLEVEL;
 extern struct all_jobs alljobs;
 
-int issue_signal(job **, char *, void (*)(batch_request *), void *);
+int issue_signal(job **, const char *, void (*)(batch_request *), void *);
 
 /* Private Functions in this file */
 
@@ -153,9 +153,9 @@ void change_restart_comment_if_needed(struct job *);
 
 /* Private Data Items */
 
-static char *deldelaystr = DELDELAY;
-static char *delpurgestr = DELPURGE;
-static char *delasyncstr = DELASYNC;
+static const char *deldelaystr = DELDELAY;
+static const char *delpurgestr = DELPURGE;
+static const char *delasyncstr = DELASYNC;
 
 /* Extern Functions */
 
@@ -244,11 +244,11 @@ void force_purge_work(
     {
     if (pjob->ji_qhdr->qu_qs.qu_type == QTYPE_Execution)
       {
-      unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+      unlock_queue(pque, __func__, NULL, LOGLEVEL);
       set_resc_assigned(pjob, DECR);
       }
     else
-      unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+      unlock_queue(pque, __func__, NULL, LOGLEVEL);
     }
   
   if (pjob != NULL)
@@ -267,7 +267,7 @@ void ensure_deleted(
   job                  *pjob;
   char                 *jobid;
 
-  jobid = ptask->wt_parm1;
+  jobid = (char *)ptask->wt_parm1;
 
   if (jobid != NULL)
     {
@@ -296,7 +296,7 @@ int execute_job_delete(
   struct work_task *pwtnew;
 
   int               rc;
-  char             *sigt = "SIGTERM";
+  const char      *sigt = "SIGTERM";
 
   int               has_mutex = TRUE;
   char              log_buf[LOCAL_LOG_BUF_SIZE];
@@ -317,7 +317,7 @@ int execute_job_delete(
     /* see note in req_delete - not sure this is possible still,
      * but the deleted code is irrelevant now. I will leave this
      * part --dbeer */
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
     return(-1);
     }
@@ -374,7 +374,7 @@ int execute_job_delete(
 
     pwtnew = set_task(WORK_Timed,time_now + 1,post_delete_route,preq,FALSE);
     
-    unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
 
     if (pwtnew == NULL)
       {
@@ -448,7 +448,7 @@ int execute_job_delete(
 
     if (pjob->ji_has_delete_nanny == TRUE)
       {
-      unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
 
       req_reject(PBSE_IVALREQ, 0, preq, NULL, "job cancel in progress");
 
@@ -476,7 +476,7 @@ int execute_job_delete(
       sprintf(log_buf, msg_delrunjobsig, sigt);
       log_event(PBSEVENT_JOB,PBS_EVENTCLASS_JOB,pjob->ji_qs.ji_jobid,log_buf);
   
-      unlock_ji_mutex(pjob, __func__, (char *)"4", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "4", LOGLEVEL);
       }
 
     return(-1);
@@ -537,16 +537,16 @@ int execute_job_delete(
             svr_setjobstate(tmp, newstate, newsub, FALSE);
             job_save(tmp, SAVEJOB_FULL, 0);
 
-            unlock_ji_mutex(tmp, __func__, (char *)"5", LOGLEVEL);
+            unlock_ji_mutex(tmp, __func__, "5", LOGLEVEL);
             
             break;
             }
 
-          unlock_ji_mutex(tmp, __func__, (char *)"6", LOGLEVEL);
+          unlock_ji_mutex(tmp, __func__, "6", LOGLEVEL);
           }
         }
 
-      unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+      unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
       }
     } /* END MoabArrayCompatible check */
 
@@ -592,7 +592,7 @@ int execute_job_delete(
       {
       pque->qu_numcompleted++;
 
-      unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+      unlock_queue(pque, __func__, NULL, LOGLEVEL);
       
       if (LOGLEVEL >= 7)
         {
@@ -619,7 +619,7 @@ int execute_job_delete(
     }  /* END else if ((pjob->ji_qs.ji_svrflags & JOB_SVFLG_CHECKPOINT_FILE) != 0) */
 
   if (has_mutex == TRUE)
-    unlock_ji_mutex(pjob, __func__, (char *)"7", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "7", LOGLEVEL);
 
   return(PBSE_NONE);
   } /* END execute_job_delete() */
@@ -687,7 +687,7 @@ void *delete_all_work(
 
     if (pjob->ji_qs.ji_state >= JOB_STATE_EXITING)
       {
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
       
       continue;
       }
@@ -828,7 +828,7 @@ int handle_single_delete(
     }
   else
     {
-    unlock_ji_mutex(pjob, __func__, (char *)NULL, 0);
+    unlock_ji_mutex(pjob, __func__, NULL, 0);
 
     /* send the asynchronous reply if needed */
     if (preq_tmp != NULL)
@@ -1056,7 +1056,7 @@ void post_delete_mom1(
     return;
 
   rc          = preq_sig->rq_reply.brp_code;
-  preq_clt_id = preq_sig->rq_extra;
+  preq_clt_id = (char *)preq_sig->rq_extra;
 
   free_br(preq_sig);
 
@@ -1107,7 +1107,7 @@ void post_delete_mom1(
       {
       req_reject(rc, 0, preq_clt, NULL, NULL);
 
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
       }
 
     return;
@@ -1136,7 +1136,7 @@ void post_delete_mom1(
                              &server.sv_attr[SRV_ATR_KillDelay],
                              2);
       pthread_mutex_unlock(server.sv_attr_mutex);
-      unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+      unlock_queue(pque, __func__, NULL, LOGLEVEL);
       }
     else if (pjob == NULL)
       return;
@@ -1150,7 +1150,7 @@ void post_delete_mom1(
    */
   apply_job_delete_nanny(pjob, time_now + delay + 60);
 
-  unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
   }  /* END post_delete_mom1() */
 
 
@@ -1163,7 +1163,7 @@ static void post_delete_mom2(
 
   {
   char        *jobid;
-  char        *sigk = "SIGKILL";
+  const char *sigk = "SIGKILL";
   char         log_buf[LOCAL_LOG_BUF_SIZE];
   job         *pjob;
 
@@ -1173,7 +1173,7 @@ static void post_delete_mom2(
   
   if (jobid == NULL)
     {
-    log_err(ENOMEM, __func__, (char *)"Cannot allocate memory");
+    log_err(ENOMEM, __func__, "Cannot allocate memory");
     return;
     }
 
@@ -1194,7 +1194,7 @@ static void post_delete_mom2(
       }
     
     if (pjob != NULL)
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
     }
   }  /* END post_delete_mom2() */
 
@@ -1235,7 +1235,7 @@ int forced_jobpurge(
         /* FAILURE */
         req_reject(PBSE_PERM, 0, preq, NULL, NULL);
 
-        unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
         return(-1);
         }
@@ -1282,7 +1282,7 @@ int apply_job_delete_nanny(
     }
   else
     {
-    log_err(-1, __func__, (char *)"negative delay requested for nanny");
+    log_err(-1, __func__, "negative delay requested for nanny");
 
     return(-1);
     }
@@ -1325,7 +1325,7 @@ static void job_delete_nanny(
 
   {
   job                  *pjob;
-  char                 *sigk = "SIGKILL";
+  const char          *sigk = "SIGKILL";
   char                 *jobid;
 
   struct batch_request *newreq;
@@ -1361,13 +1361,13 @@ static void job_delete_nanny(
           {
           apply_job_delete_nanny(pjob, time_now + 60);
   
-          unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
           }
         }
       }
     else
       {
-      log_err(ENOMEM, __func__, (char *)"Cannot allocate memory");
+      log_err(ENOMEM, __func__, "Cannot allocate memory");
       }
     }
   
@@ -1439,7 +1439,7 @@ void post_job_delete_nanny(
     return;
     }
   
-  unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
   /* free task */
   free_br(preq_sig);
@@ -1517,7 +1517,7 @@ void purge_completed_jobs(
       job_save(pjob, SAVEJOB_FULL, 0); 
       }
 
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
     }
 
 
diff --git a/src/server/req_deletearray.c b/src/server/req_deletearray.c
index 35247b5ac1..474f0cd141 100644
--- a/src/server/req_deletearray.c
+++ b/src/server/req_deletearray.c
@@ -36,7 +36,7 @@ extern struct work_task *apply_job_delete_nanny(struct job *, int);
 extern int has_job_delete_nanny(struct job *);
 extern void remove_stagein(job **pjob);
 extern void change_restart_comment_if_needed(struct job *);
-int issue_signal(job **, char *, void(*)(batch_request *), void *);
+int issue_signal(job **, const char *, void(*)(batch_request *), void *);
 
 extern char *msg_unkarrayid;
 extern char *msg_permlog;
@@ -111,7 +111,7 @@ int attempt_delete(
         change_restart_comment_if_needed(pjob);
         }
 
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
       }
     
     return(!skipped);
@@ -162,7 +162,7 @@ int attempt_delete(
       {
       pque->qu_numcompleted++;
 
-      unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+      unlock_queue(pque, __func__, NULL, LOGLEVEL);
       }
     
     if (pjob != NULL)
@@ -187,7 +187,7 @@ int attempt_delete(
     }
 
   if (release_mutex == TRUE)
-    unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
 
   return(!skipped);
   } /* END attempt_delete() */
@@ -236,7 +236,7 @@ int req_deletearray(
 
     log_event(PBSEVENT_SECURITY,PBS_EVENTCLASS_JOB,preq->rq_ind.rq_delete.rq_objname,log_buf);
 
-    unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+    unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
 
     req_reject(PBSE_PERM, 0, preq, NULL, "operation not permitted");
     return(PBSE_NONE);
@@ -264,7 +264,7 @@ int req_deletearray(
     if (num_skipped < 0)
       {
       /* ERROR */
-      unlock_ai_mutex(pa, __func__, (char *)"2", LOGLEVEL);
+      unlock_ai_mutex(pa, __func__, "2", LOGLEVEL);
 
       req_reject(PBSE_IVALREQ,0,preq,NULL,"Error in specified array range");
       return(PBSE_NONE);
@@ -288,12 +288,12 @@ int req_deletearray(
 
   if (num_skipped != NO_JOBS_IN_ARRAY)
     {
-    unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+    unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
     
     /* check if the array is gone */
     if ((pa = get_array(preq->rq_ind.rq_delete.rq_objname)) != NULL)
       {
-      unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+      unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
       
       /* some jobs were not deleted.  They must have been running or had
          JOB_SUBSTATE_TRANSIT */
@@ -392,7 +392,7 @@ void array_delete_wt(
             }
           set_task(WORK_Immed, 0, on_job_exit_task, strdup(pjob->ji_qs.ji_jobid), FALSE);
           
-          unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
           }
         }
       else if ((pjob->ji_qs.ji_svrflags & JOB_SVFLG_StagedIn) != 0)
@@ -403,7 +403,7 @@ void array_delete_wt(
         if (pjob != NULL)
           {
           /* job_abt() calls svr_job_purge which will try to lock the array again */
-          unlock_ai_mutex(pa, __func__, (char *)"3", LOGLEVEL);
+          unlock_ai_mutex(pa, __func__, "3", LOGLEVEL);
           job_abt(&pjob, NULL);
           pa = get_array(preq->rq_ind.rq_delete.rq_objname);
           }
@@ -411,14 +411,14 @@ void array_delete_wt(
       else
         {
         /* job_abt() calls svr_job_purge which will try to lock the array again */
-        unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+        unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
         job_abt(&pjob, NULL);
         pa = get_array(preq->rq_ind.rq_delete.rq_objname);
         }
       } /* END if (ji_substate == JOB_SUBSTATE_PRERUN) */
     } /* END for each job in array */
   
-  unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+  unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
   
   if (num_jobs == num_prerun)
     {
diff --git a/src/server/req_getcred.c b/src/server/req_getcred.c
index 057b471e17..3f821073eb 100644
--- a/src/server/req_getcred.c
+++ b/src/server/req_getcred.c
@@ -106,6 +106,7 @@
 #include "log.h"
 #include "../lib/Liblog/pbs_log.h"
 #include "../lib/Libnet/lib_net.h" /* global_sock_add */
+#include "../lib/Libifl/lib_ifl.h"
 #include "req_getcred.h" /* req_altauthenuser */
 
 #define SPACE 32 /* ASCII space character */
@@ -268,7 +269,7 @@ int write_munge_temp_file(
     return(-1);
     }
 
-  bytes_written = write(fd, preq->rq_ind.rq_authen.rq_cred, cred_size);
+  bytes_written = write_ac_socket(fd, preq->rq_ind.rq_authen.rq_cred, cred_size);
 
   if ((bytes_written == -1) || 
       (bytes_written != cred_size))
@@ -332,7 +333,7 @@ int pipe_and_read_unmunge(
   
   fd = fileno(munge_pipe);
   
-  while ((bytes_read = read(fd, ptr, MUNGE_SIZE)) > 0)
+  while ((bytes_read = read_ac_socket(fd, ptr, MUNGE_SIZE)) > 0)
     {
     total_bytes_read += bytes_read;
     ptr += bytes_read;
diff --git a/src/server/req_holdarray.c b/src/server/req_holdarray.c
index 928261ae6e..8496edb840 100644
--- a/src/server/req_holdarray.c
+++ b/src/server/req_holdarray.c
@@ -20,7 +20,7 @@
 #include "ji_mutex.h"
 
 extern int chk_hold_priv(long val, int perm);
-extern int get_hold(tlist_head *, char **, pbs_attribute *);
+extern int get_hold(tlist_head *, const char **, pbs_attribute *);
 extern int svr_authorize_req(struct batch_request *preq, char *owner,
                                char *submit_host);
 
@@ -80,7 +80,7 @@ void hold_job(
 
 int req_holdarray(
     
-  void *vp) /* I */
+    struct batch_request *vp) /* I */
 
   {
   int                   i;
@@ -113,17 +113,17 @@ int req_holdarray(
 
     log_event(PBSEVENT_SECURITY, PBS_EVENTCLASS_JOB, preq->rq_ind.rq_delete.rq_objname, log_buf);
 
-    unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+    unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
 
     req_reject(PBSE_PERM, 0, preq, NULL, "operation not permitted");
     return(PBSE_NONE);
     }
 
 
-  if ((rc = get_hold(&preq->rq_ind.rq_hold.rq_orig.rq_attr, &pset,
+  if ((rc = get_hold(&preq->rq_ind.rq_hold.rq_orig.rq_attr, (const char **)&pset,
                      &temphold)) != 0)
     {
-    unlock_ai_mutex(pa, __func__, (char *)"2", LOGLEVEL);
+    unlock_ai_mutex(pa, __func__, "2", LOGLEVEL);
 
     req_reject(rc, 0, preq, NULL, NULL);
     return(PBSE_NONE);
@@ -133,7 +133,7 @@ int req_holdarray(
 
   if ((rc = chk_hold_priv(temphold.at_val.at_long, preq->rq_perm)) != 0)
     {
-    unlock_ai_mutex(pa, __func__, (char *)"3", LOGLEVEL);
+    unlock_ai_mutex(pa, __func__, "3", LOGLEVEL);
 
     req_reject(rc, 0, preq, NULL, NULL);
     return(PBSE_NONE);
@@ -146,7 +146,7 @@ int req_holdarray(
     {
     if ((rc = hold_array_range(pa,range_str,&temphold)) != 0)
       {
-      unlock_ai_mutex(pa, __func__, (char *)"4", LOGLEVEL);
+      unlock_ai_mutex(pa, __func__, "4", LOGLEVEL);
 
       req_reject(rc,0,preq,NULL,
         "Error in specified array range");
@@ -169,12 +169,12 @@ int req_holdarray(
       else
         {
         hold_job(&temphold,pjob);
-        unlock_ji_mutex(pjob, __func__, (char *)"5", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "5", LOGLEVEL);
         }
       }
     }
 
-  unlock_ai_mutex(pa, __func__, (char *)"6", LOGLEVEL);
+  unlock_ai_mutex(pa, __func__, "6", LOGLEVEL);
 
   reply_ack(preq);
 
diff --git a/src/server/req_holdjob.c b/src/server/req_holdjob.c
index 3afe5c2115..b54a7a4c2c 100644
--- a/src/server/req_holdjob.c
+++ b/src/server/req_holdjob.c
@@ -122,7 +122,7 @@ extern char *msg_postmomnojob;
 extern int LOGLEVEL;
 
 int chk_hold_priv(long val, int perm);
-int get_hold(tlist_head *, char **, pbs_attribute *);
+int get_hold(tlist_head *, const char **, pbs_attribute *);
 
 /* external functions */
 extern int svr_authorize_jobreq(struct batch_request *,job *);
@@ -163,7 +163,7 @@ int chk_hold_priv(
 
 int req_holdjob(
 
-  void *vp) /* I */
+    struct batch_request *vp) /* I */
 
   {
   long                 *hold_val;
@@ -188,12 +188,12 @@ int req_holdjob(
 
   /* cannot do anything until we decode the holds to be set */
 
-  if ((rc = get_hold(&preq->rq_ind.rq_hold.rq_orig.rq_attr, &pset,
+  if ((rc = get_hold(&preq->rq_ind.rq_hold.rq_orig.rq_attr, (const char **)&pset,
                      &temphold)) != 0)
     {
     req_reject(rc, 0, preq, NULL, NULL);
 
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
     return(PBSE_NONE);
     }
@@ -204,7 +204,7 @@ int req_holdjob(
     {
     req_reject(rc, 0, preq, NULL, NULL);
 
-    unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
 
     return(PBSE_NONE);
     }
@@ -251,7 +251,7 @@ int req_holdjob(
         sprintf(log_buf, msg_jobholdset, pset, preq->rq_user, preq->rq_host);
         
         log_event(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, pjob->ji_qs.ji_jobid, log_buf);
-        unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
         pjob = NULL;
         req_reject(rc, 0, preq, NULL, "relay to mom failed");
         }
@@ -295,7 +295,7 @@ int req_holdjob(
     }
 
   if (pjob != NULL)
-    unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
 
   return(PBSE_NONE);
   }  /* END req_holdjob() */
@@ -310,7 +310,7 @@ int req_holdjob(
 
 void *req_checkpointjob(
 
-  void *vp)
+   struct batch_request *vp) /* I */
 
   {
   struct batch_request *preq = (struct batch_request *)vp;
@@ -354,7 +354,7 @@ void *req_checkpointjob(
         
         job_save(pjob, SAVEJOB_QUICK, 0);
         log_event(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, pjob->ji_qs.ji_jobid, log_buf);
-        unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
         pjob = NULL;
         }
 
@@ -371,7 +371,7 @@ void *req_checkpointjob(
     }
 
   if (pjob != NULL)
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
   return(NULL);
   }  /* END req_checkpointjob() */
@@ -402,7 +402,7 @@ int release_job(
 
   /* cannot do anything until we decode the holds to be set */
 
-  if ((rc = get_hold(&preq->rq_ind.rq_hold.rq_orig.rq_attr, &pset, &temphold)) != 0)
+  if ((rc = get_hold(&preq->rq_ind.rq_hold.rq_orig.rq_attr, (const char **)&pset, &temphold)) != 0)
     {
     return(rc);
     }
@@ -456,7 +456,7 @@ int release_job(
 
 int req_releasejob(
 
-  void *vp) /* ptr to the decoded request   */
+    struct batch_request *vp) /* I */
 
   {
   job  *pjob;
@@ -479,7 +479,7 @@ int req_releasejob(
     reply_ack(preq);
     }
 
-  unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
   return(PBSE_NONE);
   }  /* END req_releasejob() */
@@ -510,11 +510,11 @@ int release_whole_array(
       {
       if ((rc = release_job(preq, pjob)) != 0)
         {
-        unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
         return(rc);
         }
   
-      unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
       }
     }
 
@@ -526,7 +526,7 @@ int release_whole_array(
 
 int req_releasearray(
 
-  void *vp) /* I */
+    struct batch_request *vp) /* I */
 
   {
   job                  *pjob;
@@ -548,7 +548,7 @@ int req_releasearray(
     if (((index = first_job_index(pa)) == -1) ||
         (pa->job_ids[index] == NULL))
       {
-      unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+      unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
 
       return(PBSE_NONE);
       }
@@ -566,13 +566,13 @@ int req_releasearray(
     {
     req_reject(PBSE_PERM,0,preq,NULL,NULL);
 
-    unlock_ai_mutex(pa, __func__, (char *)"2", LOGLEVEL);
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ai_mutex(pa, __func__, "2", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
     return(PBSE_NONE);
     }
 
-  unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
 
   range = preq->rq_extend;
   if ((range != NULL) &&
@@ -581,7 +581,7 @@ int req_releasearray(
     /* parse the array range */
     if ((rc = release_array_range(pa,preq,range)) != 0)
       {
-      unlock_ai_mutex(pa, __func__, (char *)"3", LOGLEVEL);
+      unlock_ai_mutex(pa, __func__, "3", LOGLEVEL);
 
       req_reject(rc,0,preq,NULL,NULL);
 
@@ -590,14 +590,14 @@ int req_releasearray(
     }
   else if ((rc = release_whole_array(pa,preq)) != 0)
     {
-    unlock_ai_mutex(pa, __func__, (char *)"4", LOGLEVEL);
+    unlock_ai_mutex(pa, __func__, "4", LOGLEVEL);
 
     req_reject(rc,0,preq,NULL,NULL);
 
     return(PBSE_NONE);
     }
   
-  unlock_ai_mutex(pa, __func__, (char *)"5", LOGLEVEL);
+  unlock_ai_mutex(pa, __func__, "5", LOGLEVEL);
 
   reply_ack(preq);
 
@@ -619,7 +619,7 @@ int req_releasearray(
 int get_hold(
 
   tlist_head     *phead,
-  char          **pset,     /* O - ptr to hold value */
+  const char   **pset,     /* O - ptr to hold value */
   pbs_attribute  *temphold)   /* O - ptr to pbs_attribute to decode value into  */
 
 
@@ -710,7 +710,7 @@ void process_hold_reply(
   else if (preq->rq_reply.brp_code != 0)
     {
 
-    rc = get_hold(&preq->rq_ind.rq_hold.rq_orig.rq_attr, &pset, &temphold);
+    rc = get_hold(&preq->rq_ind.rq_hold.rq_orig.rq_attr, (const char **)&pset, &temphold);
 
     if (rc == 0)
       {
@@ -761,7 +761,7 @@ void process_hold_reply(
     reply_ack(preq);
     }
 
-  unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
   } /* END process_hold_reply() */
 
@@ -801,7 +801,7 @@ void process_checkpoint_reply(
     account_record(PBS_ACCT_CHKPNT, pjob, "Checkpointed"); /* note in accounting file */
     reply_ack(preq);
 
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
     }
   } /* END process_checkpoint_reply() */
 
diff --git a/src/server/req_holdjob.h b/src/server/req_holdjob.h
index 60e431e321..b36b9262d0 100644
--- a/src/server/req_holdjob.h
+++ b/src/server/req_holdjob.h
@@ -21,7 +21,7 @@ int release_whole_array(job_array *pa, struct batch_request *preq);
 
 int req_releasearray(struct batch_request *preq);
 
-int get_hold(tlist_head *phead, char **pset, pbs_attribute *temphold);
+int get_hold(tlist_head *phead, const char **pset, pbs_attribute *temphold);
 
 /* static void process_hold_reply(struct work_task *pwt); */
 
diff --git a/src/server/req_jobobit.c b/src/server/req_jobobit.c
index 8b870965a7..1c5b68381d 100644
--- a/src/server/req_jobobit.c
+++ b/src/server/req_jobobit.c
@@ -162,7 +162,7 @@ extern void cleanup_restart_file(job *);
 void        on_job_exit(batch_request *preq, char *jobid);
 int         kill_job_on_mom(char *jobid, struct pbsnode *pnode);
 void        handle_complete_second_time(struct work_task *ptask);
-void       *on_job_exit_task(void *vp);
+void       *on_job_exit_task(struct work_task *vp);
 
 /*
  * setup_from - setup the "from" name for a standard job file:
@@ -171,13 +171,13 @@ void       *on_job_exit_task(void *vp);
 
 char *setup_from(
 
-  job  *pjob,   /* I */
-  char *suffix) /* I */
+  job         *pjob,   /* I */
+  const char *suffix) /* I */
 
   {
   char *from;
 
-  from = calloc(1, strlen(pjob->ji_qs.ji_fileprefix) + strlen(suffix) + 1);
+  from = (char *)calloc(1, strlen(pjob->ji_qs.ji_fileprefix) + strlen(suffix) + 1);
 
   if (from != NULL)
     {
@@ -251,7 +251,7 @@ struct batch_request *setup_cpyfiles(
       pcf->rq_user);
 
     if (((pjob->ji_wattr[JOB_ATR_egroup].at_flags & ATR_VFLAG_DEFLT) == 0) &&
-        (pjob->ji_wattr[JOB_ATR_egroup].at_val.at_str != 0))
+        (pjob->ji_wattr[JOB_ATR_egroup].at_val.at_str != NULL))
       {
       snprintf(pcf->rq_group, sizeof(pcf->rq_group), "%s", pjob->ji_wattr[JOB_ATR_egroup].at_val.at_str);
       }
@@ -408,7 +408,7 @@ struct batch_request *cpy_stdfile(
   pbs_attribute *jkpattr;
   pbs_attribute *pathattr = &pjob->ji_wattr[ati];
 
-  char          *suffix;
+  const char   *suffix;
   char          *to = NULL;
   char           log_buf[LOCAL_LOG_BUF_SIZE];
 
@@ -583,7 +583,7 @@ struct batch_request *cpy_stage(
         {
         *prmt = '\0';
 
-        from = calloc(1, strlen(plocal) + 1);
+        from = (char *)calloc(1, strlen(plocal) + 1);
 
         if (from == NULL)
           {
@@ -600,7 +600,7 @@ struct batch_request *cpy_stage(
 
         *prmt = '@'; /* restore the @ */
 
-        to = calloc(1, strlen(prmt + 1) + 1);
+        to = (char *)calloc(1, strlen(prmt + 1) + 1);
 
         if (to == NULL)
           {
@@ -641,7 +641,7 @@ struct batch_request *cpy_stage(
 int mom_comm(
 
   job *pjob,
-  void *(*func)(void *))
+  void *(*func)(struct work_task *vp))
 
   {
   unsigned int      dummy;
@@ -671,7 +671,7 @@ int mom_comm(
 
   strcpy(jobid, pjob->ji_qs.ji_jobid);
 
-  unlock_ji_mutex(pjob, __func__, (char *)NULL, 0);
+  unlock_ji_mutex(pjob, __func__, NULL, 0);
 
   handle = svr_connect(
       pjob->ji_qs.ji_un.ji_exect.ji_momaddr,
@@ -699,7 +699,7 @@ int mom_comm(
           "cannot establish connection with mom for clean-up - will retry later");
       }
 
-    set_task(WORK_Timed, time_now + PBS_NET_RETRY_TIME, (void (*)())func, strdup(jobid), FALSE);
+    set_task(WORK_Timed, time_now + PBS_NET_RETRY_TIME, (void (*)(struct work_task *))func, strdup(jobid), FALSE);
 
     return(-1);
     }
@@ -833,7 +833,7 @@ int handle_exiting_or_abort_substate(
   /* see if job has any dependencies */
   if (pjob->ji_wattr[JOB_ATR_depend].at_flags & ATR_VFLAG_SET)
     {
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
     depend_on_term(job_id); /* pjob locked on entry, unlocked on exit */
     pjob = NULL;
     }
@@ -842,7 +842,7 @@ int handle_exiting_or_abort_substate(
       ((pjob = svr_find_job(job_id, TRUE)) != NULL))
     {
     svr_setjobstate(pjob,JOB_STATE_EXITING,JOB_SUBSTATE_RETURNSTD, FALSE);
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
     }
 
   return(PBSE_NONE);
@@ -879,7 +879,7 @@ int handle_returnstd(
   job_momaddr = pjob->ji_qs.ji_un.ji_exect.ji_momaddr;
   if (pjob->ji_wattr[JOB_ATR_exec_host].at_val.at_str == NULL)
     {
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
     rc = PBSE_JOB_FILE_CORRUPT;
 
@@ -889,7 +889,7 @@ int handle_returnstd(
   job_momname = strdup(pjob->ji_wattr[JOB_ATR_exec_host].at_val.at_str);
   if (job_momname == NULL)
     {
-    unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
 
     rc = PBSE_MEM_MALLOC;
 
@@ -916,12 +916,12 @@ int handle_returnstd(
         0);
       pthread_mutex_unlock(server.sv_attr_mutex);
 
-      unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+      unlock_queue(pque, __func__, NULL, LOGLEVEL);
       }
     else if (pjob == NULL)
       {
       rc = PBSE_JOBNOTFOUND;
-      log_err(rc, __func__, (char *)"Job lost while acquiring queue 2");
+      log_err(rc, __func__, "Job lost while acquiring queue 2");
       goto handle_returnstd_cleanup;
       }
     
@@ -931,7 +931,7 @@ int handle_returnstd(
         path_spool, job_fileprefix, JOB_STDOUT_SUFFIX);
       
       /* allocate space for the string name plus ".SAV" */
-      namebuf2 = calloc((strlen(namebuf) + 5), sizeof(char));
+      namebuf2 = (char *)calloc((strlen(namebuf) + 5), sizeof(char));
       
       if (job_momaddr != pbs_server_addr)
         {
@@ -984,15 +984,15 @@ int handle_returnstd(
 
       if ((handle = mom_comm(pjob, on_job_exit_task)) < 0)
         {
-        unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
 
         rc = PBSE_CONNECT;
-        log_err(rc, __func__, (char *)"Job can not make connection to mom");
+        log_err(rc, __func__, "Job can not make connection to mom");
         goto handle_returnstd_cleanup;
         }
       else
         {
-        unlock_ji_mutex(pjob, __func__, (char *)"4", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "4", LOGLEVEL);
 
         if ((rc = issue_Drequest(handle, preq)) != PBSE_NONE)
           {
@@ -1010,7 +1010,7 @@ int handle_returnstd(
       }
     else
       {
-      unlock_ji_mutex(pjob, __func__, (char *)"5", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "5", LOGLEVEL);
 
       /* we don't need to return files to the server spool,
        * move on to see if we need to delete files */
@@ -1023,7 +1023,7 @@ int handle_returnstd(
       }
     }
   else
-    unlock_ji_mutex(pjob, __func__, (char *)"6", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "6", LOGLEVEL);
 
 
   /* this check is added to allow the case where no files need to be returned to function smoothly */
@@ -1060,14 +1060,14 @@ int handle_returnstd(
     {
     svr_setjobstate(pjob, JOB_STATE_EXITING, JOB_SUBSTATE_STAGEOUT, FALSE);
    
-    unlock_ji_mutex(pjob, __func__, (char *)"7", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "7", LOGLEVEL);
     }
  
 handle_returnstd_cleanup:
    if (job_momname != NULL)
     free(job_momname); 
 
-  return rc;
+  return(rc);
   } /* END handle_returnstd() */
 
 
@@ -1092,7 +1092,7 @@ int handle_stageout(
   char    job_fileprefix[PBS_JOBBASE+1];
 
   if (LOGLEVEL >= 10 )
-    LOG_EVENT(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, __func__, (char *)pjob->ji_qs.ji_jobid);
+    LOG_EVENT(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, __func__, pjob->ji_qs.ji_jobid);
 
   snprintf(job_id, sizeof(job_id), "%s", pjob->ji_qs.ji_jobid);
   snprintf(job_fileprefix, sizeof(job_fileprefix), "%s", pjob->ji_qs.ji_fileprefix);
@@ -1100,7 +1100,7 @@ int handle_stageout(
 
   if (job_momname == NULL)
     {
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
     rc = PBSE_MEM_MALLOC;
     goto handle_stageout_cleanup;
@@ -1136,14 +1136,14 @@ int handle_stageout(
       
       if ((handle = mom_comm(pjob, on_job_exit_task)) < 0) /* Error */
         {
-        unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
 
         rc = PBSE_CONNECT;
         goto handle_stageout_cleanup;
         }
       else
         {
-        unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
 
         if ((rc = issue_Drequest(handle, preq)) != PBSE_NONE)
           {
@@ -1163,7 +1163,7 @@ int handle_stageout(
       }
     else
       {
-      unlock_ji_mutex(pjob, __func__, (char *)"4", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "4", LOGLEVEL);
 
       /* no files to copy, go to next step */
 
@@ -1172,7 +1172,7 @@ int handle_stageout(
       }
     }    /* END if (ptask->wt_type != WORK_Deferred_Reply) */
   else
-    unlock_ji_mutex(pjob, __func__, (char *)"5", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "5", LOGLEVEL);
  
   /* place this check so that we just fall through when a file needs to be copied */
   if (preq != NULL)
@@ -1223,8 +1223,8 @@ int handle_stageout(
       
       memset(&tA, 0, sizeof(tA));
       
-      tA.al_name  = "sched_hint";
-      tA.al_resc  = "";
+      tA.al_name  = (char *)"sched_hint";
+      tA.al_resc  = (char *)"";
       tA.al_value = log_buf;
       tA.al_op    = SET;
 
@@ -1250,7 +1250,7 @@ int handle_stageout(
     snprintf(namebuf, sizeof(namebuf), "%s%s%s", path_spool, job_fileprefix, JOB_STDOUT_SUFFIX);
     
     /* allocate space for the string name plus ".SAV" */
-    namebuf2 = calloc((strlen(namebuf) + 5), sizeof(char));
+    namebuf2 = (char *)calloc((strlen(namebuf) + 5), sizeof(char));
     
     strcpy(namebuf2, namebuf);
     strcat(namebuf2, ".SAV");
@@ -1310,7 +1310,7 @@ int handle_stageout(
     {
     svr_setjobstate(pjob, JOB_STATE_EXITING, JOB_SUBSTATE_STAGEDEL, FALSE);
    
-    unlock_ji_mutex(pjob, __func__, (char *)"7", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "7", LOGLEVEL);
     }
  
 handle_stageout_cleanup:
@@ -1346,7 +1346,7 @@ int handle_stagedel(
   char *job_momname = NULL;
 
   if (LOGLEVEL >= 10)
-    LOG_EVENT(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, __func__, (char *)pjob->ji_qs.ji_jobid);
+    LOG_EVENT(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, __func__, pjob->ji_qs.ji_jobid);
 
   strcpy(job_id, pjob->ji_qs.ji_jobid);
   job_momname = strdup(pjob->ji_wattr[JOB_ATR_exec_host].at_val.at_str);
@@ -1373,14 +1373,14 @@ int handle_stagedel(
       
       if ((handle = mom_comm(pjob, on_job_exit_task)) < 0)
         {
-        unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
         rc = PBSE_CONNECT;
         goto handle_stagedel_cleanup;
         }
       else
         {
-        unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
 
         if (issue_Drequest(handle, preq) != PBSE_NONE)
           {
@@ -1402,10 +1402,10 @@ int handle_stagedel(
         }
       }
     else
-      unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
     }
   else
-    unlock_ji_mutex(pjob, __func__, (char *)"4", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "4", LOGLEVEL);
 
 
   /* place if here so that jobs without staged files just fall through */
@@ -1448,7 +1448,7 @@ int handle_stagedel(
 
       svr_mailowner(pjob, MAIL_OTHER, MAIL_FORCE, log_buf);
       
-      unlock_ji_mutex(pjob, __func__, (char *)"5", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "5", LOGLEVEL);
       }
     
     free_br(preq);
@@ -1458,7 +1458,7 @@ int handle_stagedel(
     {
     svr_setjobstate(pjob, JOB_STATE_EXITING, JOB_SUBSTATE_EXITED, FALSE);
 
-    unlock_ji_mutex(pjob, __func__, (char *)"6", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "6", LOGLEVEL);
     }
 
 handle_stagedel_cleanup:
@@ -1501,13 +1501,13 @@ int handle_exited(
     
     if ((handle = mom_comm(pjob, on_job_exit_task)) < 0)
       {
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
       return PBSE_CONNECT;
       }
     else
       {
-      unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
 
       if ((rc = issue_Drequest(handle, preq)) != PBSE_NONE)
         {
@@ -1524,7 +1524,7 @@ int handle_exited(
       }
     }
   else
-    unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
 
   preq = NULL;
   
@@ -1541,7 +1541,7 @@ int handle_exited(
     {
     if (check_if_checkpoint_restart_failed(pjob) == TRUE)
       {
-      unlock_ji_mutex(pjob, __func__, (char *)"4", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "4", LOGLEVEL);
 
       return(-1);
       }
@@ -1555,15 +1555,15 @@ int handle_exited(
     {
     pque->qu_numcompleted++;
 
-    unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+    unlock_queue(pque, __func__, NULL, LOGLEVEL);
     }
   else if (pjob == NULL)
     {
-    log_err(PBSE_JOBNOTFOUND, __func__, (char *)"Job lost while acquiring queue 3");
+    log_err(PBSE_JOBNOTFOUND, __func__, "Job lost while acquiring queue 3");
     return(PBSE_JOBNOTFOUND);
     }
 
-  unlock_ji_mutex(pjob, __func__, (char *)"5", LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, "5", LOGLEVEL);
 
   return(PBSE_NONE);
   } /* END handle_exited() */
@@ -1581,8 +1581,8 @@ int handle_complete_subjob(
   int  rc = PBSE_NONE;
   int  complete_parent = FALSE;
 
-  unlock_ji_mutex(pjob, __func__, (char *)NULL, 0);
-  lock_ji_mutex(parent_job, __func__, (char *)NULL, 0);
+  unlock_ji_mutex(pjob, __func__, NULL, 0);
+  lock_ji_mutex(parent_job, __func__, NULL, 0);
 
   if (parent_job->ji_being_recycled == FALSE)
     {
@@ -1591,13 +1591,13 @@ int handle_complete_subjob(
     else
       other_subjob = parent_job->ji_cray_clone;
 
-    lock_ji_mutex(other_subjob, __func__, (char *)NULL, 0);
+    lock_ji_mutex(other_subjob, __func__, NULL, 0);
     
     if ((other_subjob->ji_being_recycled == TRUE) ||
         (other_subjob->ji_qs.ji_state == JOB_STATE_COMPLETE))
       complete_parent = TRUE;
 
-    unlock_ji_mutex(other_subjob, __func__, (char *)NULL, 0);
+    unlock_ji_mutex(other_subjob, __func__, NULL, 0);
 
     if (complete_parent == TRUE)
       {
@@ -1618,7 +1618,7 @@ int handle_complete_subjob(
       }
     }
 
-  unlock_ji_mutex(parent_job, __func__, (char *)NULL, 0);
+  unlock_ji_mutex(parent_job, __func__, NULL, 0);
 
   return(rc);
   } /* END handle_complete_subjob() */
@@ -1640,7 +1640,7 @@ int handle_complete_first_time(
   int          job_complete = 0;
 
   if (LOGLEVEL >= 10)
-    LOG_EVENT(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, __func__, (char *)pjob->ji_qs.ji_jobid);
+    LOG_EVENT(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, __func__, pjob->ji_qs.ji_jobid);
 
   /* first time in */
   if (LOGLEVEL >= 4)
@@ -1659,12 +1659,12 @@ int handle_complete_first_time(
       0);
     pthread_mutex_unlock(server.sv_attr_mutex);
 
-    unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+    unlock_queue(pque, __func__, NULL, LOGLEVEL);
     }
   else if (pjob == NULL)
     {
     /* let the caller know the job is gone */
-    log_err(PBSE_JOBNOTFOUND, __func__, (char *)"Job lost while acquiring queue 4");
+    log_err(PBSE_JOBNOTFOUND, __func__, "Job lost while acquiring queue 4");
     return PBSE_JOBNOTFOUND;
     }
   
@@ -1743,7 +1743,7 @@ int handle_complete_first_time(
     job_save(pjob, SAVEJOB_FULL, 0);
     }
 
-  unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
   
   return(FALSE);
   } /* END handle_complete_first_time() */
@@ -1851,7 +1851,7 @@ void on_job_exit(
   /* check for calloc errors */
   if (job_id == NULL)
     {
-    log_err(ENOMEM, __func__, (char *)"Cannot allocate memory!");
+    log_err(ENOMEM, __func__, "Cannot allocate memory!");
     return;
     }
 
@@ -1986,7 +1986,7 @@ void on_job_exit(
 
     default:
 
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
       break;
     }  /* END switch (pjob->ji_qs.ji_substate) */
 
@@ -2001,7 +2001,7 @@ void on_job_exit(
 
 void *on_job_exit_task(
 
-  void *vp)
+  struct work_task *vp)
 
   {
   struct work_task *ptask = (struct work_task *)vp;
@@ -2022,7 +2022,7 @@ void *on_job_exit_task(
 
 void *on_job_rerun_task(
 
-  void *vp)
+  struct work_task *vp)
 
   {
   struct work_task *ptask = (struct work_task *)vp;
@@ -2079,7 +2079,7 @@ void on_job_rerun(
   /* check for memory allocation */
   if (job_id == NULL)
     {
-    log_err(ENOMEM, __func__, (char *)"Cannot allocate memory");
+    log_err(ENOMEM, __func__, "Cannot allocate memory");
     if (preq != NULL)
       free_br(preq);
     return;
@@ -2099,7 +2099,7 @@ void on_job_rerun(
 
   if ((handle = mom_comm(pjob, on_job_rerun_task)) < 0)
     {
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
     if (preq != NULL)
       free_br(preq);
 
@@ -2129,7 +2129,7 @@ void on_job_rerun(
 
           if ((preq = alloc_br(PBS_BATCH_Rerun)) == NULL)
             {
-            unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+            unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
             
             return;
             }
@@ -2138,7 +2138,7 @@ void on_job_rerun(
           
           preq->rq_extra = strdup(pjob->ji_qs.ji_jobid);
           job_id = strdup(pjob->ji_qs.ji_jobid); 
-          unlock_ji_mutex(pjob, __func__, (char *)"4", LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, "4", LOGLEVEL);
           
           if (issue_Drequest(handle, preq) != PBSE_NONE)
             {
@@ -2378,7 +2378,7 @@ void on_job_rerun(
         {
         strcpy(preq->rq_ind.rq_delete.rq_objname, pjob->ji_qs.ji_jobid);
         job_id = strdup(pjob->ji_qs.ji_jobid); 
-        unlock_ji_mutex(pjob, __func__, (char *)"9", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "9", LOGLEVEL);
 
         rc = issue_Drequest(handle, preq);
 
@@ -2440,7 +2440,7 @@ void on_job_rerun(
       break;
     }  /* END switch (pjob->ji_qs.ji_substate) */
 
-  unlock_ji_mutex(pjob, __func__, (char *)"10", LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, "10", LOGLEVEL);
 
   return;
   }  /* END on_job_rerun() */
@@ -2460,7 +2460,7 @@ void wait_for_send(
   struct work_task *ptask)
 
   {
-  batch_request *preq = (batch_request *)get_remove_batch_request(ptask->wt_parm1);
+  batch_request *preq = (batch_request *)get_remove_batch_request((char *)ptask->wt_parm1);
 
   if (preq != NULL)
     req_jobobit(preq);
@@ -2716,7 +2716,7 @@ int handle_subjob_exit_status(
         log_event(PBSEVENT_SYSTEM, PBS_EVENTCLASS_SERVER, other_jobid, log_buf);
         
         kill_job_on_mom(other_jobid, pnode);
-        unlock_node(pnode, __func__, (char *)NULL, 0);
+        unlock_node(pnode, __func__, NULL, 0);
         }
       }
     else
@@ -2772,7 +2772,7 @@ int rerun_job(
   
   svr_setjobstate(pjob, JOB_STATE_EXITING, pjob->ji_qs.ji_substate, FALSE);
   
-  set_task(WORK_Immed, 0, (void (*)())on_job_rerun_task, strdup(pjob->ji_qs.ji_jobid), FALSE);
+  set_task(WORK_Immed, 0, (void (*)(struct work_task *))on_job_rerun_task, strdup(pjob->ji_qs.ji_jobid), FALSE);
   
   if (LOGLEVEL >= 4)
     {
@@ -2921,7 +2921,7 @@ int req_jobobit(
     log_err(rc, job_id, log_buf);
 
     if (pjob != NULL)
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
     free(tmp);
 
@@ -2932,7 +2932,7 @@ int req_jobobit(
 
   if (pjob->ji_qs.ji_state == JOB_STATE_COMPLETE)
     {
-    unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
 
     reply_ack(preq);
     return(PBSE_BADSTATE);
@@ -2966,7 +2966,7 @@ int req_jobobit(
       rc = PBSE_BADSTATE;
       }
 
-    unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
 
     req_reject(rc, 0, preq, NULL, NULL);
 
@@ -2980,7 +2980,7 @@ int req_jobobit(
 
     ptask = set_task(WORK_Timed, time_now + 1, wait_for_send, (void *)preq, FALSE);
 
-    unlock_ji_mutex(pjob, __func__, (char *)"4", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "4", LOGLEVEL);
 
     if (ptask == NULL)
       req_reject(PBSE_SYSTEM, 0, preq, NULL, NULL);
@@ -3069,7 +3069,7 @@ int req_jobobit(
 
       log_event(PBSEVENT_DEBUG, PBS_EVENTCLASS_REQUEST, __func__, log_buf);
 
-      unlock_ji_mutex(pjob, __func__, (char *)"5", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "5", LOGLEVEL);
 
       req_reject(PBSE_SYSTEM, 0, preq, NULL, NULL);
       return(PBSE_SYSTEM);
@@ -3220,7 +3220,7 @@ int req_jobobit(
         close_conn(pjob->ji_momhandle, FALSE);
         pjob->ji_momhandle = -1;
 
-        unlock_ji_mutex(pjob, __func__, (char *)"6", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "6", LOGLEVEL);
 
         return(PBSE_SYSTEM);
 
@@ -3312,12 +3312,12 @@ int req_jobobit(
         job_atr_hold = pjob->ji_wattr[JOB_ATR_hold].at_val.at_long;
         job_exit_status = pjob->ji_qs.ji_un.ji_exect.ji_exitstat;
         
-        unlock_ji_mutex(pjob, __func__, (char *)"7", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "7", LOGLEVEL);
 
         update_array_values(pa, JOB_STATE_RUNNING, aeTerminate,
             job_id, job_atr_hold, job_exit_status);
           
-        unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+        unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
         pjob = svr_find_job(job_id, TRUE);
         if (pjob == NULL)
           return(PBSE_UNKJOBID);
@@ -3370,7 +3370,7 @@ int req_jobobit(
       (char *)"req_jobobit completed");
     }
 
-  unlock_ji_mutex(pjob, __func__, (char *)"9", LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, "9", LOGLEVEL);
 
   if (rerunning_job == FALSE)
     {
@@ -3380,7 +3380,7 @@ int req_jobobit(
       log_event(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, job_id, log_buf);
       }
     
-    set_task(WORK_Immed, 0, (void (*)())on_job_exit_task, strdup(job_id), 0);
+    set_task(WORK_Immed, 0, (void (*)(struct work_task *))on_job_exit_task, strdup(job_id), 0);
     }
 
   return(PBSE_NONE);
diff --git a/src/server/req_locate.c b/src/server/req_locate.c
index 14d6975996..a8273a4631 100644
--- a/src/server/req_locate.c
+++ b/src/server/req_locate.c
@@ -137,7 +137,7 @@ int  req_locatejob(
 
   if (pjob)
     {
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
     location = server_name;
     }
diff --git a/src/server/req_manager.c b/src/server/req_manager.c
index f3b641daa3..ee7b7762c0 100644
--- a/src/server/req_manager.c
+++ b/src/server/req_manager.c
@@ -170,8 +170,8 @@ extern int PNodeStateToString(int, char *, int);
 
 /* private data */
 
-static char *all_quename = "_All_";
-static char *all_nodes_str = "_All_";
+static const char *all_quename = "_All_";
+static const char *all_nodes_str = "_All_";
 
 /*
  * check_que_attr - check if attributes in request are consistent with
@@ -274,13 +274,13 @@ int set_queue_type(
   {
   int   i;
   char *pca;
-  char *pcv;
+  const char *pcv;
   int   spectype;
 
   static struct
     {
     int   type;
-    char *name;
+    const char *name;
     } qt[2] =
 
     {
@@ -316,7 +316,7 @@ int set_queue_type(
       {
       ((pbs_queue *)pque)->qu_qs.qu_type = spectype;
       free(pattr->at_val.at_str);
-      pattr->at_val.at_str = calloc(1, strlen(qt[i].name) + 1);
+      pattr->at_val.at_str = (char *)calloc(1, strlen(qt[i].name) + 1);
 
       if (pattr->at_val.at_str == (char *)0)
         return (PBSE_SYSTEM);
@@ -345,7 +345,7 @@ static void mgr_log_attr(
   char *objname)          /* object being modified */
 
   {
-  char *pstr;
+  const char *pstr;
   char  log_buf[LOCAL_LOG_BUF_SIZE];
 
   while (plist)
@@ -1071,7 +1071,7 @@ void mgr_queue_delete(
   if ((rc = que_purge(pque)) != PBSE_NONE)
     {
     /* FAILURE */
-    unlock_queue(pque, __func__, (char *)"", LOGLEVEL);
+    unlock_queue(pque, __func__, "", LOGLEVEL);
     req_reject(rc, 0, preq, NULL, NULL);
     return;
     }
@@ -1222,7 +1222,7 @@ void mgr_server_set(
     int       bhstrlen;
 
     bhstrlen = PBS_MAXHOSTNAME + 17;
-    bad_host = calloc(sizeof(char), (bhstrlen + 1));
+    bad_host = (char *)calloc(sizeof(char), (bhstrlen + 1));
 
     if (bad_host == NULL)
       {
@@ -1415,7 +1415,7 @@ void mgr_queue_set(
   const char  *badattr;
   svrattrl  *plist;
   pbs_queue *pque;
-  char      *qname;
+  const char      *qname;
   int        rc;
   int        iter = -1;
   char       log_buf[LOCAL_LOG_BUF_SIZE];
@@ -1534,7 +1534,7 @@ void mgr_queue_unset(
   int    bad_attr = 0;
   svrattrl  *plist;
   pbs_queue *pque;
-  char      *qname;
+  const char      *qname;
   int    rc;
   int    iter = -1;
   char   log_buf[LOCAL_LOG_BUF_SIZE];
@@ -1628,7 +1628,7 @@ void mgr_node_set(
   int               len;
   int               problem_cnt = 0;
 
-  char             *nodename = NULL;
+  const char       *nodename = NULL;
   char             *problem_names;
   char              log_buf[LOCAL_LOG_BUF_SIZE];
 
@@ -1657,7 +1657,7 @@ void mgr_node_set(
         {
         propnodes = 1;
         nodename = preq->rq_ind.rq_manager.rq_objname;
-        props.name = nodename + 1;
+        props.name = (char *)nodename + 1;
         props.mark = 1;
         props.next = NULL;
         }
@@ -1834,7 +1834,7 @@ void mgr_node_set(
 
       len += strlen(pbse_to_txt(PBSE_GMODERR));
 
-      if ((problem_names = calloc(1, len)))
+      if ((problem_names = (char *)calloc(1, len)))
         {
         strcpy(problem_names, pbse_to_txt(PBSE_GMODERR));
 
@@ -1898,7 +1898,7 @@ static void mgr_node_delete(
   int             iter;
 
   struct pbsnode *pnode;
-  char           *nodename = NULL;
+  const char    *nodename = NULL;
 
 
   svrattrl       *plist;
diff --git a/src/server/req_message.c b/src/server/req_message.c
index c553a94fde..eab3b2dc18 100644
--- a/src/server/req_message.c
+++ b/src/server/req_message.c
@@ -123,7 +123,7 @@ int copy_batchrequest(struct batch_request **newreq, struct batch_request *preq,
 
 void *req_messagejob(
     
-  void *vp)
+    struct batch_request *vp) /* I */
 
   {
   struct batch_request *preq = (struct batch_request *)vp;
@@ -140,7 +140,7 @@ void *req_messagejob(
     {
     req_reject(PBSE_BADSTATE, 0, preq, NULL, NULL);
 
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
     
     return(NULL);
     }
@@ -165,7 +165,7 @@ void *req_messagejob(
 
   /* After MOM acts and replies to us, we pick up in post_message_req() */
   if (pjob != NULL)
-    unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
 
   return(NULL);
   } /* END req_messagejob() */
diff --git a/src/server/req_modify.c b/src/server/req_modify.c
index 967463fefe..7d1a8707dd 100644
--- a/src/server/req_modify.c
+++ b/src/server/req_modify.c
@@ -196,7 +196,7 @@ void post_modify_req(
           log_event(PBSEVENT_JOB,PBS_EVENTCLASS_JOB,pjob->ji_qs.ji_jobid,log_buf);
           }
         
-        unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
         }
       }
 
@@ -234,7 +234,7 @@ void mom_cleanup_checkpoint_hold(
 
   if (jobid == NULL)
     {
-    log_err(ENOMEM, __func__, (char *)"Cannot allocate memory");
+    log_err(ENOMEM, __func__, "Cannot allocate memory");
     return;
     }
 
@@ -273,7 +273,7 @@ void mom_cleanup_checkpoint_hold(
     {
     if ((preq = alloc_br(PBS_BATCH_DeleteJob)) == NULL)
       {
-      log_err(-1, __func__, (char *)"unable to allocate DeleteJob request - big trouble!");
+      log_err(-1, __func__, "unable to allocate DeleteJob request - big trouble!");
       }
     else
       {
@@ -290,7 +290,7 @@ void mom_cleanup_checkpoint_hold(
           
           log_err(rc, __func__, log_buf);
           
-          unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
           }
 
         free_br(preq);
@@ -317,7 +317,7 @@ void mom_cleanup_checkpoint_hold(
     }
 
   if (pjob != NULL)
-    unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
   } /* END mom_cleanup_checkpoint_hold() */
 
 
@@ -619,7 +619,7 @@ int modify_job(
         if (pjob != NULL)
           {
           strcpy(jobid, pjob->ji_qs.ji_jobid);
-          unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
           }
 
         post_modify_req(dup_req);
@@ -668,7 +668,7 @@ int modify_job(
       }
     else
       {
-      log_err(-1, __func__, (char *)"Failed to get batch request");
+      log_err(-1, __func__, "Failed to get batch request");
       }
     }
 
@@ -779,14 +779,14 @@ int copy_batchrequest(
           newpal->al_nameln = pal->al_nameln;
           newpal->al_flags  = pal->al_flags;
           newpal->al_atopl.name = (char *)newpal + sizeof(svrattrl);
-          strcpy(newpal->al_atopl.name, pal->al_atopl.name);
+          strcpy((char *)newpal->al_atopl.name, pal->al_atopl.name);
           newpal->al_nameln = pal->al_nameln;
           newpal->al_atopl.resource = newpal->al_atopl.name + newpal->al_nameln;
           if (pal->al_atopl.resource != NULL)
-            strcpy(newpal->al_atopl.resource, pal->al_atopl.resource);
+            strcpy((char *)newpal->al_atopl.resource, pal->al_atopl.resource);
           newpal->al_rescln = pal->al_rescln;
           newpal->al_atopl.value = newpal->al_atopl.name + newpal->al_nameln + newpal->al_rescln;
-          strcpy(newpal->al_atopl.value, pal->al_atopl.value);
+          strcpy((char *)newpal->al_atopl.value, pal->al_atopl.value);
           newpal->al_valln = pal->al_valln;
           newpal->al_atopl.op = pal->al_atopl.op;
           
@@ -800,7 +800,7 @@ int copy_batchrequest(
 
         strcpy(request->rq_ind.rq_signal.rq_jid, preq->rq_ind.rq_signal.rq_jid);
         strcpy(request->rq_ind.rq_signal.rq_signame, preq->rq_ind.rq_signal.rq_signame);
-        request->rq_extra = strdup(preq->rq_extra);
+        request->rq_extra = strdup((char *)preq->rq_extra);
 
         break;
 
@@ -887,7 +887,7 @@ int modify_whole_array(
         rc = copy_batchrequest(&array_req, preq, 0, i);
         if (rc != 0)
           {
-          unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
           return(rc);
           }
 
@@ -909,7 +909,7 @@ int modify_whole_array(
               "Unable to relay information to mom for job '%s'\n",
               pjob->ji_qs.ji_jobid);
             log_err(rc, __func__, log_buf);
-            unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+            unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
             }
 
           return(rc); /* unable to get to MOM */
@@ -918,7 +918,7 @@ int modify_whole_array(
           {
           if (pjob != NULL)
             {
-            unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+            unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
             pjob = NULL;
             }
 
@@ -927,7 +927,7 @@ int modify_whole_array(
         }
 
       if (pjob != NULL)
-        unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
       }
     } /* END foreach job in array */
 
@@ -1015,7 +1015,7 @@ void *modify_array_work(
     if ((rc != 0) && 
        (rc != PBSE_RELAYED_TO_MOM))
       {
-      unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+      unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
       req_reject(PBSE_IVALREQ,0,preq,NULL,"Error reading array range");
       return(NULL);
       }
@@ -1025,7 +1025,7 @@ void *modify_array_work(
 
     if (rc == PBSE_RELAYED_TO_MOM)
       {
-      unlock_ai_mutex(pa, __func__, (char *)"2", LOGLEVEL);
+      unlock_ai_mutex(pa, __func__, "2", LOGLEVEL);
       return(NULL);
       }
     }
@@ -1036,7 +1036,7 @@ void *modify_array_work(
     if ((rc != 0) && 
         (rc != PBSE_RELAYED_TO_MOM))
       {
-      unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+      unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
       req_reject(PBSE_IVALREQ,0,preq,NULL,"Error altering the array");
       return(NULL);
       }
@@ -1055,8 +1055,8 @@ void *modify_array_work(
          If either of these fail, return the error. This makes it
          so some elements fo the array will be updated but others are
          not. But at least the user will know something went wrong.*/
-      unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+      unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
       req_reject(rc,0,preq,NULL,NULL);
       return(NULL);
@@ -1064,17 +1064,17 @@ void *modify_array_work(
 
     if (rc == PBSE_RELAYED_TO_MOM)
       {
-      unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
-      unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+      unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
       
       return(NULL);
       }
 
-    unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
     }
 
   /* SUCCESS */
-  unlock_ai_mutex(pa, __func__, (char *)"4", LOGLEVEL);
+  unlock_ai_mutex(pa, __func__, "4", LOGLEVEL);
 
   reply_ack(preq);
 
@@ -1092,7 +1092,7 @@ void *modify_array_work(
 
 void *req_modifyarray(
 
-  void *vp) /* I */
+    struct batch_request *vp) /* I */
 
   {
   job_array            *pa;
@@ -1106,7 +1106,7 @@ void *req_modifyarray(
     return(NULL);
     }
 
-  unlock_ai_mutex(pa, __func__, (char *)"4", LOGLEVEL);
+  unlock_ai_mutex(pa, __func__, "4", LOGLEVEL);
 
   /* If async modify, reply now; otherwise reply is handled later */
   if (preq->rq_type == PBS_BATCH_AsyModifyJob)
@@ -1126,7 +1126,7 @@ void *req_modifyarray(
 
 void *modify_job_work(
 
-  void *vp)
+    struct batch_request *vp) /* I */
 
   {
   job           *pjob;
@@ -1167,7 +1167,7 @@ void *modify_job_work(
       }
     else if ( rc == PBSE_RELAYED_TO_MOM )
       {
-      unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
       
       return(NULL);
       }
@@ -1177,7 +1177,7 @@ void *modify_job_work(
   else
     reply_ack(preq);
 
-  unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
 
   return(NULL);
   } /* END modify_job_work() */
@@ -1195,7 +1195,7 @@ void *modify_job_work(
 
 void *req_modifyjob(
 
-  void *vp) /* I */
+    struct batch_request *vp) /* I */
 
   {
   job                  *pjob;
@@ -1217,12 +1217,12 @@ void *req_modifyjob(
     reply_ack(preq);
 
     /* SUCCESS */
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
     return(NULL);
     }
     
-  unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
 
   /* If async modify, reply now; otherwise reply is handled later */
   if (preq->rq_type == PBS_BATCH_AsyModifyJob)
@@ -1231,7 +1231,7 @@ void *req_modifyjob(
 
     preq->rq_noreply = TRUE; /* set for no more replies */
 
-    enqueue_threadpool_request(modify_job_work, preq);
+    enqueue_threadpool_request((void *(*)(void *))modify_job_work, preq);
     }
   else
     modify_job_work(preq);
@@ -1270,7 +1270,7 @@ int modify_job_attr(
     if (pque->qu_qs.qu_type != QTYPE_Execution)
       allow_unkn = JOB_ATR_UNKN;
 
-    unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+    unlock_queue(pque, __func__, NULL, LOGLEVEL);
     }
   else if (pjob->ji_parent_job != NULL)
     {
@@ -1278,7 +1278,7 @@ int modify_job_attr(
     }
   else
     {
-    log_err(PBSE_JOBNOTFOUND, __func__, (char *)"Job lost while acquiring queue 5");
+    log_err(PBSE_JOBNOTFOUND, __func__, "Job lost while acquiring queue 5");
     return(PBSE_JOBNOTFOUND);
     }
 
@@ -1330,11 +1330,11 @@ int modify_job_attr(
         if ((pque = get_jobs_queue(&pjob)) != NULL)
           {
           rc = chk_resc_limits( &newattr[JOB_ATR_resource], pque, NULL);
-          unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+          unlock_queue(pque, __func__, NULL, LOGLEVEL);
           }
         else if (pjob == NULL)
           {
-          log_err(PBSE_JOBNOTFOUND, __func__, (char *)"Job lost while acquiring queue 6");
+          log_err(PBSE_JOBNOTFOUND, __func__, "Job lost while acquiring queue 6");
           return(PBSE_JOBNOTFOUND);
           }
         else
@@ -1511,7 +1511,7 @@ void post_modify_arrayreq(
   if (preq == NULL)
     return;
 
-  parent_req = preq->rq_extra; /* This is the original batch_request allocated by process_request */
+  parent_req = (struct batch_request *)preq->rq_extra; /* This is the original batch_request allocated by process_request */
 
   preq->rq_conn = preq->rq_orgconn;  /* restore socket to client */
 
@@ -1563,7 +1563,7 @@ void post_modify_arrayreq(
           log_event(PBSEVENT_JOB,PBS_EVENTCLASS_JOB,pjob->ji_qs.ji_jobid,log_buf);
           }
         
-        unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
         }
       }
 
diff --git a/src/server/req_movejob.c b/src/server/req_movejob.c
index 5775d5b608..20dcd8e4ae 100644
--- a/src/server/req_movejob.c
+++ b/src/server/req_movejob.c
@@ -120,7 +120,7 @@ job  *chk_job_request(char *, struct batch_request *);
 
 int req_movejob(
 
-  void *vp) /* I */
+    struct batch_request *vp) /* I */
 
   {
   job *jobp;
@@ -152,7 +152,7 @@ int req_movejob(
 
     req_reject(PBSE_BADSTATE, 0, req, NULL, NULL);
 
-    unlock_ji_mutex(jobp, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(jobp, __func__, "1", LOGLEVEL);
 
     return(PBSE_NONE);
     }
@@ -172,7 +172,7 @@ int req_movejob(
       {
       log_event(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, __func__, log_buf);
       }
-    unlock_ji_mutex(jobp, __func__, (char *)"2", LOGLEVEL);
+    unlock_ji_mutex(jobp, __func__, "2", LOGLEVEL);
     req_reject(PBSE_JOB_ALREADY_IN_QUEUE, 0, req, NULL, log_buf);
     return(PBSE_NONE);
     }
@@ -215,7 +215,7 @@ int req_movejob(
       break;
     }  /* END switch (svr_movejob(jobp,req->rq_ind.rq_move.rq_destin,req)) */
 
-  unlock_ji_mutex(jobp, __func__, (char *)"1", LOGLEVEL);
+  unlock_ji_mutex(jobp, __func__, "1", LOGLEVEL);
 
   return(PBSE_NONE);
   }  /* END req_movejob() */
@@ -231,7 +231,7 @@ int req_movejob(
 
 int req_orderjob(
 
-  void *vp) /* I */
+  struct batch_request *vp) /* I */
 
   {
   job                  *pjob;
@@ -274,8 +274,8 @@ int req_orderjob(
 
     req_reject(PBSE_BADSTATE, 0, req, NULL, NULL);
 
-    unlock_ji_mutex(pjob1, __func__, (char *)"1", LOGLEVEL);
-    unlock_ji_mutex(pjob2, __func__, (char *)"2", LOGLEVEL);
+    unlock_ji_mutex(pjob1, __func__, "1", LOGLEVEL);
+    unlock_ji_mutex(pjob2, __func__, "2", LOGLEVEL);
 
     return(PBSE_NONE);
     }
@@ -318,9 +318,9 @@ int req_orderjob(
       req_reject(rc, 0, req, NULL, NULL);
 
       if (pjob1 != NULL)
-        unlock_ji_mutex(pjob1, __func__, (char *)"3", LOGLEVEL);
+        unlock_ji_mutex(pjob1, __func__, "3", LOGLEVEL);
       if (pjob2 != NULL)
-        unlock_ji_mutex(pjob2, __func__, (char *)"4", LOGLEVEL);
+        unlock_ji_mutex(pjob2, __func__, "4", LOGLEVEL);
 
       return(PBSE_NONE);
       }
@@ -364,13 +364,13 @@ int req_orderjob(
   if (pjob1 != NULL)
     {
     job_save(pjob1, SAVEJOB_FULL, 0);
-    unlock_ji_mutex(pjob1, __func__, (char *)"7", LOGLEVEL);
+    unlock_ji_mutex(pjob1, __func__, "7", LOGLEVEL);
     }
 
   if (pjob2 != NULL)
     {
     job_save(pjob2, SAVEJOB_FULL, 0);
-    unlock_ji_mutex(pjob2, __func__, (char *)"8", LOGLEVEL);
+    unlock_ji_mutex(pjob2, __func__, "8", LOGLEVEL);
     }
 
   /* SUCCESS */
diff --git a/src/server/req_quejob.c b/src/server/req_quejob.c
index 4c687d1735..68d7271603 100644
--- a/src/server/req_quejob.c
+++ b/src/server/req_quejob.c
@@ -116,6 +116,7 @@
 #include "log.h"
 #include "../lib/Liblog/pbs_log.h"
 #include "../lib/Liblog/log_event.h"
+#include "../lib/Libifl/lib_ifl.h"
 #include "svrfunc.h"
 #include "csv.h"
 #include "array.h"
@@ -189,7 +190,7 @@ static char *user_account_default(char *);
 static int user_account_read_user(char *);
 #endif /* PNOT */
 
-static char *pbs_o_que = "PBS_O_QUEUE=";
+static const char *pbs_o_que = "PBS_O_QUEUE=";
 
 /****************************************************************** 
  * set_nodes_attr - Check to see is the node resource was requested
@@ -619,7 +620,7 @@ int req_quejob(
       if (!strcmp(pj->ji_qs.ji_jobid, jid))
         break;
       
-      unlock_ji_mutex(pj, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pj, __func__, "1", LOGLEVEL);
       }
     }
 
@@ -630,7 +631,7 @@ int req_quejob(
     rc = PBSE_JOBEXIST;
     log_err(rc, __func__, "cannot queue new job, job already exists");
     req_reject(rc, 0, preq, NULL, NULL);
-    unlock_ji_mutex(pj, __func__, (char *)"2", LOGLEVEL);
+    unlock_ji_mutex(pj, __func__, "2", LOGLEVEL);
     return rc;
     }
 
@@ -952,7 +953,7 @@ int req_quejob(
       /* make sure the job id doesn't already exist */
       if ((tmpjob = svr_find_job(tmp_job_id, FALSE)) != NULL)
         {
-        unlock_ji_mutex(tmpjob, __func__, (char *)"3", LOGLEVEL);
+        unlock_ji_mutex(tmpjob, __func__, "3", LOGLEVEL);
 
         /* not unique, reject job */
         svr_job_purge(pj);
@@ -1194,9 +1195,9 @@ int req_quejob(
      * set any "unspecified" checkpoint with queue default values, if any
      */
 
-    lock_queue(pque, __func__, (char *)"locking for set_chkpt_deflt", LOGLEVEL);
+    lock_queue(pque, __func__, "locking for set_chkpt_deflt", LOGLEVEL);
     set_chkpt_deflt(pj, pque);
-    unlock_queue(pque, __func__, (char *)"unlocking for set_chkpt_deflt", LOGLEVEL);
+    unlock_queue(pque, __func__, "unlocking for set_chkpt_deflt", LOGLEVEL);
 
     /* If queue has checkpoint directory name specified, propagate it to the job. */
 
@@ -1389,15 +1390,15 @@ int req_quejob(
     free(oldid);    
     }
 
-  lock_queue(pque, __func__, (char *)"lock for svr_chkque", LOGLEVEL);
+  lock_queue(pque, __func__, "lock for svr_chkque", LOGLEVEL);
   if ((rc = svr_chkque(pj, pque, preq->rq_host, MOVE_TYPE_Move, EMsg)))
     {
-    unlock_queue(pque, __func__, (char *)"can not move", LOGLEVEL);
+    unlock_queue(pque, __func__, "can not move", LOGLEVEL);
     svr_job_purge(pj);
     req_reject(rc, 0, preq, NULL, EMsg);
     return(rc);
     }
-  unlock_queue(pque, __func__, (char *)"unlock for svr_chkque", LOGLEVEL);
+  unlock_queue(pque, __func__, "unlock for svr_chkque", LOGLEVEL);
 
   /* FIXME: if EMsg[0] != '\0', send a warning email to the user */
 
@@ -1439,7 +1440,7 @@ int req_quejob(
   insert_job(&newjobs,pj);
 
   *pjob_id = strdup(pj->ji_qs.ji_jobid);
-  unlock_ji_mutex(pj, __func__, (char *)"4", LOGLEVEL);
+  unlock_ji_mutex(pj, __func__, "4", LOGLEVEL);
 
   return rc;
   }  /* END req_quejob() */
@@ -1476,12 +1477,12 @@ int req_jobcredential(
     {
     rc = PBSE_PERM;
     req_reject(rc, 0, preq, NULL, "job request not authorized");
-    unlock_ji_mutex(pj, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pj, __func__, "1", LOGLEVEL);
     return rc;
     }
 
   reply_ack(preq);
-  unlock_ji_mutex(pj, __func__, (char *)"2", LOGLEVEL);
+  unlock_ji_mutex(pj, __func__, "2", LOGLEVEL);
   return rc;
   }  /* END req_jobcredential() */
 
@@ -1543,7 +1544,7 @@ int req_jobscript(
       }
     log_err(rc, __func__, log_buf);
     req_reject(rc, 0, preq, NULL, log_buf);
-    unlock_ji_mutex(pj, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pj, __func__, "1", LOGLEVEL);
     return(rc);
     }
 
@@ -1555,7 +1556,7 @@ int req_jobscript(
         preq->rq_ind.rq_jobfile.rq_jobid, errno, strerror(errno));
     log_err(rc, __func__, log_buf);
     req_reject(rc, 0, preq, NULL, log_buf);
-    unlock_ji_mutex(pj, __func__, (char *)"2", LOGLEVEL);
+    unlock_ji_mutex(pj, __func__, "2", LOGLEVEL);
     return rc;
     }
 
@@ -1582,11 +1583,11 @@ int req_jobscript(
              msg_script_open);
     log_err(rc, __func__, log_buf);
     req_reject(rc, 0, preq, NULL, log_buf);
-    unlock_ji_mutex(pj, __func__, (char *)"3", LOGLEVEL);
+    unlock_ji_mutex(pj, __func__, "3", LOGLEVEL);
     return rc;
     }
 
-  if (write(
+  if (write_ac_socket(
         fds,
         preq->rq_ind.rq_jobfile.rq_data,
         (unsigned)preq->rq_ind.rq_jobfile.rq_size) != preq->rq_ind.rq_jobfile.rq_size)
@@ -1600,7 +1601,7 @@ int req_jobscript(
     log_err(rc, __func__, log_buf);
     req_reject(PBSE_INTERNAL, 0, preq, NULL, log_buf);
     close(fds);
-    unlock_ji_mutex(pj, __func__, (char *)"4", LOGLEVEL);
+    unlock_ji_mutex(pj, __func__, "4", LOGLEVEL);
     return rc;
     }
 
@@ -1614,7 +1615,7 @@ int req_jobscript(
     (pj->ji_qs.ji_svrflags & ~JOB_SVFLG_CHECKPOINT_FILE) | JOB_SVFLG_SCRIPT;
 
   /* SUCCESS */
-  unlock_ji_mutex(pj, __func__, (char *)"5", LOGLEVEL);
+  unlock_ji_mutex(pj, __func__, "5", LOGLEVEL);
 
   reply_ack(preq);
 
@@ -1659,7 +1660,7 @@ int req_mvjobfile(
     log_err(rc, __func__, log_buf);
     req_reject(rc, 0, preq, NULL, NULL);
     if (pj != NULL)
-      unlock_ji_mutex(pj, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pj, __func__, "1", LOGLEVEL);
     return(rc);
     }
 
@@ -1693,7 +1694,7 @@ int req_mvjobfile(
           pj->ji_qs.ji_jobid, errno, strerror(errno));
       log_err(rc, __func__, log_buf);
       req_reject(rc, 0, preq, NULL, log_buf);
-      unlock_ji_mutex(pj, __func__, (char *)"2", LOGLEVEL);
+      unlock_ji_mutex(pj, __func__, "2", LOGLEVEL);
       return(rc);
       break;
     }
@@ -1714,11 +1715,11 @@ int req_mvjobfile(
         namebuf, pj->ji_qs.ji_jobid, errno, strerror(errno), msg_script_open);
     log_err(errno, __func__, log_buf);
     req_reject(rc, 0, preq, NULL, log_buf);
-    unlock_ji_mutex(pj, __func__, (char *)"3", LOGLEVEL);
+    unlock_ji_mutex(pj, __func__, "3", LOGLEVEL);
     return(rc);
     }
 
-  if (write(
+  if (write_ac_socket(
         fds,
         preq->rq_ind.rq_jobfile.rq_data,
         (unsigned)preq->rq_ind.rq_jobfile.rq_size) != preq->rq_ind.rq_jobfile.rq_size)
@@ -1730,7 +1731,7 @@ int req_mvjobfile(
     log_err(rc, "req_jobfile", log_buf);
     req_reject(PBSE_SYSTEM, 0, preq, NULL, log_buf);
     close(fds);
-    unlock_ji_mutex(pj, __func__, (char *)"4", LOGLEVEL);
+    unlock_ji_mutex(pj, __func__, "4", LOGLEVEL);
     return(rc);
     }
 
@@ -1752,7 +1753,7 @@ int req_mvjobfile(
 
   reply_ack(preq);
 
-  unlock_ji_mutex(pj, __func__, (char *)"5", LOGLEVEL);
+  unlock_ji_mutex(pj, __func__, "5", LOGLEVEL);
 
   return(rc);
   }  /* END req_mvjobfile() */
@@ -1815,7 +1816,7 @@ int req_rdytocommit(
         preq->rq_ind.rq_rdytocommit, errno, strerror(errno));
     log_err(rc, __func__, log_buf);
     req_reject(rc, 0, preq, NULL, log_buf);
-    unlock_ji_mutex(pj, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pj, __func__, "1", LOGLEVEL);
     return(rc);
     }
 
@@ -1825,7 +1826,7 @@ int req_rdytocommit(
     snprintf(log_buf, LOCAL_LOG_BUF_SIZE, "can not authorize job req %s",
         preq->rq_ind.rq_rdytocommit);
     req_reject(rc, 0, preq, NULL, log_buf);
-    unlock_ji_mutex(pj, __func__, (char *)"2", LOGLEVEL);
+    unlock_ji_mutex(pj, __func__, "2", LOGLEVEL);
     return(rc);
     }
 
@@ -1873,7 +1874,7 @@ int req_rdytocommit(
     pj->ji_wattr[JOB_ATR_state].at_flags = OrigFlags;
 
     req_reject(rc, 0, preq, NULL, log_buf);
-    unlock_ji_mutex(pj, __func__, (char *)"3", LOGLEVEL);
+    unlock_ji_mutex(pj, __func__, "3", LOGLEVEL);
     return(rc);
     }
 
@@ -1881,7 +1882,7 @@ int req_rdytocommit(
   strcpy(jobid, pj->ji_qs.ji_jobid);
 
   /* unlock now to prevent a potential deadlock */
-  unlock_ji_mutex(pj, __func__, (char *)"4", LOGLEVEL);
+  unlock_ji_mutex(pj, __func__, "4", LOGLEVEL);
 
   if (reply_jobid(preq, jobid, BATCH_REPLY_CHOICE_RdytoCom) != 0)
     {
@@ -2041,7 +2042,7 @@ int req_commit(
         errno, strerror(errno));
     log_err(rc, __func__, log_buf);
     req_reject(PBSE_IVALREQ, 0, preq, NULL, log_buf);
-    unlock_ji_mutex(pj, __func__, (char *)"5", LOGLEVEL);
+    unlock_ji_mutex(pj, __func__, "5", LOGLEVEL);
     return(rc);
     }
 
@@ -2074,7 +2075,7 @@ int req_commit(
         errno, strerror(errno));
     log_err(rc, __func__, "cannot commit job in unexpected state");
     req_reject(rc, 0, preq, NULL, NULL);
-    unlock_ji_mutex(pj, __func__, (char *)"6", LOGLEVEL);
+    unlock_ji_mutex(pj, __func__, "6", LOGLEVEL);
     return(rc);
     }
 
@@ -2086,7 +2087,7 @@ int req_commit(
     req_reject(rc, 0, preq, NULL, log_buf);
     if (LOGLEVEL >= 6)
       log_record(PBSEVENT_JOB, PBS_EVENTCLASS_JOB, pj->ji_qs.ji_jobid, log_buf);
-    unlock_ji_mutex(pj, __func__, (char *)"7", LOGLEVEL);
+    unlock_ji_mutex(pj, __func__, "7", LOGLEVEL);
     return(rc);
     }
 
@@ -2126,7 +2127,7 @@ int req_commit(
         req_reject(rc, 0, preq, NULL, NULL);
         }
 
-      unlock_ji_mutex(pj, __func__, (char *)"8", LOGLEVEL);
+      unlock_ji_mutex(pj, __func__, "8", LOGLEVEL);
 
       return(rc);
       }
@@ -2267,7 +2268,7 @@ int req_commit(
     issue_track(pj);
     }
 
-  unlock_ji_mutex(pj, __func__, (char *)"9", LOGLEVEL);
+  unlock_ji_mutex(pj, __func__, "9", LOGLEVEL);
 
 #ifdef AUTORUN_JOBS
   /* If we are auto running jobs with start_count = 0 then the
@@ -2350,7 +2351,7 @@ static job *locate_new_job(
 
       break;
       }
-    unlock_ji_mutex(pj, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pj, __func__, "1", LOGLEVEL);
     }  /* END while(pj != NULL) */
 
   /* return job slot located (NULL on FAILURE) */
@@ -2518,7 +2519,7 @@ int user_account_read_user(
     return(0);
     }
 
-  readsize = read(fd, s_buf, sizeof(s_buf));
+  readsize = read_ac_socket(fd, s_buf, sizeof(s_buf));
 
   close(fd);
 
diff --git a/src/server/req_register.c b/src/server/req_register.c
index a7d5c0e09f..e5ab3f0772 100644
--- a/src/server/req_register.c
+++ b/src/server/req_register.c
@@ -135,7 +135,7 @@ struct depend_job *find_dependjob(struct depend *, char *name);
 
 struct depend_job *make_dependjob(struct depend *, char *jobid, char *host);
 void   del_depend_job(struct depend_job *pdj);
-int    build_depend(pbs_attribute *, char *);
+int    build_depend(pbs_attribute *, const char *);
 void   clear_depend(struct depend *, int type, int exists);
 void   del_depend(struct depend *);
 void   release_cheapest(job *, struct depend *);
@@ -243,7 +243,7 @@ int check_dependency_job(
     rc = PBSE_BADSTATE;
     req_reject(rc, 0, preq, NULL, NULL);
 
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
     
     return(rc);
     }
@@ -807,7 +807,7 @@ int req_register(
     }
 
   if (pjob != NULL)
-    unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
 
   return(rc);
   }  /* END req_register() */
@@ -924,7 +924,7 @@ int req_registerarray(
 
   if (type < JOB_DEPEND_TYPE_AFTERSTARTARRAY)
     {
-    unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+    unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
     rc = PBSE_IVALREQ;
     req_reject(rc,0,preq,NULL,
       "Arrays may only be given array dependencies");
@@ -958,7 +958,7 @@ int req_registerarray(
       break;
     } /* END switch (preq->rq_ind.rq_register.rq_op */
 
-  unlock_ai_mutex(pa, __func__, (char *)"2", LOGLEVEL);
+  unlock_ai_mutex(pa, __func__, "2", LOGLEVEL);
 
   return(rc);
   } /* END req_registerarray() */
@@ -990,7 +990,7 @@ int register_array_depend(
   /* make dependency of none exists */
   if (pdep == NULL)
     {
-    pdep = calloc(1, sizeof(struct array_depend));
+    pdep = (struct array_depend *)calloc(1, sizeof(struct array_depend));
 
     if (pdep != NULL)
       {
@@ -1164,7 +1164,7 @@ void set_array_depend_holds(
           set_depend_hold(pjob, &pjob->ji_wattr[JOB_ATR_depend]);
           }
 
-        unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
         }
 
       pdj = (struct array_depend_job *)GET_NEXT(pdj->dc_link);
@@ -1240,7 +1240,7 @@ void post_doq(
 
         set_depend_hold(pjob, pattr);
 
-        unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
         }
       }
     }
@@ -1275,7 +1275,7 @@ void alter_unreg(
   char               job_id[PBS_MAXSVRJOBID+1];
 
   strcpy(job_id, pjob->ji_qs.ji_jobid);
-  unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
   pjob = NULL;
 
   for (poldd = (struct depend *)GET_NEXT(old->at_val.at_list);
@@ -1343,7 +1343,7 @@ int depend_on_que(
     {
     if (pjob == NULL)
       {
-      log_err(PBSE_JOBNOTFOUND, __func__, (char *)"Job lost while acquiring queue 8");
+      log_err(PBSE_JOBNOTFOUND, __func__, "Job lost while acquiring queue 8");
       return(PBSE_JOBNOTFOUND);
       }
     else
@@ -1353,11 +1353,11 @@ int depend_on_que(
             (mode != ATR_ACTION_NOOP)) ||
            (pque->qu_qs.qu_type != QTYPE_Execution))
     {
-    unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+    unlock_queue(pque, __func__, NULL, LOGLEVEL);
     return(PBSE_NONE);
     }
   else
-    unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+    unlock_queue(pque, __func__, NULL, LOGLEVEL);
 
   if (mode == ATR_ACTION_ALTER)
     {
@@ -1370,7 +1370,7 @@ int depend_on_que(
 
   /* First set a System hold if required */
 
-  unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
   set_depend_hold(pjob, pattr);
 /*  if ((pjob = svr_find_job(job_id, FALSE)) == NULL)
     return PBSE_JOBNOTFOUND;*/
@@ -1468,7 +1468,7 @@ void post_doe(
         }
       }
     
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
     }
 
   free_br(preq);
@@ -1721,7 +1721,7 @@ int depend_on_term(
     } /* END loop over each dependency */
 
   if (!job_unlocked)
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
   return(0);
   }  /* END depend_on_term() */
@@ -1873,7 +1873,7 @@ void set_depend_hold(
             }
 
           if (djp != NULL)
-            unlock_ji_mutex(djp, __func__, (char *)"1", LOGLEVEL);
+            unlock_ji_mutex(djp, __func__, "1", LOGLEVEL);
           }
 
         break;
@@ -2321,7 +2321,7 @@ int send_depend_req(
   if (preq == NULL)
     {
     log_err(errno, __func__, msg_err_malloc);
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
     return(PBSE_SYSTEM);
     }
 
@@ -2329,7 +2329,7 @@ int send_depend_req(
     {
     if (pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str == NULL)
       {
-      unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
       free_br(preq);
       return(PBSE_BADATVAL);
       }
@@ -2379,7 +2379,7 @@ int send_depend_req(
 
   /* save jobid and unlock mutex */
   strcpy(job_id, pjob->ji_qs.ji_jobid);
-  unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
 
   get_batch_request_id(preq);
   strcpy(br_id, preq->rq_id);
@@ -2436,7 +2436,7 @@ int send_depend_req(
 struct dependnames
   {
   int   type;
-  char *name;
+  const char *name;
   } dependnames[] =
 
   {
@@ -2478,9 +2478,9 @@ struct dependnames
 int decode_depend(
 
   pbs_attribute *patr,
-  const char    *name,  /* attribute name */
-  char    *rescn, /* resource name, unused here */
-  char    *val,   /* attribute value */
+  const char   *name,  /* attribute name */
+  const char *rescn, /* resource name, unused here */
+  const char    *val,   /* attribute value */
   int            perm)  /* only used for resources */
 
   {
@@ -2502,7 +2502,7 @@ int decode_depend(
    * add a depend or depend_child structure.
    */
 
-  valwd = parse_comma_string(val,&ptr);
+  valwd = parse_comma_string((char *)val,&ptr);
 
   while (valwd != NULL)
     {
@@ -2602,7 +2602,7 @@ void cat_jobsvr(
 void fast_strcat(
 
   char **Dest,
-  char  *Src)
+  const char  *Src)
 
   {
   char *d;
@@ -2944,7 +2944,7 @@ void free_depend(
 int build_depend(
 
   pbs_attribute *pattr,
-  char          *value)
+  const char    *value)
 
   {
   struct depend      *have[JOB_DEPEND_NUMBER_TYPES];
@@ -2967,7 +2967,7 @@ int build_depend(
    * struct;  set_depend will "remove" any of that kind.
    */
 
-  if ((nxwrd = strchr(value, (int)':')) != NULL)
+  if ((nxwrd = strchr((char *)value, (int)':')) != NULL)
     *nxwrd++ = '\0';
 
   for (pname = dependnames; pname->type != -1; pname++)
diff --git a/src/server/req_register.h b/src/server/req_register.h
index 0092b34b32..77d9db4c96 100644
--- a/src/server/req_register.h
+++ b/src/server/req_register.h
@@ -24,7 +24,9 @@ int depend_on_term(char *job_id);
 
 void depend_clrrdy(job *pjob);
 
-int set_depend(struct pbs_attribute *attr, struct pbs_attribute *new, enum batch_op op);
+int encode_depend(pbs_attribute *attr, tlist_head *phead, const char *atname, const char *rsname, int mode, int perm);
+
+int set_depend(struct pbs_attribute *attr, struct pbs_attribute *newAttr, enum batch_op op);
 
 int comp_depend(struct pbs_attribute *attr, struct pbs_attribute *with);
 
diff --git a/src/server/req_rerun.c b/src/server/req_rerun.c
index 439bcc6fa8..8e5f829f23 100644
--- a/src/server/req_rerun.c
+++ b/src/server/req_rerun.c
@@ -113,7 +113,7 @@ extern char *msg_jobrerun;
 extern void rel_resc(job *);
 
 extern job  *chk_job_request(char *, struct batch_request *);
-int          issue_signal(job **, char *, void(*)(batch_request *), void *);
+int          issue_signal(job **, const char *, void(*)(batch_request *), void *);
 
 /*
  * post_rerun - handler for reply from mom on signal_job sent in req_rerunjob
@@ -147,7 +147,7 @@ void post_rerun(
 
       svr_setjobstate(pjob, newstate, newsub, FALSE);
 
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
       }
     }
 
@@ -218,7 +218,7 @@ int req_rerunjob(
     snprintf(log_buf, LOCAL_LOG_BUF_SIZE, "job %s is in a bad state",
         preq->rq_ind.rq_rerun);
     req_reject(rc, 0, preq, NULL, log_buf);
-    unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
     return rc;
     }
 
@@ -231,7 +231,7 @@ int req_rerunjob(
     snprintf(log_buf, LOCAL_LOG_BUF_SIZE,
         "additional permissions required (ATR_DFLAG_MGWR | ATR_DFLAG_OPWR)");
     req_reject(rc, 0, preq, NULL, log_buf);
-    unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
     return rc;
     }
 
@@ -248,14 +248,14 @@ int req_rerunjob(
     snprintf(log_buf, LOCAL_LOG_BUF_SIZE, "job %s not rerunnable",
         preq->rq_ind.rq_rerun);
     req_reject(rc, 0, preq, NULL, log_buf);
-    unlock_ji_mutex(pjob, __func__, (char *)"4", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "4", LOGLEVEL);
     return rc;
     }
 
   if (pjob->ji_qs.ji_state == JOB_STATE_RUNNING)
     {
     /* ask MOM to kill off the job if it is running */
-    static char *rerun = "rerun";
+    static const char *rerun = "rerun";
     char        *extra = strdup(rerun);
 
     rc = issue_signal(&pjob, "SIGKILL", post_rerun, extra);
@@ -320,7 +320,7 @@ int req_rerunjob(
         snprintf(log_buf, LOCAL_LOG_BUF_SIZE, "Rejected by mom");
         req_reject(rc, 0, preq, NULL, log_buf);
         if (pjob != NULL)
-          unlock_ji_mutex(pjob, __func__, (char *)"5", LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, "5", LOGLEVEL);
         return rc;
         }
       else
@@ -408,7 +408,7 @@ int req_rerunjob(
   
     /* note in accounting file */
     account_record(PBS_ACCT_RERUN, pjob, NULL);
-    unlock_ji_mutex(pjob, __func__, (char *)"6", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "6", LOGLEVEL);
     }
 
   return rc;
diff --git a/src/server/req_rescq.c b/src/server/req_rescq.c
index 70451192b0..63be6e4262 100644
--- a/src/server/req_rescq.c
+++ b/src/server/req_rescq.c
@@ -118,7 +118,7 @@ resource_t next_resource_tag;
 
 int req_rescq(
     
-  void *vp)
+    struct batch_request *vp) /* I */
 
   {
   struct batch_request *preq = (struct batch_request *)vp;
@@ -211,7 +211,7 @@ int req_rescq(
 
 int req_rescreserve(
     
-  void *vp)
+  struct batch_request *vp) /* I */
 
   {
   struct batch_request *preq = (struct batch_request *)vp;
@@ -315,7 +315,7 @@ int req_rescreserve(
 
 int req_rescfree(
     
-  void *vp)
+   struct batch_request *vp) /* I */
 
   {
   struct batch_request *preq = (struct batch_request *)vp;
diff --git a/src/server/req_runjob.c b/src/server/req_runjob.c
index b4d79f7b00..453d63a829 100644
--- a/src/server/req_runjob.c
+++ b/src/server/req_runjob.c
@@ -185,7 +185,7 @@ void *check_and_run_job(
   {
   batch_request   *preq = (batch_request *)vp;
   job             *pjob;
-  int             *rc_ptr = calloc(1, sizeof(int));
+  int             *rc_ptr = (int *)calloc(1, sizeof(int));
   char             failhost[MAXLINE];
   char             emsg[MAXLINE];
   long             job_atr_hold;
@@ -216,7 +216,7 @@ void *check_and_run_job(
     if (pjob == NULL)
       {
       req_reject(PBSE_JOBNOTFOUND, 0, preq, NULL, "Job unexpectedly deleted");
-      unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+      unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
       *rc_ptr = PBSE_JOBNOTFOUND;
       return(rc_ptr);
       }
@@ -228,7 +228,7 @@ void *check_and_run_job(
       job_exit_status = pjob->ji_qs.ji_un.ji_exect.ji_exitstat;
       job_state = pjob->ji_qs.ji_state;
 
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
       update_array_values(pa,job_state,aeRun,
           job_id, job_atr_hold, job_exit_status);
@@ -237,7 +237,7 @@ void *check_and_run_job(
         {
         req_reject(PBSE_JOBNOTFOUND, 0, preq, NULL,
           "Job deleted while updating array values");
-        unlock_ai_mutex(pa, __func__, (char *)"2", LOGLEVEL);
+        unlock_ai_mutex(pa, __func__, "2", LOGLEVEL);
         *rc_ptr = PBSE_JOBNOTFOUND;
         return(rc_ptr);
         }
@@ -251,8 +251,8 @@ void *check_and_run_job(
      
       req_reject(PBSE_IVALREQ, 0, preq, NULL, log_buf);
       
-      unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
-      unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
+      unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
 
       *rc_ptr = PBSE_IVALREQ;
 
@@ -273,7 +273,7 @@ void *check_and_run_job(
 
     /* if the job has a non-empty rejectdest list, pass the first host into req_reject() */
 
-    if ((bp = GET_NEXT(pjob->ji_rejectdest)) != NULL)
+    if ((bp = (badplace *)GET_NEXT(pjob->ji_rejectdest)) != NULL)
       {
       req_reject(*rc_ptr, 0, preq, bp->bp_dest, "could not contact host");
       }
@@ -283,7 +283,7 @@ void *check_and_run_job(
       }
     }
 
-  unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
 
   return(rc_ptr);
   } /* END check_and_run_job() */
@@ -330,7 +330,7 @@ int req_runjob(
 
   if (strstr(pjob->ji_qs.ji_jobid,"[]") != NULL)
     {
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
     req_reject(PBSE_IVALREQ, 0, preq, NULL, "cannot run a job array");
     return(PBSE_IVALREQ);
     }
@@ -346,7 +346,7 @@ int req_runjob(
 
   /* If async run, reply now; otherwise reply is handled in */
   /* post_sendmom or post_stagein */
-  unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
 
   if (preq->rq_type == PBS_BATCH_AsyrunJob)
     {
@@ -413,7 +413,7 @@ void post_checkpointsend(
     return;
 
   code = preq->rq_reply.brp_code;
-  pjob = svr_find_job(preq->rq_extra, FALSE);
+  pjob = svr_find_job((char *)preq->rq_extra, FALSE);
 
   free(preq->rq_extra);
 
@@ -477,7 +477,7 @@ void post_checkpointsend(
       }
 
     if (pjob != NULL)
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
     }    /* END if (pjob != NULL) */
 
   free_br(preq); /* close connection and release request */
@@ -539,7 +539,7 @@ int svr_send_checkpoint(
       {
       svr_setjobstate(pjob, state, substate, FALSE);
       strcpy(jobid, pjob->ji_qs.ji_jobid);
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
       }
 
     post_checkpointsend(momreq);
@@ -604,7 +604,7 @@ int req_stagein(
 
     req_reject(PBSE_IVALREQ, 0, preq, NULL, NULL);
  
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
     return(PBSE_IVALREQ);
     }
@@ -620,7 +620,7 @@ int req_stagein(
     req_reject(rc, 0, preq, NULL, NULL);
     }
 
-  unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
 
   return(rc);
   }  /* END req_stagein() */
@@ -651,7 +651,7 @@ void post_stagein(
     return;
 
   code = preq->rq_reply.brp_code;
-  pjob = svr_find_job(preq->rq_extra, FALSE);
+  pjob = svr_find_job((char *)preq->rq_extra, FALSE);
 
   free(preq->rq_extra);
 
@@ -722,7 +722,7 @@ void post_stagein(
       }
 
     if (pjob != NULL)
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
     }    /* END if (pjob != NULL) */
 
   free_br(preq); /* close connection and release request */
@@ -786,7 +786,7 @@ int svr_stagein(
       {
       strcpy(jobid, pjob->ji_qs.ji_jobid);
       svr_setjobstate(pjob, state, substate, FALSE);
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
       }
 
     post_stagein(momreq);
@@ -1154,7 +1154,7 @@ int send_job_to_mom(
   
   job_momaddr = pjob->ji_qs.ji_un.ji_exect.ji_momaddr;
   strcpy(job_id, pjob->ji_qs.ji_jobid);
-  unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
   *pjob_ptr = NULL;
   pjob = NULL;
 
@@ -1271,9 +1271,9 @@ int handle_heterogeneous_job_launch(
   batch_request *external_preq;
   batch_request *cray_preq;
   
-  unlock_ji_mutex(pjob, __func__, (char *)NULL, 0);
-  lock_ji_mutex(external_clone, __func__, (char *)NULL, 0);
-  lock_ji_mutex(cray_clone, __func__, (char *)NULL, 0);
+  unlock_ji_mutex(pjob, __func__, NULL, 0);
+  lock_ji_mutex(external_clone, __func__, NULL, 0);
+  lock_ji_mutex(cray_clone, __func__, NULL, 0);
   
   /* clone the batch requests to avoid double frees */
   external_preq = duplicate_request(preq);
@@ -1297,12 +1297,12 @@ int handle_heterogeneous_job_launch(
     free_br(cray_preq);
   
   if (cray_clone != NULL)
-    unlock_ji_mutex(cray_clone, __func__, (char *)NULL, 0);
+    unlock_ji_mutex(cray_clone, __func__, NULL, 0);
   
   if (external_clone != NULL)
-    unlock_ji_mutex(external_clone, __func__, (char *)NULL, 0);
+    unlock_ji_mutex(external_clone, __func__, NULL, 0);
   
-  lock_ji_mutex(pjob, __func__, (char *)NULL, 0);
+  lock_ji_mutex(pjob, __func__, NULL, 0);
   
   if (both_running == TRUE)
     {
@@ -1555,7 +1555,7 @@ void finish_sendmom(
           pjob->ji_momstat = 0;
           
           /* update mom-based job status */
-          unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
           stat_mom_job(job_id);
           pjob = svr_find_job(job_id, TRUE);
           }
@@ -1577,7 +1577,7 @@ void finish_sendmom(
       }
     }  /* END switch (status) */
 
-  unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
   } /* END finish_sendmom() */
 
 
@@ -1626,7 +1626,7 @@ job *chk_job_torun(
 
     req_reject(PBSE_BADSTATE, 0, preq, NULL, "job already running");
 
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
     return(NULL);
     }
@@ -1639,7 +1639,7 @@ job *chk_job_torun(
 
       req_reject(PBSE_BADSTATE, 0, preq, NULL, NULL);
 
-      unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
 
       return(NULL);
       }
@@ -1651,7 +1651,7 @@ job *chk_job_torun(
 
     req_reject(PBSE_PERM, 0, preq, NULL, NULL);
 
-    unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
 
     return(NULL);
     }
@@ -1665,13 +1665,13 @@ job *chk_job_torun(
   
       req_reject(PBSE_IVALREQ, 0, preq, NULL, "job not in execution queue");
   
-      unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
-      unlock_ji_mutex(pjob, __func__, (char *)"4", LOGLEVEL);
+      unlock_queue(pque, __func__, NULL, LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "4", LOGLEVEL);
   
       return(NULL);
       }
 
-    unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+    unlock_queue(pque, __func__, NULL, LOGLEVEL);
     }
   else if (pjob == NULL)
     {
@@ -1695,7 +1695,7 @@ job *chk_job_torun(
       if ((exec_host = strdup(pjob->ji_wattr[JOB_ATR_exec_host].at_val.at_str)) == NULL)
         {
         req_reject(PBSE_RMSYSTEM, 0, preq, NULL, "Cannot allocate memory");
-        unlock_ji_mutex(pjob, __func__, (char *)"5", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "5", LOGLEVEL);
         return(NULL);
         }
 
@@ -1712,7 +1712,7 @@ job *chk_job_torun(
         else
           req_reject(PBSE_EXECTHERE, 0, preq, NULL, "allocated nodes must match input file stagein location");
 
-        unlock_ji_mutex(pjob, __func__, (char *)"6", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "6", LOGLEVEL);
         
         return(NULL);
         }
@@ -1733,7 +1733,7 @@ job *chk_job_torun(
         {
         req_reject(PBSE_EXECTHERE, 0, preq, FailHost, EMsg);
 
-        unlock_ji_mutex(pjob, __func__, (char *)"7", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "7", LOGLEVEL);
         
         return(NULL);
         }
@@ -1769,7 +1769,7 @@ job *chk_job_torun(
 
       req_reject(rc, 0, preq, FailHost, EMsg);
 
-      unlock_ji_mutex(pjob, __func__, (char *)"8", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "8", LOGLEVEL);
 
       return(NULL);
       }
@@ -1864,7 +1864,7 @@ int set_job_exec_info(
     memcpy(&hostaddr, &pnode->nd_sock_addr.sin_addr, sizeof(hostaddr));
     pjob->ji_qs.ji_un.ji_exect.ji_momaddr = ntohl(hostaddr.s_addr);
 
-    unlock_node(pnode, __func__, (char *)NULL, LOGLEVEL);
+    unlock_node(pnode, __func__, NULL, LOGLEVEL);
     
     return(PBSE_NONE);
     }
@@ -2051,7 +2051,7 @@ int assign_hosts(
   unsigned int  dummy;
   char         *list = NULL;
   char         *portlist = NULL;
-  char         *hosttoalloc = NULL;
+  const char  *hosttoalloc = NULL;
   resource     *pres;
   int           rc = 0;
   int           procs=0;
@@ -2157,7 +2157,7 @@ int assign_hosts(
 
   if (svr_totnodes != 0)
     {
-    rc = set_nodes(pjob, hosttoalloc, procs, &list, &portlist, FailHost, EMsg);
+    rc = set_nodes(pjob, (char *)hosttoalloc, procs, &list, &portlist, FailHost, EMsg);
     
     set_exec_host = 1; /* maybe new VPs, must set */
     
@@ -2205,7 +2205,7 @@ int assign_hosts(
         (pjob->ji_wattr[JOB_ATR_login_node_id].at_val.at_str != NULL))
       tmp = parse_servername(pjob->ji_wattr[JOB_ATR_login_node_id].at_val.at_str, &dummy);
     else
-      tmp = parse_servername(hosttoalloc, &dummy);
+      tmp = parse_servername((char *)hosttoalloc, &dummy);
     
     snprintf(pjob->ji_qs.ji_destin, sizeof(pjob->ji_qs.ji_destin), "%s", tmp);
     
diff --git a/src/server/req_select.c b/src/server/req_select.c
index 1476cabcba..6737e3c658 100644
--- a/src/server/req_select.c
+++ b/src/server/req_select.c
@@ -460,7 +460,7 @@ static void sel_step2(
         strcpy(job_id, pjob->ji_qs.ji_jobid);
         job_substate = pjob->ji_qs.ji_substate;
         job_momstattime = pjob->ji_momstat;
-        unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
         if ((job_substate == JOB_SUBSTATE_RUNNING) &&
             ((time_now - job_momstattime) > JobStatRate))
@@ -482,10 +482,10 @@ static void sel_step2(
           }
         }
       else
-        unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
       }
     else
-      unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
     }
 
   sel_step3(cntl);
@@ -603,13 +603,13 @@ static void sel_step3(
           {
           /* Select Jobs */
 
-          pselect = calloc(1, sizeof(struct brp_select));
+          pselect = (struct brp_select *)calloc(1, sizeof(struct brp_select));
 
           if (pselect == NULL)
             {
             rc = PBSE_SYSTEM;
 
-            unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+            unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
             
             break;
             }
@@ -630,7 +630,7 @@ static void sel_step3(
 
           if (rc && (rc != PBSE_PERM))
             {
-            unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+            unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
             
             break;
             }
@@ -640,7 +640,7 @@ static void sel_step3(
 
 nextjob:
     
-    unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
 
     if (summarize_arrays)
       {
@@ -973,7 +973,7 @@ static int build_selist(
           if (*pque == (pbs_queue *)0)
             return (PBSE_UNKQUE);
           
-          unlock_queue(*pque, __func__, (char *)NULL, LOGLEVEL);
+          unlock_queue(*pque, __func__, NULL, LOGLEVEL);
           }
         }
       }
diff --git a/src/server/req_shutdown.c b/src/server/req_shutdown.c
index 93b0a4b636..1d4d8fd873 100644
--- a/src/server/req_shutdown.c
+++ b/src/server/req_shutdown.c
@@ -109,7 +109,7 @@
 
 
 
-int          issue_signal(job **, char *, void(*)(batch_request *), void *);
+int          issue_signal(job **, const char *, void(*)(batch_request *), void *);
 
 /* Private Fuctions Local to this File */
 
@@ -154,7 +154,7 @@ void save_queues()
   while ((pque = next_queue(&svr_queues, &iter)) != NULL)
     {
     que_save(pque);
-    unlock_queue(pque, __func__, (char *)NULL, 0);
+    unlock_queue(pque, __func__, NULL, 0);
     }
   } /* END save_queues() */
 
@@ -267,7 +267,7 @@ void svr_shutdown(
         if (shutdown_checkpoint(&pjob) == 0)
           {
           if (pjob != NULL)
-            unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+            unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
           continue;
           }
@@ -280,7 +280,7 @@ void svr_shutdown(
       }
 
     if (pjob != NULL)
-      unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
     }
 
   return;
@@ -426,7 +426,7 @@ static int shutdown_checkpoint(
   
     job_save(pjob, SAVEJOB_QUICK, 0);
     strcpy(jobid, pjob->ji_qs.ji_jobid);
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
     }
   
   if (rc == PBSE_NONE)
@@ -491,7 +491,7 @@ void post_checkpoint(
   free_br(preq);
 
   if (pjob != NULL)
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
   }  /* END post_checkpoint() */
 
 
@@ -525,7 +525,7 @@ void rerun_or_kill(
         {
         snprintf(log_buf, sizeof(log_buf), "%s%s%s", msg_init_queued, pque->qu_qs.qu_name, text);
 
-        unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+        unlock_queue(pque, __func__, NULL, LOGLEVEL);
         }
       }
     }
diff --git a/src/server/req_signal.c b/src/server/req_signal.c
index 9d3d24c60d..183a283035 100644
--- a/src/server/req_signal.c
+++ b/src/server/req_signal.c
@@ -128,7 +128,7 @@ int copy_batchrequest(struct batch_request **newreq, struct batch_request *preq,
 
 int req_signaljob(
 
-  void *vp)  /* I */
+    struct batch_request *vp) /* I */
 
   {
   struct batch_request *preq = (struct batch_request *)vp;
@@ -149,7 +149,7 @@ int req_signaljob(
     {
     req_reject(PBSE_BADSTATE, 0, preq, NULL, NULL);
 
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
     return(PBSE_NONE);
     }
 
@@ -163,7 +163,7 @@ int req_signaljob(
       /* for suspend/resume, must be mgr/op */
       req_reject(PBSE_PERM, 0, preq, NULL, NULL);
       
-      unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
       return(PBSE_NONE);
       }
   
@@ -184,7 +184,7 @@ int req_signaljob(
     {
     req_reject(PBSE_JOBTYPE, 0, preq, NULL, NULL);
 
-    unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
     return(PBSE_NONE);
     }
 
@@ -209,7 +209,7 @@ int req_signaljob(
   if ((rc = copy_batchrequest(&dup_req, preq, 0, -1)) != 0)
     {
     req_reject(rc, 0, preq, NULL, "can not allocate memory");
-    unlock_ji_mutex(pjob, __func__, (char *)"4", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "4", LOGLEVEL);
     }
   /* The dup_req is freed in relay_to_mom (failure)
    * or in issue_Drequest (success) */
@@ -218,7 +218,7 @@ int req_signaljob(
     rc = relay_to_mom(&pjob, dup_req, NULL);
 
     if (pjob != NULL)
-      unlock_ji_mutex(pjob, __func__, (char *)"4", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "4", LOGLEVEL);
 
     if (rc != PBSE_NONE)
       {
@@ -248,8 +248,8 @@ int req_signaljob(
 int issue_signal(
 
   job  **pjob_ptr,
-  char  *signame, /* name of the signal to send */
-  void  (*func)(batch_request *),
+  const char  *signame, /* name of the signal to send */
+  void  (*func)(struct batch_request *),
   void  *extra) /* extra parameter to be stored in sig request */
 
   {
@@ -335,9 +335,9 @@ void post_signal_req(
     }
   else
     {
-    if ((jobid = preq->rq_extra) == NULL)
+    if ((jobid = (char *)preq->rq_extra) == NULL)
       {
-      log_err(ENOMEM, __func__, (char *)"Cannot allocate memory! FAILURE");
+      log_err(ENOMEM, __func__, "Cannot allocate memory! FAILURE");
       return;
       }
 
@@ -374,7 +374,7 @@ void post_signal_req(
           }
         }
     
-      unlock_ji_mutex(pjob, __func__, (char *)"5", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "5", LOGLEVEL);
       }
     else
       {
diff --git a/src/server/req_stat.c b/src/server/req_stat.c
index 603d61b9b7..762ec93e11 100644
--- a/src/server/req_stat.c
+++ b/src/server/req_stat.c
@@ -262,7 +262,7 @@ int req_stat_job(
         rc = PBSE_UNKJOBID;
         }
       else
-        unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
       }
     }
   else if (isalpha(name[0]))
@@ -320,7 +320,7 @@ int req_stat_job(
     {
     if (pque != NULL)
       {
-      unlock_queue(pque, __func__, (char *)"", LOGLEVEL);
+      unlock_queue(pque, __func__, "", LOGLEVEL);
       pque = NULL;
       }
     }
@@ -484,7 +484,7 @@ static void req_stat_job_step2(
               {
               if ((pjob = svr_find_job(pa->job_ids[job_array_index], FALSE)) != NULL)
                 {
-                unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+                unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
                 break;
                 }
               }
@@ -501,7 +501,7 @@ static void req_stat_job_step2(
       else
         {
         strcpy(job_id, pjob->ji_qs.ji_jobid);
-        unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
 
         if (type == tjstJob)
           break;
@@ -518,7 +518,7 @@ static void req_stat_job_step2(
               {
               if ((pjob = svr_find_job(pa->job_ids[job_array_index], FALSE)) != NULL)
                 {
-                unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+                unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
                 break;
                 }
               }
@@ -536,7 +536,7 @@ static void req_stat_job_step2(
       job_substate = pjob->ji_qs.ji_substate;
       job_momstattime = pjob->ji_momstat;
       strcpy(cntl->sc_jobid, job_id);
-      unlock_ji_mutex(pjob, __func__, (char *)"4", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "4", LOGLEVEL);
       pjob = NULL;
 
       /* PBS_RESTAT_JOB defaults to 30 seconds */
@@ -557,7 +557,7 @@ static void req_stat_job_step2(
           }
         
         if (pa != NULL)
-          unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+          unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
 
         return; /* will pick up after mom replies */
         }
@@ -566,7 +566,7 @@ static void req_stat_job_step2(
     if (rc != 0)
       {
       if (pa != NULL)
-        unlock_ai_mutex(pa, __func__, (char *)"2", LOGLEVEL);
+        unlock_ai_mutex(pa, __func__, "2", LOGLEVEL);
 
       reply_free(preply);
 
@@ -658,7 +658,7 @@ static void req_stat_job_step2(
           (pque->qu_qs.qu_type != QTYPE_Execution))
         {
         /* ignore routing queues */
-        unlock_queue(pque, __func__, (char *)"ignore queue", LOGLEVEL);
+        unlock_queue(pque, __func__, "ignore queue", LOGLEVEL);
         continue;
         }
 
@@ -685,7 +685,7 @@ static void req_stat_job_step2(
 
       /* loop through jobs in queue */
       if (pjob != NULL)
-        unlock_ji_mutex(pjob, __func__, (char *)"5", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "5", LOGLEVEL);
 
       iter = -1;
 
@@ -695,7 +695,7 @@ static void req_stat_job_step2(
             (pjob->ji_qs.ji_state == JOB_STATE_QUEUED))
           {
           /* max_report of queued jobs reached for queue */
-          unlock_ji_mutex(pjob, __func__, (char *)"6", LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, "6", LOGLEVEL);
 
           continue;
           }
@@ -715,10 +715,10 @@ static void req_stat_job_step2(
 
           if (pa != NULL)
             {
-            unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+            unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
             }
-          unlock_ji_mutex(pjob, __func__, (char *)"7", LOGLEVEL);
-          unlock_queue(pque, __func__, (char *)"perm", LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, "7", LOGLEVEL);
+          unlock_queue(pque, __func__, "perm", LOGLEVEL);
           return;
           }
 
@@ -727,7 +727,7 @@ static void req_stat_job_step2(
         if (pjob->ji_qs.ji_state == JOB_STATE_QUEUED)
           qjcounter++;
 
-        unlock_ji_mutex(pjob, __func__, (char *)"8", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "8", LOGLEVEL);
         }    /* END foreach (pjob from pque) */
 
       if (LOGLEVEL >= 5)
@@ -739,11 +739,11 @@ static void req_stat_job_step2(
         log_event(PBSEVENT_SYSTEM,PBS_EVENTCLASS_QUEUE,pque->qu_qs.qu_name,log_buf);
         }
     
-      unlock_queue(pque, __func__, (char *)"end while", LOGLEVEL);
+      unlock_queue(pque, __func__, "end while", LOGLEVEL);
       }      /* END for (pque) */
       
     if (pa != NULL)
-      unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+      unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
 
     reply_send_svr(preq);
 
@@ -775,12 +775,12 @@ static void req_stat_job_step2(
         
         if (pque->qu_qs.qu_type != QTYPE_Execution)
           {
-          unlock_queue(pque, __func__, (char *)"not exec", LOGLEVEL);
+          unlock_queue(pque, __func__, "not exec", LOGLEVEL);
         
           goto nextjob;
           }
 
-        unlock_queue(pque, __func__, (char *)"exec", LOGLEVEL);
+        unlock_queue(pque, __func__, "exec", LOGLEVEL);
         }
       }
 
@@ -798,9 +798,9 @@ static void req_stat_job_step2(
       {
       if (pa != NULL)
         {
-        unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+        unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
         }
-      unlock_ji_mutex(pjob, __func__, (char *)"9", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "9", LOGLEVEL);
 
       req_reject(rc, bad, preq, NULL, NULL);
 
@@ -812,7 +812,7 @@ static void req_stat_job_step2(
 nextjob:
 
     if (pjob != NULL)
-      unlock_ji_mutex(pjob, __func__, (char *)"10", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "10", LOGLEVEL);
 
     if (type == tjstJob)
       break;
@@ -846,7 +846,7 @@ static void req_stat_job_step2(
 
   if (pa != NULL)
     {
-    unlock_ai_mutex(pa, __func__, (char *)"1", LOGLEVEL);
+    unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
     }
  
   reply_send_svr(preq);
@@ -900,7 +900,7 @@ int stat_to_mom(
   job_momaddr = pjob->ji_qs.ji_un.ji_exect.ji_momaddr;
   job_momport = pjob->ji_qs.ji_un.ji_exect.ji_momport;
   job_momname = strdup(pjob->ji_wattr[JOB_ATR_exec_host].at_val.at_str);
-  unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
   if (job_momname == NULL)
     return PBSE_MEM_MALLOC;
@@ -937,14 +937,14 @@ int stat_to_mom(
       log_event(PBSEVENT_SYSTEM,PBS_EVENTCLASS_JOB,job_id,log_buf);
       }
 
-    unlock_node(node, __func__, (char *)"no rely mom", LOGLEVEL);
+    unlock_node(node, __func__, "no rely mom", LOGLEVEL);
     free_br(newrq);
 
     return PBSE_NORELYMOM;
     }
 
   /* get connection to MOM */
-  unlock_node(node, __func__, (char *)"before svr_connect", LOGLEVEL);
+  unlock_node(node, __func__, "before svr_connect", LOGLEVEL);
   handle = svr_connect(job_momaddr, job_momport, &rc, NULL, NULL, ToServerDIS);
 
   /* Unlock job here */
@@ -1027,7 +1027,7 @@ void stat_update(
 
         pjob->ji_momstat = time_now;
 
-        unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
         }
 
       pstatus = (struct brp_status *)GET_NEXT(pstatus->brp_stlink);
@@ -1142,7 +1142,7 @@ void poll_job_task(
     if (pjob != NULL)
       {
       job_state = pjob->ji_qs.ji_state;
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
       get_svr_attr_l(SRV_ATR_PollJobs, &poll_jobs);
       if ((poll_jobs) && (job_state == JOB_STATE_RUNNING))
         {
@@ -1386,9 +1386,9 @@ int get_numa_statuses(
     if (pn == NULL)
       continue;
 
-    lock_node(pn, __func__, (char *)NULL, LOGLEVEL);
+    lock_node(pn, __func__, NULL, LOGLEVEL);
     rc = status_node(pn, preq, bad, pstathd);
-    unlock_node(pn, __func__, (char *)NULL, LOGLEVEL);
+    unlock_node(pn, __func__, NULL, LOGLEVEL);
 
     if (rc != PBSE_NONE)
       {
@@ -1489,7 +1489,7 @@ int req_stat_node(
     else
       rc = get_numa_statuses(pnode, preq, &bad, &preply->brp_un.brp_status);
 
-    unlock_node(pnode, __func__, (char *)"type == 0", LOGLEVEL);
+    unlock_node(pnode, __func__, "type == 0", LOGLEVEL);
     }
   else
     {
@@ -1501,7 +1501,7 @@ int req_stat_node(
       if ((type == 2) && 
           (!hasprop(pnode, &props)))
         {
-        unlock_node(pnode, __func__, (char *)"type != 0, next_host", LOGLEVEL);
+        unlock_node(pnode, __func__, "type != 0, next_host", LOGLEVEL);
         continue;
         }
 
@@ -1513,11 +1513,11 @@ int req_stat_node(
       
       if (rc != PBSE_NONE)
         {
-        unlock_node(pnode, __func__, (char *)"type != 0, rc != 0, get_numa_statuses", LOGLEVEL);
+        unlock_node(pnode, __func__, "type != 0, rc != 0, get_numa_statuses", LOGLEVEL);
         break;
         }
 
-      unlock_node(pnode, __func__, (char *)"type != 0, rc == 0, get_numa_statuses", LOGLEVEL);
+      unlock_node(pnode, __func__, "type != 0, rc == 0, get_numa_statuses", LOGLEVEL);
       }
     }
 
@@ -1739,7 +1739,7 @@ static void update_state_ct(
   char          *buf)
 
   {
-  static char *statename[] = { "Transit", "Queued", "Held",
+  static const char *statename[] = { "Transit", "Queued", "Held",
                                "Waiting", "Running", "Exiting", "Complete"
                              };
   int  index;
diff --git a/src/server/req_track.c b/src/server/req_track.c
index c74bbd85d2..842842e46b 100644
--- a/src/server/req_track.c
+++ b/src/server/req_track.c
@@ -104,6 +104,7 @@
 #include "log.h"
 #include "../lib/Liblog/pbs_log.h"
 #include "../lib/Liblog/log_event.h"
+#include "../lib/Libifl/lib_ifl.h"
 #include "svr_task.h"
 
 /* External functions */
@@ -124,7 +125,7 @@ extern int           LOGLEVEL;
 
 int req_track(
 
-  void *vp)
+  struct batch_request *vp) /* I */
 
   {
   struct batch_request *preq = (struct batch_request *)vp;
@@ -202,7 +203,7 @@ int req_track(
 
       need = server.sv_tracksize * 3 / 2;
 
-      new_track = calloc(need, sizeof(struct tracking));
+      new_track = (struct tracking *)calloc(need, sizeof(struct tracking));
 
       if (new_track == NULL)
         {
@@ -269,7 +270,7 @@ void track_save(
 
   {
   int        fd;
-  char      *myid = "save_track";
+  const char *myid = "save_track";
   time_t     time_now = time(NULL);
   work_task *wt;
 
@@ -297,7 +298,7 @@ void track_save(
     return;
     }
 
-  if (write(fd, (char *)server.sv_track, server.sv_tracksize * sizeof(struct tracking)) !=
+  if (write_ac_socket(fd, (char *)server.sv_track, server.sv_tracksize * sizeof(struct tracking)) !=
       (ssize_t)(server.sv_tracksize * sizeof(struct tracking)))
     {
     log_err(errno, myid, (char *)"failed to write to track file");
diff --git a/src/server/resc_def_all.c b/src/server/resc_def_all.c
index fc1e058689..37e2377b97 100644
--- a/src/server/resc_def_all.c
+++ b/src/server/resc_def_all.c
@@ -115,7 +115,7 @@ extern struct server server;
 
 /* sync w/job_attr_def.c */
 
-int decode_nodes(struct pbs_attribute *, const char *, char *, char *, int);
+int decode_nodes(struct pbs_attribute *, const char *, const char *, const char *, int);
 int set_node_ct(resource *, pbs_attribute *, int actmode);
 int set_proc_ct(resource *, pbs_attribute *, int actmode);
 int set_tokens_nodect(struct pbs_attribute *attr, struct pbs_attribute *new_attr, enum batch_op actmode);
@@ -127,7 +127,6 @@ resource_def *svr_resc_def;
 
 resource_def svr_resc_def_const[] =
   {
-
     { "arch",    /* system architecture type */
     decode_str,
     encode_str,
@@ -612,7 +611,6 @@ resource_def svr_resc_def_const[] =
     READ_WRITE,
     ATR_TYPE_STR
   },
-
   /* Cray XT */
   { "size", decode_l, encode_l, set_l, comp_l, free_null, NULL_FUNC, READ_WRITE | ATR_DFLAG_MOM, ATR_TYPE_LONG },
   { "cpapartitionid", decode_str, encode_str, set_str, comp_str, free_str, NULL_FUNC, READ_WRITE, ATR_TYPE_STR },
@@ -772,7 +770,6 @@ resource_def svr_resc_def_const[] =
   /* the definition for the "unknown" resource MUST be last */
 
   { "|unknown|", decode_unkn, encode_unkn, set_unkn, comp_unkn, free_unkn, NULL_FUNC, READ_WRITE, ATR_TYPE_LIST }
-
   /* DO NOT ADD DEFINITIONS AFTER "unknown", ONLY BEFORE */
   };
 
@@ -801,7 +798,7 @@ int init_resc_defs(void)
   if (get_svr_attr_arst(SRV_ATR_ExtraResc, &resc_arst) == PBSE_NONE)
     {
 
-    tmpresc = calloc(resc_arst->as_usedptr + 1, sizeof(resource_def));
+    tmpresc = (resource_def *)calloc(resc_arst->as_usedptr + 1, sizeof(resource_def));
 
     if (tmpresc == NULL)
       {
@@ -885,12 +882,12 @@ int decode_nodes(
 
   pbs_attribute *patr,
   const char   *name,   /* pbs_attribute name */
-  char          *rescn,  /* resource name - unused here */
-  char          *val,    /* pbs_attribute value */
+  const char *rescn,  /* resource name - unused here */
+  const char    *val,    /* pbs_attribute value */
   int            perm)   /* replaces resc_access_perm */
 
   {
-  char *pc;
+  const char *pc;
 
   pc = val;
 
diff --git a/src/server/resc_def_all.h b/src/server/resc_def_all.h
index 80323f7a3f..1529014046 100644
--- a/src/server/resc_def_all.h
+++ b/src/server/resc_def_all.h
@@ -7,7 +7,7 @@
 
 int init_resc_defs(void);
 
-/* static int decode_nodes(pbs_attribute *patr, char *name, char *rescn, char *val, int perm); */
+/* static int decode_nodes(pbs_attribute *patr, char *name, const char *rescn, const char *val, int perm); */
 
 int ctnodes(char *spec);
 
diff --git a/src/server/run_sched.c b/src/server/run_sched.c
index 2300cc46df..0c01c354a0 100644
--- a/src/server/run_sched.c
+++ b/src/server/run_sched.c
@@ -93,6 +93,7 @@
 #include "sched_cmds.h"
 #include "pbs_error.h"
 #include "../lib/Libdis/lib_dis.h" /* DIS_tcp_setup */
+#include "../lib/Libifl/lib_ifl.h" /* get_port_from_server_name_file */
 #include "pbsd_main.h" /* process_pbs_server_port */
 #include "process_request.h" /*process_request */
 
@@ -280,14 +281,14 @@ int schedule_jobs(void)
       {
       /* Can not init thread attribute structure */
       perror("could not create listener thread for scheduler");
-      log_err(-1, __func__, (char *)"Failed to create listener thread for scheduler");
+      log_err(-1, __func__, "Failed to create listener thread for scheduler");
       }
     else if (pthread_attr_setdetachstate(&t_attr, PTHREAD_CREATE_DETACHED) != 0)
       {
       /* Can not set thread initial state as detached */
       pthread_attr_destroy(&t_attr);
       perror("could not detach listener thread for scheduler");
-      log_err(-1, __func__, (char *)"Failed to detach listener thread for scheduler");
+      log_err(-1, __func__, "Failed to detach listener thread for scheduler");
       }
     else
       {
@@ -298,7 +299,7 @@ int schedule_jobs(void)
    != 0)
         {
         perror("could not start listener thread for scheduler");
-        log_err(-1, __func__, (char *)"Failed to start listener thread for scheduler");
+        log_err(-1, __func__, "Failed to start listener thread for scheduler");
       return(-1);
         }
       }
@@ -543,7 +544,7 @@ static int put_4byte(
 
   un.unl = htonl(val);
 
-  amt = write(sock, (char *)(un.unc + sizeof(unsigned int) - 4), 4);
+  amt = write_ac_socket(sock, (char *)(un.unc + sizeof(unsigned int) - 4), 4);
 
   if (amt != 4)
     {
diff --git a/src/server/stat_job.c b/src/server/stat_job.c
index e2d86eb2b9..b70b8517be 100644
--- a/src/server/stat_job.c
+++ b/src/server/stat_job.c
@@ -152,7 +152,7 @@ int status_job(
     }
 
   /* allocate reply structure and fill in header portion */
-  if ((pstat = calloc(1, sizeof(struct brp_status))) == NULL)
+  if ((pstat = (struct brp_status *)calloc(1, sizeof(struct brp_status))) == NULL)
     {
     return(PBSE_SYSTEM);
     }
diff --git a/src/server/svr_attr_def.c b/src/server/svr_attr_def.c
index e438d2a185..366ac7f712 100644
--- a/src/server/svr_attr_def.c
+++ b/src/server/svr_attr_def.c
@@ -102,7 +102,7 @@ extern int poke_scheduler (pbs_attribute * pattr, void *pobject, int actmode);
 extern int encode_svrstate (pbs_attribute * pattr, tlist_head * phead,
 			    const char *aname, const char *rsname, int mode, int perm);
 
-extern int decode_rcost (pbs_attribute * patr, const char *name, char *rn, char *val, int perm);
+extern int decode_rcost (pbs_attribute * patr, const char *name, const char *rn, const char *val, int perm);
 extern int encode_rcost (pbs_attribute * attr, tlist_head * phead, const char *atname,
 			 const char *rsname, int mode, int perm);
 extern int set_rcost (pbs_attribute * attr, pbs_attribute * new_attr, enum batch_op);
diff --git a/src/server/svr_chk_owner.c b/src/server/svr_chk_owner.c
index 2571fc0dff..794cddfc5e 100644
--- a/src/server/svr_chk_owner.c
+++ b/src/server/svr_chk_owner.c
@@ -575,7 +575,7 @@ void chk_job_req_permissions(
 
     req_reject(PBSE_PERM, 0, preq, NULL, "operation not permitted");
 
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
     *pjob_ptr = NULL;
     }
@@ -608,7 +608,7 @@ void chk_job_req_permissions(
 
         req_reject(PBSE_BADSTATE, 0, preq, NULL, tmpLine);
 
-        unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
 
         *pjob_ptr = NULL;
 
diff --git a/src/server/svr_connect.c b/src/server/svr_connect.c
index 91446ba730..8ae6611e40 100644
--- a/src/server/svr_connect.c
+++ b/src/server/svr_connect.c
@@ -533,7 +533,7 @@ char *parse_servername(
 
   buf[i] = '\0';
 
-  val = calloc(1, strlen(buf) + 1);
+  val = (char *)calloc(1, strlen(buf) + 1);
   strcpy(val,buf);
 
   return(val);
diff --git a/src/server/svr_format_job.c b/src/server/svr_format_job.c
index c57b81549a..8d03cdb3a7 100644
--- a/src/server/svr_format_job.c
+++ b/src/server/svr_format_job.c
@@ -33,14 +33,14 @@ extern char *msg_job_otherfail;
 
 void svr_format_job(
      
-  FILE      *fh,  /* output file handle */
-  mail_info *mi,  /* I */
-  char      *fmt) /* printf-like format description */
+  FILE        *fh,  /* output file handle */
+  mail_info   *mi,  /* I */
+  const char *fmt) /* printf-like format description */
 
   {
   int   mailpoint = mi->mail_point;
   char *text = mi->text;
-  char *p;
+  const char *p;
   char *stdmessage = NULL;
   char *reason = NULL;
   
diff --git a/src/server/svr_format_job.h b/src/server/svr_format_job.h
index 64736e5f62..4af490da9b 100644
--- a/src/server/svr_format_job.h
+++ b/src/server/svr_format_job.h
@@ -4,6 +4,6 @@
 #include <stdio.h> /* FILE */
 #include "server.h" /* mail_info */
 
-void svr_format_job(FILE *fh, mail_info *mi, char *fmt);
+void svr_format_job(FILE *fh, mail_info *mi, const char *fmt);
 
 #endif /* _SVR_FORMAT_JOB_H */
diff --git a/src/server/svr_func.c b/src/server/svr_func.c
index eaf3e56db0..131c11f006 100644
--- a/src/server/svr_func.c
+++ b/src/server/svr_func.c
@@ -113,9 +113,9 @@ extern int              listener_command;
 /*
  * the following array of strings is used in decoding/encoding the server state
  */
-static char *svr_idle   = "Idle";
-static char *svr_sched  = "Scheduling";
-static char *svr_state_names[] =
+static const char *svr_idle   = "Idle";
+static const char *svr_sched  = "Scheduling";
+static const char *svr_state_names[] =
   {
   "",   /* SV_STATE_DOWN */
   "",   /* SV_STATE_INIT */
@@ -146,7 +146,7 @@ int encode_svrstate(
 
   {
   svrattrl *pal;
-  char *psname;
+  const char *psname;
 
   if (pattr == NULL)
     {
@@ -244,7 +244,7 @@ void set_resc_assigned(
         pque->qu_qs.qu_name);
       log_err(-1, __func__, log_buf);
     
-      unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+      unlock_queue(pque, __func__, NULL, LOGLEVEL);
       return;
       }
   
@@ -252,7 +252,7 @@ void set_resc_assigned(
       {
       if (pjob->ji_qs.ji_svrflags & JOB_SVFLG_RescAssn)
         {
-        unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+        unlock_queue(pque, __func__, NULL, LOGLEVEL);
         return;  /* already added in */
         }
       
@@ -262,7 +262,7 @@ void set_resc_assigned(
       {
       if ((pjob->ji_qs.ji_svrflags & JOB_SVFLG_RescAssn) == 0)
         {
-        unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+        unlock_queue(pque, __func__, NULL, LOGLEVEL);
         return;  /* not currently included */
         }
       
@@ -270,7 +270,7 @@ void set_resc_assigned(
       }
     else
       {
-      unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+      unlock_queue(pque, __func__, NULL, LOGLEVEL);
       return;   /* invalid op */
       }
     
@@ -298,7 +298,7 @@ void set_resc_assigned(
 
           if (pr == NULL)
             {
-            unlock_queue(pque, __func__, (char *)"sysru", LOGLEVEL);
+            unlock_queue(pque, __func__, "sysru", LOGLEVEL);
             return;
             }
           }
@@ -315,7 +315,7 @@ void set_resc_assigned(
 
           if (pr == NULL)
             {
-            unlock_queue(pque, __func__, (char *)"queru", LOGLEVEL);
+            unlock_queue(pque, __func__, "queru", LOGLEVEL);
             return;
             }
           }
@@ -326,7 +326,7 @@ void set_resc_assigned(
       jobrsc = (resource *)GET_NEXT(jobrsc->rs_link);
       }  /* END while (jobrsc != NULL) */
 
-    unlock_queue(pque, __func__, (char *)"success", LOGLEVEL);
+    unlock_queue(pque, __func__, "success", LOGLEVEL);
     }
   else if (pjob == NULL)
     {
@@ -422,7 +422,7 @@ int ck_checkpoint(
  * and queue ) attributes.  It just returns 0.
  */
 
-int decode_null(pbs_attribute *patr, const char *name, char *rn, char *val, int perm)
+int decode_null(pbs_attribute *patr, const char *name, const char *rn, const char *val, int perm)
   {
   return 0;
   }
diff --git a/src/server/svr_func.h b/src/server/svr_func.h
index 7b86e7ea26..813cd54dd6 100644
--- a/src/server/svr_func.h
+++ b/src/server/svr_func.h
@@ -12,7 +12,7 @@ void set_resc_assigned(job *pjob, enum batch_op op);
 
 int ck_checkpoint(pbs_attribute *pattr, void *pobject, int mode);
 
-int decode_null(pbs_attribute *patr, const char *name, char *rn, char *val, int perm);
+int decode_null(pbs_attribute *patr, const char *name, const char *rn, const char *val, int perm);
 
 int set_null(pbs_attribute *pattr, pbs_attribute *new_attr, enum batch_op op);
 
diff --git a/src/server/svr_jobfunc.c b/src/server/svr_jobfunc.c
index 8425402536..1a9a72403e 100644
--- a/src/server/svr_jobfunc.c
+++ b/src/server/svr_jobfunc.c
@@ -123,9 +123,9 @@
 #include "resource.h"
 #include "server.h"
 #include "queue.h"
+#include "dynamic_string.h"
 #include "pbs_job.h"
 #include "work_task.h"
-#include "svr_task.h"
 #include "pbs_error.h"
 #include "log.h"
 #include "../lib/Liblog/pbs_log.h"
@@ -147,8 +147,9 @@
 
 /* Private Functions */
 
-void default_std(job *, int key, dynamic_string *ds);
-void eval_checkpoint(pbs_attribute *j, pbs_attribute *q);
+static void default_std(job *, int key, dynamic_string *ds);
+static void eval_checkpoint(pbs_attribute *j, pbs_attribute *q);
+static int count_queued_jobs(pbs_queue *pque, char *user);
 
 /* Global Data Items: */
 
@@ -183,7 +184,7 @@ extern int procs_requested(char *spec);
 /* Private Functions */
 
 #ifndef NDEBUG
-void correct_ct();
+static void correct_ct();
 #endif  /* NDEBUG */
 
 /* sync w/#define JOB_STATE_XXX */
@@ -287,7 +288,7 @@ const char *PJobSubState[] =
 
 
 
-int insert_into_alljobs_by_rank(
+static int insert_into_alljobs_by_rank(
 
   struct all_jobs *aj,
   job             *pjob,
@@ -299,7 +300,7 @@ int insert_into_alljobs_by_rank(
   long  job_qrank = pjob->ji_wattr[JOB_ATR_qrank].at_val.at_long;
   int   index = -1;
   
-  unlock_ji_mutex(pjob, __func__, (char *)"4", LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, "4", LOGLEVEL);
 
   while ((pjcur = next_job_from_back(aj, &iter)) != NULL)
     {
@@ -310,17 +311,17 @@ int insert_into_alljobs_by_rank(
     
     if (strcmp(jobid, pjcur->ji_qs.ji_jobid) == 0)
       {
-      unlock_ji_mutex(pjcur, __func__, (char *)"6", LOGLEVEL);
+      unlock_ji_mutex(pjcur, __func__, "6", LOGLEVEL);
       return(ALREADY_IN_LIST);
       }
 
-    unlock_ji_mutex(pjcur, __func__, (char *)"7", LOGLEVEL);
+    unlock_ji_mutex(pjcur, __func__, "7", LOGLEVEL);
     }
 
   if (pjcur != NULL)
     {
     index = get_jobs_index(aj, pjcur);
-    unlock_ji_mutex(pjcur, __func__, (char *)"8", LOGLEVEL);
+    unlock_ji_mutex(pjcur, __func__, "8", LOGLEVEL);
     pjcur = NULL;
     }
 
@@ -359,7 +360,7 @@ int svr_enquejob(
   pbs_attribute *pattrjb;
   attribute_def *pdef;
   pbs_queue     *pque;
-  int            rc;
+  int            rc = -1;
   char           log_buf[LOCAL_LOG_BUF_SIZE];
   time_t         time_now = time(NULL);
   char           job_id[PBS_MAXSVRJOBID+1];
@@ -368,11 +369,17 @@ int svr_enquejob(
   int            user_jobs = 0;
   int            array_jobs = 0;
 
+  if (pjob == NULL)
+    {
+    log_err(rc, __func__, "NULL job pointer input");
+    return(rc);
+    }
+
   /* make sure queue is still there, there exists a small window ... */
   strcpy(job_id, pjob->ji_qs.ji_jobid);
   /* ji_qs.ji_queue now holds the name of the destination queue */
   strcpy(queue_name, pjob->ji_qs.ji_queue);
-  unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
   pque = find_queuebyname(queue_name);
 
   if (pque == NULL)
@@ -382,12 +389,12 @@ int svr_enquejob(
 
   /* This is called when a job is not yet in the queue,
    * so svr_find_job can not be used.... */
-  lock_ji_mutex(pjob, __func__, (char *)NULL, LOGLEVEL);
+  lock_ji_mutex(pjob, __func__, NULL, LOGLEVEL);
 
   if (pjob->ji_being_recycled == TRUE)
     {
-    unlock_queue(pque, __func__, (char *)NULL, 0);
-    unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+    unlock_queue(pque, __func__, NULL, 0);
+    unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
     return(PBSE_JOB_RECYCLED);
     }
 
@@ -404,8 +411,8 @@ int svr_enquejob(
     total_jobs = count_queued_jobs(pque, NULL);
     if (total_jobs + array_jobs >= pque->qu_attr[QA_ATR_MaxJobs].at_val.at_long)
       {
-      unlock_queue(pque, __func__, (char *)"1", LOGLEVEL);
-      unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+      unlock_queue(pque, __func__, "1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
       return(PBSE_MAXQUED);
       }
     }
@@ -416,8 +423,8 @@ int svr_enquejob(
     user_jobs = count_queued_jobs(pque, pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str);
     if (user_jobs >= pque->qu_attr[QA_ATR_MaxUserJobs].at_val.at_long)
       {
-      unlock_queue(pque, __func__, (char *)"1", LOGLEVEL);
-      unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+      unlock_queue(pque, __func__, "1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
       return(PBSE_MAXUSERQUED);
       }
     }
@@ -442,7 +449,9 @@ int svr_enquejob(
       insert_job_after_index(&alljobs, prev_job_index, pjob);
 
     if (has_sv_qs_mutex == FALSE)
+      {
       lock_sv_qs_mutex(server.sv_qs_mutex, __func__);
+      }
 
     server.sv_qs.sv_numjobs++;
     
@@ -477,9 +486,11 @@ int svr_enquejob(
     if ((rc == ALREADY_IN_LIST) ||
         (rc == PBSE_JOBNOTFOUND))
       {
-      unlock_queue(pque, __func__, (char *)"not array_template check", LOGLEVEL);
+      unlock_queue(pque, __func__, "not array_template check", LOGLEVEL);
       if (rc == ALREADY_IN_LIST)
+        {
         rc = PBSE_NONE;
+        }
 
       return(rc);
       }
@@ -500,7 +511,7 @@ int svr_enquejob(
     if ((rc == ALREADY_IN_LIST) ||
         (rc == PBSE_JOBNOTFOUND))
       {
-      unlock_queue(pque, __func__, (char *)"not array_template check", LOGLEVEL);
+      unlock_queue(pque, __func__, "not array_template check", LOGLEVEL);
       if (rc == ALREADY_IN_LIST)
         rc = PBSE_NONE;
 
@@ -568,7 +579,7 @@ int svr_enquejob(
       &pque->qu_attr[QE_ATR_checkpoint_min]);
 
     /* do anything needed doing regarding job dependencies */
-    unlock_queue(pque, __func__, (char *)"anything", LOGLEVEL);
+    unlock_queue(pque, __func__, "anything", LOGLEVEL);
 
     if ((pjob->ji_qs.ji_state != JOB_STATE_COMPLETE) && 
         (pjob->ji_qs.ji_substate != JOB_SUBSTATE_COMPLETE) && 
@@ -607,10 +618,10 @@ int svr_enquejob(
     /* must be set to 1 so that routing is attempted */
     pjob->ji_qs.ji_un.ji_routet.ji_rteretry = 1;
     
-    unlock_queue(pque, __func__, (char *)"route job", LOGLEVEL);
+    unlock_queue(pque, __func__, "route job", LOGLEVEL);
     }
   else
-    unlock_queue(pque, __func__, (char *)"pull queue", LOGLEVEL);
+    unlock_queue(pque, __func__, "pull queue", LOGLEVEL);
 
   return(PBSE_NONE);
   }  /* END svr_enquejob() */
@@ -648,7 +659,7 @@ int svr_dequejob(
     if ((pjob == NULL) ||
         (pque == NULL))
       {
-      log_err(PBSE_JOBNOTFOUND, __func__, (char *)"Job lost while acquiring queue 10");
+      log_err(PBSE_JOBNOTFOUND, __func__, "Job lost while acquiring queue 10");
       return(PBSE_JOBNOTFOUND);
       }
     }
@@ -696,7 +707,7 @@ int svr_dequejob(
     pjob->ji_qhdr = NULL;
 
     if (parent_queue_mutex_held == FALSE)
-      unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+      unlock_queue(pque, __func__, NULL, LOGLEVEL);
     }
 
 #ifndef NDEBUG
@@ -715,12 +726,12 @@ int svr_dequejob(
     strcpy(job_id, pjob->ji_qs.ji_jobid);
 
     /* this function will lock queues and jobs */
-    unlock_ji_mutex(pjob, __func__, (char *)NULL, 0);
+    unlock_ji_mutex(pjob, __func__, NULL, 0);
 
     if (parent_queue_mutex_held == TRUE)
       {
       strcpy(queue_name, pque->qu_qs.qu_name);
-      unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+      unlock_queue(pque, __func__, NULL, LOGLEVEL);
       }
 
     correct_ct();
@@ -823,6 +834,12 @@ int svr_setjobstate(
   char         log_buf[LOCAL_LOG_BUF_SIZE];
   time_t       time_now = time(NULL);
 
+  if (pjob == NULL)
+    {
+    log_err(PBSE_BAD_PARAMETER, __func__, "NULL input job pointer");
+    return(PBSE_BAD_PARAMETER);
+    }
+
   if (LOGLEVEL >= 2)
     {
     sprintf(log_buf, "%s: setting job %s state from %s-%s to %s-%s (%d-%d)\n",
@@ -873,7 +890,7 @@ int svr_setjobstate(
 
         if (pjob == NULL)
           {
-          log_err(PBSE_JOBNOTFOUND, __func__, (char *)"Job lost while acquiring queue 11");
+          log_err(PBSE_JOBNOTFOUND, __func__, "Job lost while acquiring queue 11");
           return(PBSE_JOBNOTFOUND);
           }
         }
@@ -918,7 +935,7 @@ int svr_setjobstate(
           }
 
         if (has_queue_mutex == FALSE)
-          unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+          unlock_queue(pque, __func__, NULL, LOGLEVEL);
         }
       }
     }    /* END if (pjob->ji_qs.ji_substate != JOB_SUBSTATE_TRANSICM) */
@@ -967,6 +984,22 @@ void svr_evaljobstate(
   int  forceeval)
 
   {
+  if (pjob == NULL)
+    {
+    log_err(PBSE_BAD_PARAMETER, __func__, "NULL input job pointer");
+    return;
+    }
+  if (newstate == NULL)
+    {
+    log_err(PBSE_BAD_PARAMETER, __func__, "NULL input newstate pointer");
+    return;
+    }
+  if (newsub == NULL)
+    {
+    log_err(PBSE_BAD_PARAMETER, __func__, "NULL input newsub pointer");
+    return;
+    }
+
   if ((forceeval == 0) &&
       ((pjob->ji_qs.ji_state == JOB_STATE_RUNNING) ||
        (pjob->ji_qs.ji_state == JOB_STATE_TRANSIT)))
@@ -1054,7 +1087,7 @@ char *get_variable(
  * Returns: pointer to struct resource or NULL
  */
 
-resource *get_resource(
+static resource *get_resource(
 
   pbs_attribute *p_queattr,  /* I */
   pbs_attribute *p_svrattr,  /* I */
@@ -1098,7 +1131,7 @@ resource *get_resource(
  * does not make use of comp_resc_eq or comp_resc_nc
  */
 
-int chk_svr_resc_limit(
+static int chk_svr_resc_limit(
 
   pbs_attribute *jobatr, /* I */
   pbs_queue     *pque,   /* I */
@@ -1143,12 +1176,12 @@ int chk_svr_resc_limit(
   if (EMsg != NULL)
     EMsg[0] = '\0';
 
-  noderesc     = (resource_def *)find_resc_def(svr_resc_def, "nodes",     svr_resc_size);
-  needresc     = (resource_def *)find_resc_def(svr_resc_def, "neednodes", svr_resc_size);
-  nodectresc   = (resource_def *)find_resc_def(svr_resc_def, "nodect",    svr_resc_size);
-  mppwidthresc = (resource_def *)find_resc_def(svr_resc_def, "mppwidth",  svr_resc_size);
-  mppnppn      = (resource_def *)find_resc_def(svr_resc_def, "mppnppn",   svr_resc_size);
-  procresc     = (resource_def *)find_resc_def(svr_resc_def, "procs",   svr_resc_size);
+  noderesc     = find_resc_def(svr_resc_def, "nodes",     svr_resc_size);
+  needresc     = find_resc_def(svr_resc_def, "neednodes", svr_resc_size);
+  nodectresc   = find_resc_def(svr_resc_def, "nodect",    svr_resc_size);
+  mppwidthresc = find_resc_def(svr_resc_def, "mppwidth",  svr_resc_size);
+  mppnppn      = find_resc_def(svr_resc_def, "mppnppn",   svr_resc_size);
+  procresc     = find_resc_def(svr_resc_def, "procs",   svr_resc_size);
   
   SvrNodeCt = 0;
   
@@ -1192,7 +1225,7 @@ int chk_svr_resc_limit(
       {
       qurc = find_resc_entry(&pque->qu_attr[QA_ATR_ResourceMax], jbrc->rs_defin);
 
-      LimitName = (jbrc->rs_defin->rs_name == NULL)?(char *)"resource":jbrc->rs_defin->rs_name;
+      LimitName = (jbrc->rs_defin->rs_name == NULL)?"resource":jbrc->rs_defin->rs_name;
 
       pthread_mutex_lock(server.sv_attr_mutex);
       cmpwith = get_resource(&pque->qu_attr[QA_ATR_ResourceMax],
@@ -1541,7 +1574,7 @@ int chk_svr_resc_limit(
  * @return the number of jobs, or -1 on error
  */
 
-int count_queued_jobs(
+static int count_queued_jobs(
 
   pbs_queue *pque, /* I */
   char      *user) /* I */
@@ -1578,6 +1611,17 @@ int chk_resc_limits(
   int resc_lt;
   int resc_gt;
 
+  if (pattr == NULL)
+    {
+    log_err(PBSE_BAD_PARAMETER, __func__, "NULL input pbs_attribute pointer");
+    return(PBSE_BAD_PARAMETER);
+    }
+  if (pque == NULL)
+    {
+    log_err(PBSE_BAD_PARAMETER, __func__, "NULL input pbs_queue pointer");
+    return(PBSE_BAD_PARAMETER);
+    }
+
   if (EMsg != NULL)
     EMsg[0] = '\0';
 
@@ -1615,481 +1659,666 @@ int chk_resc_limits(
 
 
 
+static int check_execution_uid_and_gid(
 
-/*
- * svr_chkque - check if job can enter a queue
- *
- * returns 0 for yes, 1 for no
- *
- * NOTE: the following fields must be set in the job struture before
- *   calling svr_chkque():  ji_wattr[JOB_ATR_job_owner]
- * NOTE: calls chk_resc_limits() to validate resource request
- *
- * Also if the job is being considered for an execution queue, then
- * set_jobexid() will be called.
- */
-
-int svr_chkque(
-
-  job       *pjob,
-  pbs_queue *pque,
-  char      *hostname,
-  int        mtype,     /* MOVE_TYPE_* type, see server_limits.h */
-  char      *EMsg)      /* O (optional,minsize=1024) */
-
+    struct job *const pjob,
+    char       *const EMsg)
   {
-  int i;
-  int failed_group_acl = 0;
-  int failed_user_acl  = 0;
-  int user_jobs;
-  int total_jobs;
-
-  struct array_strings *pas;
-  int j = 0;
-  char jobid[PBS_MAXSVRJOBID+1];
-
-  strcpy(jobid, pjob->ji_qs.ji_jobid);
-
-  if (EMsg != NULL)
-    EMsg[0] = '\0';
-
-  /*
-   * 1. If the queue is an Execution queue ...
-   *    This is checked first because 1a - 1c are more damaging
-   *    (see local_move() in svr_movejob.c)
-   */
+  int return_code = PBSE_NONE; /* Optimistic assumption */
 
-  if (pque->qu_qs.qu_type == QTYPE_Execution)
+  if (!(pjob->ji_wattr[JOB_ATR_euser].at_flags & ATR_VFLAG_SET) ||
+      !(pjob->ji_wattr[JOB_ATR_egroup].at_flags & ATR_VFLAG_SET))
     {
-    /* 1a. if not already set, set up execution uid/gid/name */
-
-    if (!(pjob->ji_wattr[JOB_ATR_euser].at_flags & ATR_VFLAG_SET) ||
-        !(pjob->ji_wattr[JOB_ATR_egroup].at_flags & ATR_VFLAG_SET))
-      {
-      if ((i = set_jobexid(pjob, pjob->ji_wattr, EMsg)) != 0)
-        {
-        return(i);  /* PBSE_BADUSER or GRP */
-        }
-      }
-
-    /* 1b. check site restrictions -- Currently site_acl_check is a stub */
-
-    if (site_acl_check(pjob, pque))
-      {
-      if (EMsg) 
-        snprintf(EMsg, 1024,
-          "site_acl_check() failed: user %s, queue %s",
-          pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
-          pque->qu_qs.qu_name);
-
-      return(PBSE_PERM);
-      }
-
-    /* 1c. cannot have an unknown resource */
+    return_code = set_jobexid(pjob, pjob->ji_wattr, EMsg); /* PBSE_BADUSER or GRP */
+    }
 
-    if (find_resc_entry(
-          &pjob->ji_wattr[JOB_ATR_resource],
-          &svr_resc_def[svr_resc_size - 1]) != 0)
-      {
-      if (EMsg) 
-        {
-        snprintf(EMsg, 1024,
-          "detected request for an unknown resource");
-        }
+  return(return_code);
+  }
 
-      return(PBSE_UNKRESC);
-      }
+static int check_queue_disallowed_types(
 
-    /* 1d. cannot have an unknown pbs_attribute */
+    struct job       *const pjob,
+    struct pbs_queue *const pque,
+    char             *const EMsg)
+  {
+  int return_code = PBSE_NONE; /* Optimistic assumption */
+  int i = 0;
 
-    if (pjob->ji_wattr[JOB_ATR_UNKN].at_flags & ATR_VFLAG_SET)
+  if (pque->qu_attr[QA_ATR_DisallowedTypes].at_flags & ATR_VFLAG_SET)
+    {
+    for (i = 0;
+         i < (pque->qu_attr[QA_ATR_DisallowedTypes]).at_val.at_arst->as_usedptr;
+         i++)
       {
-      if (EMsg) 
-        snprintf(EMsg, 1024,
-          "detected presence of an unknown attribute");
-
-      return(PBSE_NOATTR);
-      }
+      /* if job is interactive...*/
 
-    /* 1e. check queue's disallowed_types */
-
-    if (pque->qu_attr[QA_ATR_DisallowedTypes].at_flags & ATR_VFLAG_SET)
-      {
-      for (i = 0;
-           i < (pque->qu_attr[QA_ATR_DisallowedTypes]).at_val.at_arst->as_usedptr;
-           i++)
+      if ((pjob->ji_wattr[JOB_ATR_interactive].at_flags & ATR_VFLAG_SET) &&
+          (pjob->ji_wattr[JOB_ATR_interactive].at_val.at_long > 0))
         {
-        /* if job is interactive...*/
-
-        if ((pjob->ji_wattr[JOB_ATR_interactive].at_flags & ATR_VFLAG_SET) &&
-            (pjob->ji_wattr[JOB_ATR_interactive].at_val.at_long > 0))
+        if (pque->qu_attr[QA_ATR_DisallowedTypes].at_val.at_arst != NULL)
           {
-          if (pque->qu_attr[QA_ATR_DisallowedTypes].at_val.at_arst != NULL)
-            {
-            if (strcmp(Q_DT_interactive,
-                       pque->qu_attr[QA_ATR_DisallowedTypes].at_val.at_arst->as_string[i]) == 0)
-              {
-              if (EMsg) 
-                snprintf(EMsg, 1024,
-                  "interactive job is not allowed for queue: user %s, queue %s",
-                  pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
-                  pque->qu_qs.qu_name);
-
-              return(PBSE_NOINTERACTIVE);
-              }
-            }
-          }
-        else /* else job is batch... */
-          {
-          if (strcmp(Q_DT_batch,
+          if (strcmp(Q_DT_interactive,
                      pque->qu_attr[QA_ATR_DisallowedTypes].at_val.at_arst->as_string[i]) == 0)
             {
-            if (EMsg) 
+            if (EMsg)
               snprintf(EMsg, 1024,
-                "batch job is not allowed for queue: user %s, queue %s",
+                "interactive job is not allowed for queue: user %s, queue %s",
                 pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
                 pque->qu_qs.qu_name);
 
-            return(PBSE_NOBATCH);
+            return(PBSE_NOINTERACTIVE);
             }
           }
-
-        if (strcmp(Q_DT_rerunable,
-                   pque->qu_attr[QA_ATR_DisallowedTypes].at_val.at_arst->as_string[i]) == 0
-            && (pjob->ji_wattr[JOB_ATR_rerunable].at_flags & ATR_VFLAG_SET &&
-                pjob->ji_wattr[JOB_ATR_rerunable].at_val.at_long > 0))
-          {
-          if (EMsg) 
-            snprintf(EMsg, 1024,
-              "rerunable job is not allowed for queue: user %s, queue %s",
-              pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
-              pque->qu_qs.qu_name);
-
-          return(PBSE_NORERUNABLE);
-          }
-
-        if (strcmp(Q_DT_nonrerunable,
-                   pque->qu_attr[QA_ATR_DisallowedTypes].at_val.at_arst->as_string[i]) == 0
-            && (!(pjob->ji_wattr[JOB_ATR_rerunable].at_flags & ATR_VFLAG_SET) ||
-                pjob->ji_wattr[JOB_ATR_rerunable].at_val.at_long == 0))
-          {
-          if (EMsg) 
-            snprintf(EMsg, 1024,
-              "only rerunable jobs are allowed for queue: user %s, queue %s",
-              pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
-              pque->qu_qs.qu_name);
-
-          return(PBSE_NONONRERUNABLE);
-          }
-        if (strcmp(Q_DT_fault_tolerant,
-                   pque->qu_attr[QA_ATR_DisallowedTypes].at_val.at_arst->as_string[i]) == 0
-            && ((pjob->ji_wattr[JOB_ATR_fault_tolerant].at_flags & ATR_VFLAG_SET) &&
-                pjob->ji_wattr[JOB_ATR_fault_tolerant].at_val.at_long != 0))
-          {
-          if (EMsg)
-            snprintf(EMsg, 1024,
-              "fault_tolerant jobs are not allowed for queue: user %s, queue %s",
-              pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
-              pque->qu_qs.qu_name);
-
-          return(PBSE_NOFAULTTOLERANT);
-          }
-          
-        if (strcmp(Q_DT_fault_intolerant,
-                   pque->qu_attr[QA_ATR_DisallowedTypes].at_val.at_arst->as_string[i]) == 0
-            && (!(pjob->ji_wattr[JOB_ATR_fault_tolerant].at_flags & ATR_VFLAG_SET) ||
-                pjob->ji_wattr[JOB_ATR_fault_tolerant].at_val.at_long == 0))
+        }
+      else /* else job is batch... */
+        {
+        if (strcmp(Q_DT_batch,
+                   pque->qu_attr[QA_ATR_DisallowedTypes].at_val.at_arst->as_string[i]) == 0)
           {
           if (EMsg)
             snprintf(EMsg, 1024,
-              "only fault_tolerant jobs are allowed for queue: user %s, queue %s",
+              "batch job is not allowed for queue: user %s, queue %s",
               pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
               pque->qu_qs.qu_name);
 
-          return(PBSE_NOFAULTINTOLERANT);
-          }
-        if (strcmp(Q_DT_job_array,
-                   pque->qu_attr[QA_ATR_DisallowedTypes].at_val.at_arst->as_string[i]) == 0
-            && (pjob->ji_wattr[JOB_ATR_job_array_request].at_flags & ATR_VFLAG_SET))
-          {
-          if (EMsg)
-            snprintf(EMsg, 1024,
-              "job arrays are not allowed for queue: queue %s",
-              pque->qu_qs.qu_name);
-          return(PBSE_NOJOBARRAYS);
+          return(PBSE_NOBATCH);
           }
-          
         }
-      }    /* END if (pque->qu_attr[QA_ATR_DisallowedTypes].at_flags & ATR_VFLAG_SET) */
-
-    /* 1f. if enabled, check the queue's group ACL */
 
-    if (pque->qu_attr[QA_ATR_AclGroupEnabled].at_val.at_long)
-      {
-      int rc;
-      int slpygrp;
+      if (strcmp(Q_DT_rerunable,
+                 pque->qu_attr[QA_ATR_DisallowedTypes].at_val.at_arst->as_string[i]) == 0
+          && (pjob->ji_wattr[JOB_ATR_rerunable].at_flags & ATR_VFLAG_SET &&
+              pjob->ji_wattr[JOB_ATR_rerunable].at_val.at_long > 0))
+        {
+        if (EMsg)
+          snprintf(EMsg, 1024,
+            "rerunable job is not allowed for queue: user %s, queue %s",
+            pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
+            pque->qu_qs.qu_name);
 
-      pthread_mutex_lock(server.sv_attr_mutex);
-      slpygrp = attr_ifelse_long(
-        &pque->qu_attr[QA_ATR_AclGroupSloppy],
-        &server.sv_attr[SRV_ATR_AclGroupSloppy],
-        0);
-      pthread_mutex_unlock(server.sv_attr_mutex);
+        return(PBSE_NORERUNABLE);
+        }
 
-      rc = acl_check(
-             &pque->qu_attr[QA_ATR_AclGroup],
-             pjob->ji_wattr[JOB_ATR_egroup].at_val.at_str,
-             ACL_Group);
+      if (strcmp(Q_DT_nonrerunable,
+                 pque->qu_attr[QA_ATR_DisallowedTypes].at_val.at_arst->as_string[i]) == 0
+          && (!(pjob->ji_wattr[JOB_ATR_rerunable].at_flags & ATR_VFLAG_SET) ||
+              pjob->ji_wattr[JOB_ATR_rerunable].at_val.at_long == 0))
+        {
+        if (EMsg)
+          snprintf(EMsg, 1024,
+            "only rerunable jobs are allowed for queue: user %s, queue %s",
+            pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
+            pque->qu_qs.qu_name);
 
-      if ((rc == 0) && slpygrp)
+        return(PBSE_NONONRERUNABLE);
+        }
+      if (strcmp(Q_DT_fault_tolerant,
+                 pque->qu_attr[QA_ATR_DisallowedTypes].at_val.at_arst->as_string[i]) == 0
+          && ((pjob->ji_wattr[JOB_ATR_fault_tolerant].at_flags & ATR_VFLAG_SET) &&
+              pjob->ji_wattr[JOB_ATR_fault_tolerant].at_val.at_long != 0))
         {
-        /* try again looking at the gids */
+        if (EMsg)
+          snprintf(EMsg, 1024,
+            "fault_tolerant jobs are not allowed for queue: user %s, queue %s",
+            pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
+            pque->qu_qs.qu_name);
 
-        rc = acl_check(
-               &pque->qu_attr[QA_ATR_AclGroup],
-               pjob->ji_wattr[JOB_ATR_egroup].at_val.at_str,
-               ACL_Gid);
+        return(PBSE_NOFAULTTOLERANT);
         }
 
-      if ((rc == 0) && slpygrp &&
-          (!(pjob->ji_wattr[JOB_ATR_grouplst].at_flags & ATR_VFLAG_SET)))
+      if (strcmp(Q_DT_fault_intolerant,
+                 pque->qu_attr[QA_ATR_DisallowedTypes].at_val.at_arst->as_string[i]) == 0
+          && (!(pjob->ji_wattr[JOB_ATR_fault_tolerant].at_flags & ATR_VFLAG_SET) ||
+              pjob->ji_wattr[JOB_ATR_fault_tolerant].at_val.at_long == 0))
         {
-        /* check group acl against all accessible groups */
+        if (EMsg)
+          snprintf(EMsg, 1024,
+            "only fault_tolerant jobs are allowed for queue: user %s, queue %s",
+            pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
+            pque->qu_qs.qu_name);
 
-        struct group *grp;
-        int i;
+        return(PBSE_NOFAULTINTOLERANT);
+        }
+      if (strcmp(Q_DT_job_array,
+                 pque->qu_attr[QA_ATR_DisallowedTypes].at_val.at_arst->as_string[i]) == 0
+          && (pjob->ji_wattr[JOB_ATR_job_array_request].at_flags & ATR_VFLAG_SET))
+        {
+        if (EMsg)
+          snprintf(EMsg, 1024,
+            "job arrays are not allowed for queue: queue %s",
+            pque->qu_qs.qu_name);
+        return(PBSE_NOJOBARRAYS);
+        }
 
-        char uname[PBS_MAXUSER + 1];
+      }
+    }
 
-        snprintf(uname, sizeof(uname), "%s", pjob->ji_wattr[JOB_ATR_euser].at_val.at_str);
+  return(return_code);
+  }
 
-        /* fetch the groups in the ACL and look for matching user membership */
+/* Special return constant for check_queue_group_ACL function */
+static const int FAILED_GROUP_ACL = -1;
+static int check_queue_group_ACL(
 
-        pas = pque->qu_attr[QA_ATR_AclGroup].at_val.at_arst;
+    struct job       *const pjob,
+    struct pbs_queue *const pque,
+    const int               mtype, /* MOVE_TYPE_* type, see server_limits.h */
+    char             *const EMsg)
+  {
+  int return_code = PBSE_NONE; /* Optimistic assumption */
 
-        for (i = 0; pas != NULL && i < pas->as_usedptr;i++)
-          {
-          if ((grp = getgrnam(pas->as_string[i])) == NULL)
-            continue;
+  if (pque->qu_attr[QA_ATR_AclGroupEnabled].at_val.at_long)
+    {
+    int rc;
+    int slpygrp;
+    struct array_strings *pas;
 
-          for (j = 0;grp->gr_mem[j] != NULL;j++)
-            {
-            if (!strcmp(grp->gr_mem[j], uname))
-              {
-              rc = 1;
+    pthread_mutex_lock(server.sv_attr_mutex);
+    slpygrp = attr_ifelse_long(
+      &pque->qu_attr[QA_ATR_AclGroupSloppy],
+      &server.sv_attr[SRV_ATR_AclGroupSloppy],
+      0);
+    pthread_mutex_unlock(server.sv_attr_mutex);
 
-              break;
-              }
-            }
+    rc = acl_check(
+           &pque->qu_attr[QA_ATR_AclGroup],
+           pjob->ji_wattr[JOB_ATR_egroup].at_val.at_str,
+           ACL_Group);
 
-          if (rc == 1)
-            break;
-          }
-        }    /* END if (rc == 0) && slpygrp && ...) */
+    if ((rc == 0) && slpygrp)
+      {
+      /* try again looking at the gids */
 
-      if (rc == 0)
-        {
-        /* ACL not satisfied */
+      rc = acl_check(
+             &pque->qu_attr[QA_ATR_AclGroup],
+             pjob->ji_wattr[JOB_ATR_egroup].at_val.at_str,
+             ACL_Gid);
+      }
 
-        if (mtype != MOVE_TYPE_MgrMv) /* ok if mgr */
-          {
-          int logic_or;
+    if ((rc == 0) && slpygrp &&
+        (!(pjob->ji_wattr[JOB_ATR_grouplst].at_flags & ATR_VFLAG_SET)))
+      {
+      /* check group acl against all accessible groups */
 
-          pthread_mutex_lock(server.sv_attr_mutex);
-          logic_or = attr_ifelse_long(&pque->qu_attr[QA_ATR_AclLogic],
-                                      &server.sv_attr[SRV_ATR_AclLogic],
-                                      0);
-          pthread_mutex_unlock(server.sv_attr_mutex);
+      struct group *grp;
+      int i = 0;
+      int j = 0;
 
-          if (logic_or && pque->qu_attr[QA_ATR_AclUserEnabled].at_val.at_long)
-            {
-            /* only fail if neither user nor group acls can be met */
+      char uname[PBS_MAXUSER + 1];
 
-            failed_group_acl = 1;
-            }
-          else
+      snprintf(uname, sizeof(uname), "%s", pjob->ji_wattr[JOB_ATR_euser].at_val.at_str);
+
+      /* fetch the groups in the ACL and look for matching user membership */
+
+      pas = pque->qu_attr[QA_ATR_AclGroup].at_val.at_arst;
+
+      for (i = 0; pas != NULL && i < pas->as_usedptr;i++)
+        {
+        if ((grp = getgrnam(pas->as_string[i])) == NULL)
+          continue;
+
+        for (j = 0;grp->gr_mem[j] != NULL;j++)
+          {
+          if (!strcmp(grp->gr_mem[j], uname))
             {
-            /* no user acl, fail immediately */
-            if (EMsg) snprintf(EMsg, 1024,
-                                 "group ACL is not satisfied: user %s, queue %s",
-                                 pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
-                                 pque->qu_qs.qu_name);
+            rc = 1;
 
-            return(PBSE_PERM);
+            break;
             }
           }
-        }
-      }    /* END if (pque->qu_attr[QA_ATR_AclGroupEnabled].at_val.at_long) */
-    }      /* END if (pque->qu_qs.qu_type == QTYPE_Execution) */
 
-  /* checks 2 and 3 are bypassed for a move by manager or qorder */
-
-  if ((mtype != MOVE_TYPE_MgrMv) && (mtype != MOVE_TYPE_Order))
-    {
-    int array_jobs = 0;
+        if (rc == 1)
+          break;
+        }
+      }    /* END if (rc == 0) && slpygrp && ...) */
 
-    /* set the number of array jobs in this request if applicable */
-    if (pjob->ji_is_array_template)
+    if (rc == 0)
       {
-      array_jobs = num_array_jobs(
-          pjob->ji_wattr[JOB_ATR_job_array_request].at_val.at_str);
+      /* ACL not satisfied */
 
-      /* only add if there wasn't an error. if there is, fail elsewhere */
-      if (array_jobs > 0)
-        {
-        /* when not an array, user_jobs is the current number of jobs, not
-         * the number of jobs that will be added. For this reason, the 
-         * comparison below is >= and this needs to be decremented by 1 */
-        array_jobs--;
-        }
-      else
+      if (mtype != MOVE_TYPE_MgrMv) /* ok if mgr */
         {
-        array_jobs = 0;
+        int logic_or;
+
+        pthread_mutex_lock(server.sv_attr_mutex);
+        logic_or = attr_ifelse_long(&pque->qu_attr[QA_ATR_AclLogic],
+                                    &server.sv_attr[SRV_ATR_AclLogic],
+                                    0);
+        pthread_mutex_unlock(server.sv_attr_mutex);
+
+        if (logic_or && pque->qu_attr[QA_ATR_AclUserEnabled].at_val.at_long)
+          {
+          /* only fail if neither user nor group acls can be met */
+
+          return(FAILED_GROUP_ACL);
+          }
+        else
+          {
+          /* no user acl, fail immediately */
+          if (EMsg) snprintf(EMsg, 1024,
+                               "group ACL is not satisfied: user %s, queue %s",
+                               pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
+                               pque->qu_qs.qu_name);
+
+          return(PBSE_PERM);
+          }
         }
       }
+    }    /* END if (pque->qu_attr[QA_ATR_AclGroupEnabled].at_val.at_long) */
 
-    /* 2. the queue must be enabled and the job limit not exceeded */
-    if (pque->qu_attr[QA_ATR_Enabled].at_val.at_long == 0)
+  return(return_code);
+  }
+
+static int check_queue_host_ACL(
+
+    struct job       *const pjob,
+    struct pbs_queue *const pque,
+    char             *const hostname,
+    char             *const EMsg)
+  {
+  int return_code = PBSE_NONE; /* Optimistic assumption */
+
+  if (pque->qu_attr[QA_ATR_AclHostEnabled].at_val.at_long)
+    {
+    if (acl_check(&pque->qu_attr[QA_ATR_AclHost], hostname, ACL_Host) == 0)
       {
       if (EMsg)
         snprintf(EMsg, 1024,
-          "queue is disabled: user %s, queue %s",
+          "host ACL rejected the submitting host: user %s, queue %s, host %s",
           pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
-          pque->qu_qs.qu_name);
+          pque->qu_qs.qu_name,
+          hostname);
 
-      return(PBSE_QUNOENB);
+      return(PBSE_BADHOST);
       }
+    }
 
+  return(return_code);
+  }
 
-    if ((pque->qu_attr[QA_ATR_MaxJobs].at_flags & ATR_VFLAG_SET)) 
-      {
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
-      total_jobs = count_queued_jobs(pque, NULL);
+/* Special return constant for check_queue_group_ACL function */
+static const int FAILED_USER_ACL = -2;
+static int check_queue_user_ACL(
 
-      lock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
-      if (pjob->ji_being_recycled == TRUE)
-        {
-        unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
-        return(PBSE_JOB_RECYCLED);
-        }
+    struct job       *const pjob,
+    struct pbs_queue *const pque,
+    char             *const EMsg)
+  {
+  int return_code = PBSE_NONE; /* Optimistic assumption */
 
-      if ((total_jobs + array_jobs) >= pque->qu_attr[QA_ATR_MaxJobs].at_val.at_long)
-        {
+  if (pque->qu_attr[QA_ATR_AclUserEnabled].at_val.at_long)
+    {
+    if (acl_check(
+          &pque->qu_attr[QA_ATR_AclUsers],
+          pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
+          ACL_User) == 0)
+      {
+      int logic_or;
+
+      pthread_mutex_lock(server.sv_attr_mutex);
+      logic_or = attr_ifelse_long(&pque->qu_attr[QA_ATR_AclLogic],
+                                  &server.sv_attr[SRV_ATR_AclLogic],
+                                  0);
+      pthread_mutex_unlock(server.sv_attr_mutex);
+
+      if (logic_or && pque->qu_attr[QA_ATR_AclGroupEnabled].at_val.at_long)
+        {
+        /* only fail if neither user nor group acls can be met */
+
+        return(FAILED_USER_ACL);
+        }
+      else
+        {
+        /* no group acl, fail immediately */
         if (EMsg)
           snprintf(EMsg, 1024,
-            "total number of jobs in queue exceeds the queue limit: "
-            "user %s, queue %s",
+            "user ACL rejected the submitting user: user %s, queue %s",
             pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
             pque->qu_qs.qu_name);
 
-        return(PBSE_MAXQUED);
+        return(PBSE_PERM);
         }
       }
+    }
+
+  return(return_code);
+  }
 
-    if ((pque->qu_attr[QA_ATR_MaxUserJobs].at_flags & ATR_VFLAG_SET) &&
-        (pque->qu_attr[QA_ATR_MaxUserJobs].at_val.at_long >= 0))
+static int check_queue_job_limit(
+
+    struct job       *const pjob,
+    struct pbs_queue *const pque,
+    char             *const EMsg)
+  {
+  int return_code = PBSE_NONE; /* Optimistic assumption */
+  int array_jobs = 0;
+
+  /* set the number of array jobs in this request if applicable */
+  if (pjob->ji_is_array_template)
+    {
+    array_jobs = num_array_jobs(
+        pjob->ji_wattr[JOB_ATR_job_array_request].at_val.at_str);
+
+    /* only add if there wasn't an error. if there is, fail elsewhere */
+    if (array_jobs > 0)
       {
-      /* count number of jobs user has in queue */
-      unlock_ji_mutex(pjob, __func__, (char *)NULL, 0);
+      /* when not an array, user_jobs is the current number of jobs, not
+       * the number of jobs that will be added. For this reason, the
+       * comparison below is >= and this needs to be decremented by 1 */
+      array_jobs--;
+      }
+    else
+      {
+      array_jobs = 0;
+      }
+    }
 
-      user_jobs = count_queued_jobs(pque,
-          pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str);
+  if ((pque->qu_attr[QA_ATR_MaxJobs].at_flags & ATR_VFLAG_SET))
+    {
+    int total_jobs = 0;
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
+    total_jobs = count_queued_jobs(pque, NULL);
 
-      lock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
-      if (pjob->ji_being_recycled == TRUE)
-        {
-        unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
-        return(PBSE_JOB_RECYCLED);
-        }
+    lock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
+    if (pjob->ji_being_recycled == TRUE)
+      {
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
+      return(PBSE_JOB_RECYCLED);
+      }
 
-      if ((user_jobs + array_jobs) >= pque->qu_attr[QA_ATR_MaxUserJobs].at_val.at_long)
+    if ((total_jobs + array_jobs) >= pque->qu_attr[QA_ATR_MaxJobs].at_val.at_long)
+      {
+      if (EMsg)
         {
-        if (EMsg)
-          snprintf(EMsg, 1024,
-            "total number of current user's jobs exceeds the queue limit: "
-            "user %s, queue %s",
-            pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
-            pque->qu_qs.qu_name);
-
-        return(PBSE_MAXUSERQUED);
+        snprintf(EMsg, 1024,
+          "total number of jobs in queue exceeds the queue limit: "
+          "user %s, queue %s",
+          pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
+          pque->qu_qs.qu_name);
         }
+
+      return(PBSE_MAXQUED);
       }
+    }
 
-    /* 3. if "from_route_only" is true, only local route allowed */
+  if ((pque->qu_attr[QA_ATR_MaxUserJobs].at_flags & ATR_VFLAG_SET) &&
+      (pque->qu_attr[QA_ATR_MaxUserJobs].at_val.at_long >= 0))
+    {
+    int user_jobs = 0;
+
+    /* count number of jobs user has in queue */
+    unlock_ji_mutex(pjob, __func__, NULL, 0);
+
+    user_jobs = count_queued_jobs(pque,
+        pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str);
 
-    if ((pque->qu_attr[QA_ATR_FromRouteOnly].at_flags & ATR_VFLAG_SET) &&
-        (pque->qu_attr[QA_ATR_FromRouteOnly].at_val.at_long == 1))
+    lock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
+    if (pjob->ji_being_recycled == TRUE)
       {
-      if (mtype == MOVE_TYPE_Move)  /* ok if not plain user */
-        {
-        if (EMsg)
-          snprintf(EMsg, 1024,
-            "queue accepts only routed jobs, no direct submission: "
-            "user %s, queue %s",
-            pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
-            pque->qu_qs.qu_name);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
+      return(PBSE_JOB_RECYCLED);
+      }
 
-        return(PBSE_QACESS);
-        }
+    if ((user_jobs + array_jobs) >= pque->qu_attr[QA_ATR_MaxUserJobs].at_val.at_long)
+      {
+      if (EMsg)
+        snprintf(EMsg, 1024,
+          "total number of current user's jobs exceeds the queue limit: "
+          "user %s, queue %s",
+          pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
+          pque->qu_qs.qu_name);
+
+      return(PBSE_MAXUSERQUED);
       }
     }
 
-  /* checks 4, 5, and 6 are bypassed for a move by manager */
+  return(return_code);
+  }
 
-  if (mtype != MOVE_TYPE_MgrMv)
+static int check_queue_enabled(
+
+    struct job       *const pjob,
+    struct pbs_queue *const pque,
+    char             *const EMsg)
+  {
+  int return_code = PBSE_NONE; /* Optimistic assumption */
+
+  if (pque->qu_attr[QA_ATR_Enabled].at_val.at_long == 0)
     {
-    /* 4. if enabled, check the queue's host ACL */
+    if (EMsg)
+      {
+      snprintf(EMsg, 1024,
+        "queue is disabled: user %s, queue %s",
+        pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
+        pque->qu_qs.qu_name);
+      }
+
+    return(PBSE_QUNOENB);
+    }
+
+  return(return_code);
+  }
 
-    if (pque->qu_attr[QA_ATR_AclHostEnabled].at_val.at_long)
+static int check_local_route(
+
+    struct job       *const pjob,
+    struct pbs_queue *const pque,
+    const int               mtype, /* MOVE_TYPE_* type, see server_limits.h */
+    char             *const EMsg)
+  {
+  int return_code = PBSE_NONE; /* Optimistic assumption */
+
+  /* if "from_route_only" is true, only local route allowed */
+  if ((pque->qu_attr[QA_ATR_FromRouteOnly].at_flags & ATR_VFLAG_SET) &&
+      (pque->qu_attr[QA_ATR_FromRouteOnly].at_val.at_long == 1))
+    {
+    if (mtype == MOVE_TYPE_Move)  /* ok if not plain user */
       {
-      if (acl_check(&pque->qu_attr[QA_ATR_AclHost], hostname, ACL_Host) == 0)
+      if (EMsg)
+        snprintf(EMsg, 1024,
+          "queue accepts only routed jobs, no direct submission: "
+          "user %s, queue %s",
+          pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
+          pque->qu_qs.qu_name);
+
+      return(PBSE_QACESS);
+      }
+    }
+
+  return(return_code);
+  }
+
+static int are_job_resources_in_limits_of_queue(
+
+    struct job       *const pjob,
+    struct pbs_queue *const pque,
+    char             *const EMsg)
+  {
+  int return_code = PBSE_NONE; /* Optimistic assumption */
+  int check_limits = chk_resc_limits(&pjob->ji_wattr[JOB_ATR_resource], pque, EMsg);
+
+  if (check_limits != 0)
+    {
+    /* FAILURE */
+    return(check_limits);
+    }
+  else
+    {
+    if (pque->qu_attr->at_val.at_str == NULL)
+      {
+      log_err(PBSE_BAD_PARAMETER, __func__, "pque->qu_attr->at_val.at_str uninitialized");
+      return PBSE_BAD_PARAMETER;
+      }
+    if (strcmp(pque->qu_attr->at_val.at_str, "Execution") == 0)
+      {
+      /* job routed to Execution queue successfully */
+      /* unset job's procct resource */
+      resource_def *pctdef;
+      resource *pctresc;
+      pctdef = find_resc_def(svr_resc_def, "procct", svr_resc_size);
+      if ((pctresc = find_resc_entry(&pjob->ji_wattr[JOB_ATR_resource], pctdef)) != NULL)
+         pctdef->rs_free(&pctresc->rs_value);
+      }
+    }
+
+  return(return_code);
+  }
+
+/*
+ * svr_chkque - check if job can enter a queue
+ *
+ * returns 0 for yes, 1 for no
+ *
+ * NOTE: the following fields must be set in the job struture before
+ *   calling svr_chkque():  ji_wattr[JOB_ATR_job_owner]
+ * NOTE: calls chk_resc_limits() to validate resource request
+ *
+ * Also if the job is being considered for an execution queue, then
+ * set_jobexid() will be called.
+ */
+
+int svr_chkque(
+
+  job       *pjob,
+  pbs_queue *pque,
+  char      *hostname,
+  int        mtype,     /* MOVE_TYPE_* type, see server_limits.h */
+  char      *EMsg)      /* O (optional,minsize=1024) */
+
+  {
+  int failed_group_acl = 0;
+  int failed_host_acl = 0;
+  int failed_user_acl  = 0;
+
+  if (pjob == NULL)
+    {
+    log_err(PBSE_BAD_PARAMETER, __func__, "NULL input job pointer");
+    return PBSE_BAD_PARAMETER;
+    }
+  if (pque == NULL)
+    {
+    log_err(PBSE_BAD_PARAMETER, __func__, "NULL input pbs_queue pointer");
+    return PBSE_BAD_PARAMETER;
+    }
+
+  if (EMsg != NULL)
+    EMsg[0] = '\0';
+
+
+  /*
+   * 1. If the queue is an Execution queue ...
+   *    This is checked first because 1a - 1c are more damaging
+   *    (see local_move() in svr_movejob.c)
+   */
+  if (pque->qu_qs.qu_type == QTYPE_Execution)
+    {
+    /* 1a. if not already set, set up execution uid/gid/name */
+    int can_be_established = 0;
+    int are_allowed = 0;
+
+    can_be_established = check_execution_uid_and_gid(pjob, EMsg);
+    if (can_be_established != PBSE_NONE)
         {
-        if (EMsg)
-          snprintf(EMsg, 1024,
-            "host ACL rejected the submitting host: user %s, queue %s, host %s",
-            pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
-            pque->qu_qs.qu_name,
-            hostname);
+        return(can_be_established);
+        }
+
+    /* 1b. check site restrictions -- Currently site_acl_check is a stub */
+    if (site_acl_check(pjob, pque))
+      {
+      if (EMsg) 
+        snprintf(EMsg, 1024,
+          "site_acl_check() failed: user %s, queue %s",
+          pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
+          pque->qu_qs.qu_name);
+
+      return(PBSE_PERM);
+      }
 
-        return(PBSE_BADHOST);
+    /* 1c. cannot have an unknown resource */
+    if (find_resc_entry(
+          &pjob->ji_wattr[JOB_ATR_resource],
+          &svr_resc_def[svr_resc_size - 1]) != 0)
+      {
+      if (EMsg) 
+        {
+        snprintf(EMsg, 1024,
+          "detected request for an unknown resource");
         }
+
+      return(PBSE_UNKRESC);
       }
 
-    /* 5. if enabled, check the queue's user ACL */
+    /* 1d. cannot have an unknown pbs_attribute */
+    if (pjob->ji_wattr[JOB_ATR_UNKN].at_flags & ATR_VFLAG_SET)
+      {
+      if (EMsg) 
+        snprintf(EMsg, 1024,
+          "detected presence of an unknown attribute");
 
-    if (pque->qu_attr[QA_ATR_AclUserEnabled].at_val.at_long)
+      return(PBSE_NOATTR);
+      }
+
+    /* 1e. check queue's disallowed_types */
+    are_allowed = check_queue_disallowed_types(pjob, pque, EMsg);
+    if (are_allowed != PBSE_NONE)
       {
-      if (acl_check(
-            &pque->qu_attr[QA_ATR_AclUsers],
-            pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
-            ACL_User) == 0)
-        {
-        int logic_or;
+      return(are_allowed);
+      }
 
-        pthread_mutex_lock(server.sv_attr_mutex);
-        logic_or = attr_ifelse_long(&pque->qu_attr[QA_ATR_AclLogic],
-                                    &server.sv_attr[SRV_ATR_AclLogic],
-                                    0);
-        pthread_mutex_unlock(server.sv_attr_mutex);
+    /* 1f. if enabled, check the queue's group ACL */
+    failed_group_acl = check_queue_group_ACL(pjob, pque, mtype, EMsg);
+    if (failed_group_acl == PBSE_PERM)
+      {
+      return(failed_group_acl);
+      }
+    }      /* END if (pque->qu_qs.qu_type == QTYPE_Execution) */
 
-        if (logic_or && pque->qu_attr[QA_ATR_AclGroupEnabled].at_val.at_long)
-          {
-          /* only fail if neither user nor group acls can be met */
+  /* checks 2 and 3 are bypassed for a move by manager or qorder */
+  if ((mtype != MOVE_TYPE_MgrMv) && (mtype != MOVE_TYPE_Order))
+    {
+    int queue_job_limit = 0;
+    int queue_enabled = 0;
+    int local_route = 0;
 
-          failed_user_acl = 1;
-          }
-        else
-          {
-          /* no group acl, fail immediately */
-          if (EMsg)
-            snprintf(EMsg, 1024,
-              "user ACL rejected the submitting user: user %s, queue %s",
-              pjob->ji_wattr[JOB_ATR_job_owner].at_val.at_str,
-              pque->qu_qs.qu_name);
+    /* 2. the queue must be enabled and the job limit not exceeded */
+    queue_enabled = check_queue_enabled(pjob, pque, EMsg);
+    if (queue_enabled != PBSE_NONE)
+      {
+      return(queue_enabled);
+      }
 
-          return(PBSE_PERM);
-          }
-        }
+    queue_job_limit = check_queue_job_limit(pjob, pque, EMsg);
+    if (queue_job_limit != PBSE_NONE)
+      {
+      return(queue_job_limit);
+      }
+
+    /* 3. if "from_route_only" is true, only local route allowed */
+    local_route = check_local_route(pjob, pque, mtype, EMsg);
+    if (local_route != PBSE_NONE)
+      {
+      return(local_route);
+      }
+    }
+
+  /* checks 4, 5, and 6 are bypassed for a move by manager */
+
+  if (mtype != MOVE_TYPE_MgrMv)
+    {
+    int job_resources_in_limits_of_queue = 0;
+
+    /* 4. if enabled, check the queue's host ACL */
+    failed_host_acl = check_queue_host_ACL(pjob, pque, hostname, EMsg);
+    if (failed_host_acl != PBSE_NONE)
+      {
+      return(failed_host_acl);
+      }
+
+    /* 5. if enabled, check the queue's user ACL */
+    failed_user_acl = check_queue_user_ACL(pjob, pque, EMsg);
+    if (failed_user_acl == PBSE_PERM)
+      {
+      return(failed_user_acl);
       }
 
     /* 5.5. if failed user and group acls, fail */
@@ -2106,31 +2335,17 @@ int svr_chkque(
       }
 
     /* 6. resources of the job must be in the limits of the queue */
-
-    if ((i = chk_resc_limits(&pjob->ji_wattr[JOB_ATR_resource], pque, EMsg)) != 0)
+    job_resources_in_limits_of_queue = are_job_resources_in_limits_of_queue(pjob, pque, EMsg);
+    if (job_resources_in_limits_of_queue != PBSE_NONE)
       {
-      /* FAILURE */
-
-      return(i);
-      }
-    else
-      {
-      if (strcmp(pque->qu_attr->at_val.at_str, "Execution") == 0)
-        {
-        /* job routed to Execution queue successfully */
-        /* unset job's procct resource */
-        resource_def *pctdef;
-        resource *pctresc;
-        pctdef = find_resc_def(svr_resc_def, "procct", svr_resc_size);
-        if ((pctresc = find_resc_entry(&pjob->ji_wattr[JOB_ATR_resource], pctdef)) != NULL)
-           pctdef->rs_free(&pctresc->rs_value);
-        }
+      return(job_resources_in_limits_of_queue);
       }
+
     }    /* END if (mtype != MOVE_TYPE_MgrMv) */
 
   /* SUCCESS - job can enter queue */
 
-  return(0);
+  return(PBSE_NONE);
   }  /* END svr_chkque() */
 
 
@@ -2144,7 +2359,7 @@ int svr_chkque(
  * If indeed the case, re-evaluate and set the job state.
  */
 
-void job_wait_over(
+static void job_wait_over(
 
   struct work_task *pwt)
 
@@ -2160,7 +2375,7 @@ void job_wait_over(
 
   if (jobid == NULL)
     {
-    log_err(ENOMEM, __func__, (char *)"Cannot allocate memory");
+    log_err(ENOMEM, __func__, "Cannot allocate memory");
     return;
     }
 
@@ -2183,7 +2398,7 @@ void job_wait_over(
         /* recreate the work task entry */
         set_task(WORK_Timed, when, job_wait_over, strdup(pjob->ji_qs.ji_jobid), FALSE);
         
-        unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
         
         return;
         }
@@ -2201,7 +2416,7 @@ void job_wait_over(
     svr_evaljobstate(pjob, &newstate, &newsub, 0);
     svr_setjobstate(pjob, newstate, newsub, FALSE);
     
-    unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
     }
 
   return;
@@ -2228,6 +2443,17 @@ int job_set_wait(
   long       when;
   job       *pjob = (job *)j;
 
+  if (pattr == NULL)
+    {
+    log_err(PBSE_BAD_PARAMETER, __func__, "NULL input pbs_attribute pointer");
+    return PBSE_BAD_PARAMETER;
+    }
+  if (pjob == NULL)
+    {
+    log_err(PBSE_BAD_PARAMETER, __func__, "NULL input job pointer");
+    return PBSE_BAD_PARAMETER;
+    }
+
   if ((pattr->at_flags & ATR_VFLAG_SET) == 0)
     {
     return(PBSE_NONE);
@@ -2254,7 +2480,7 @@ int job_set_wait(
  * "job_name".[e|o]job_sequence_number
  */
 
-void default_std(
+static void default_std(
 
   job            *pjob,
   int             key,  /* 'e' for stderr, 'o' for stdout */
@@ -2321,6 +2547,17 @@ char *prefix_std_file(
   char *qsubhost;
   char *wdir;
 
+  if (pjob == NULL)
+    {
+    log_err(PBSE_BAD_PARAMETER, __func__, "NULL input job pointer");
+    return(NULL);
+    }
+  if (ds == NULL)
+    {
+    log_err(PBSE_BAD_PARAMETER, __func__, "NULL input dynamic_string pointer");
+    return(NULL);
+    }
+
   qsubhost = get_variable(pjob, pbs_o_host);
   wdir     = get_variable(pjob, "PBS_O_WORKDIR");
 
@@ -2391,6 +2628,22 @@ char *add_std_filename(
   dynamic_string *ds)
 
   {
+  if (pjob == NULL)
+    {
+    log_err(PBSE_BAD_PARAMETER, __func__, "NULL input job pointer");
+    return(NULL);
+    }
+  if (path == NULL)
+    {
+    log_err(PBSE_BAD_PARAMETER, __func__, "NULL input path pointer");
+    return(NULL);
+    }
+  if (ds == NULL)
+    {
+    log_err(PBSE_BAD_PARAMETER, __func__, "NULL input dynamic_string pointer");
+    return(NULL);
+    }
+
   append_dynamic_string(ds, path);
   append_char_to_dynamic_string(ds, '/');
   
@@ -2450,7 +2703,7 @@ void get_jobowner(
  * @param *dflt
  */
 
-void set_deflt_resc(
+static void set_deflt_resc(
 
   pbs_attribute *jb,
   pbs_attribute *dflt)
@@ -2542,7 +2795,7 @@ void set_resc_deflt(
     pque = get_jobs_queue(&pjob);
     if (pjob == NULL)
       {
-      log_err(PBSE_JOBNOTFOUND, __func__, (char *)"Job lost while acquiring queue 12");
+      log_err(PBSE_JOBNOTFOUND, __func__, "Job lost while acquiring queue 12");
       return;
       }
     }
@@ -2569,7 +2822,7 @@ void set_resc_deflt(
 #endif
     pthread_mutex_unlock(server.sv_attr_mutex);
 
-    unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+    unlock_queue(pque, __func__, NULL, LOGLEVEL);
     }
 
   for (i = 0;i < JOB_ATR_LAST;++i)
@@ -2590,11 +2843,11 @@ void set_resc_deflt(
   if ((pque = get_jobs_queue(&pjob)) != NULL)
     {
     if (has_queue_mutex == FALSE)
-      unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+      unlock_queue(pque, __func__, NULL, LOGLEVEL);
     }
   else if (pjob == NULL)
     {
-    log_err(PBSE_JOBNOTFOUND, __func__, (char *)"Job lost while acquiring queue 13");
+    log_err(PBSE_JOBNOTFOUND, __func__, "Job lost while acquiring queue 13");
     }
  
   return;
@@ -2622,6 +2875,17 @@ void set_resc_deflt(
   {
     char log_buf[LOCAL_LOG_BUF_SIZE];
 
+    if (pjob == NULL)
+    {
+    log_err(PBSE_BAD_PARAMETER, __func__, "NULL input job pointer");
+    return;
+    }
+    if (pque == NULL)
+    {
+    log_err(PBSE_BAD_PARAMETER, __func__, "NULL input pbs_queue pointer");
+    return;
+    }
+
     /* If execution queue has checkpoint defaults specified, but job does not have
      * checkpoint values, then set defaults on the job.
      */
@@ -2666,8 +2930,14 @@ void set_statechar(
   job *pjob) /* *I* (modified) */
 
   {
-  static char *statechar = "TQHWREC";
-  static char suspend    = 'S';
+  static const char *statechar = "TQHWREC";
+  static const char suspend    = 'S';
+  
+  if (pjob == NULL)
+  {
+  log_err(PBSE_BAD_PARAMETER, __func__, "NULL input job pointer");
+  return;
+  }
   
   if ((pjob->ji_qs.ji_state == JOB_STATE_RUNNING) &&
       (pjob->ji_qs.ji_svrflags & JOB_SVFLG_Suspend))
@@ -2701,7 +2971,7 @@ void set_statechar(
  * to the queue min time.
  */
 
-void eval_checkpoint(
+static void eval_checkpoint(
     
   pbs_attribute *jobckp, /* job's checkpoint pbs_attribute */
   pbs_attribute *queckp) /* queue's checkpoint pbs_attribute */
@@ -2753,7 +3023,7 @@ void eval_checkpoint(
  * all of the counts and log a message.
  */
 
-void correct_ct()
+static void correct_ct()
   
   {
   int           i;
@@ -2820,10 +3090,10 @@ void correct_ct()
       if (pjob->ji_qs.ji_state == JOB_STATE_COMPLETE)
         pque->qu_numcompleted++;
       
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
       }
     
-    unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+    unlock_queue(pque, __func__, NULL, LOGLEVEL);
     } /* END for each queue */
   
   sprintf(log_buf, "%s:2", __func__);
@@ -2862,15 +3132,23 @@ int lock_ji_mutex(
     log_record(PBSEVENT_DEBUG, PBS_EVENTCLASS_NODE, id, err_msg);
     }
 
-  if (pthread_mutex_lock(pjob->ji_mutex) != 0)
+  if (pjob->ji_mutex != NULL)
     {
-    if (logging >= 20)
+    if (pthread_mutex_lock(pjob->ji_mutex) != 0)
       {
-      snprintf(err_msg, MSG_LEN_LONG, "ALERT: cannot lock job %s mutex in method %s",
-                                   pjob->ji_qs.ji_jobid, id);
-      log_record(PBSEVENT_DEBUG, PBS_EVENTCLASS_NODE, id, err_msg);
+      if (logging >= 20)
+        {
+        snprintf(err_msg, MSG_LEN_LONG, "ALERT: cannot lock job %s mutex in method %s",
+                                     pjob->ji_qs.ji_jobid, id);
+        log_record(PBSEVENT_DEBUG, PBS_EVENTCLASS_NODE, id, err_msg);
+        }
+      rc = PBSE_MUTEX;
       }
-    rc = PBSE_MUTEX;
+    }
+  else
+    {
+    rc = -1;
+    log_err(rc, __func__, "Uninitialized mutex pass to pthread_mutex_lock!");
     }
 
   if (err_msg != NULL)
@@ -2901,15 +3179,23 @@ int unlock_ji_mutex(
     log_record(PBSEVENT_DEBUG, PBS_EVENTCLASS_NODE, id, err_msg);
     }
 
-  if (pthread_mutex_unlock(pjob->ji_mutex) != 0)
+  if (pjob->ji_mutex != NULL)
     {
-    if (logging >= 20)
+    if (pthread_mutex_unlock(pjob->ji_mutex) != 0)
       {
-      snprintf(err_msg, MSG_LEN_LONG, "ALERT: cannot unlock job %s mutex in method %s",
-                                          pjob->ji_qs.ji_jobid, id);
-      log_record(PBSEVENT_DEBUG, PBS_EVENTCLASS_NODE, id, err_msg);
+    if (logging >= 20)
+        {
+        snprintf(err_msg, MSG_LEN_LONG, "ALERT: cannot unlock job %s mutex in method %s",
+                                            pjob->ji_qs.ji_jobid, id);
+        log_record(PBSEVENT_DEBUG, PBS_EVENTCLASS_NODE, id, err_msg);
+        }
+      rc = PBSE_MUTEX;
       }
-    rc = PBSE_MUTEX;
+    }
+  else
+    {
+    rc = -1;
+    log_err(rc, __func__, "Uninitialized mutex pass to pthread_mutex_unlock!");
     }
 
    if (err_msg != NULL)
diff --git a/src/server/svr_jobfunc.h b/src/server/svr_jobfunc.h
index 690eaabd57..9e09c925ca 100644
--- a/src/server/svr_jobfunc.h
+++ b/src/server/svr_jobfunc.h
@@ -2,51 +2,40 @@
 #define _SVR_JOBFUNC_H
 #include "license_pbs.h" /* See here for the software license */
 
-#include "pbs_job.h" /* job */
-#include "attribute.h" /* pbs_attribute */
-#include "resource.h" /* resource_def */
-#include "queue.h" /* pbs_queue */
-#include "dynamic_string.h"
+/*Forward declarations*/
+struct job;
+struct pbs_attribute;
+struct resource;
+struct resource_def;
+struct pbs_queue;
+struct dynamic_string;
 
-int svr_enquejob(job *pjob, int has_sv_qs_mutex, int);
+int svr_enquejob(struct job *pjob, int has_sv_qs_mutex, int);
 
-int svr_setjobstate(job *pjob, int newstate, int newsubstate, int);
+int svr_setjobstate(struct job *pjob, int newstate, int newsubstate, int);
 
-void svr_evaljobstate(job *pjob, int *newstate, int *newsub, int forceeval);
+void svr_evaljobstate(struct job *pjob, int *newstate, int *newsub, int forceeval);
 
-char *get_variable(job *pjob, char *variable);
+char *get_variable(struct job *pjob, char *variable);
 
-resource *get_resource(pbs_attribute *p_queattr, pbs_attribute *p_svrattr, resource_def *rscdf, int *fromQueue);
+int chk_resc_limits(struct pbs_attribute *pattr, struct pbs_queue *pque, char *EMsg);
 
-/* static int chk_svr_resc_limit(pbs_attribute *jobatr, pbs_queue *pque, int qtype, char *EMsg); */
+int svr_chkque(struct job *pjob, struct pbs_queue *pque, char *hostname, int mtype, char *EMsg);
 
-int count_queued_jobs(pbs_queue *pque, char *user);
+int job_set_wait(struct pbs_attribute *pattr, void *pjob, int mode);
 
-int chk_resc_limits(pbs_attribute *pattr, pbs_queue *pque, char *EMsg);
+char *prefix_std_file(struct job *pjob, struct dynamic_string *ds, int key);
 
-int svr_chkque(job *pjob, pbs_queue *pque, char *hostname, int mtype, char *EMsg);
-
-/* static void job_wait_over(struct work_task *pwt); */
-
-int job_set_wait(pbs_attribute *pattr, void *pjob, int mode);
-
-/* static void default_std(job *pjob, int key, char *to); */
-
-char *prefix_std_file(job *pjob, dynamic_string *ds, int key);
-
-char *add_std_filename(job *pjob, char * path, int key, dynamic_string *ds);
+char *add_std_filename(struct job *pjob, char * path, int key, struct dynamic_string *ds);
 
 void get_jobowner(char *from, char *to);
 
-/* static void set_deflt_resc(pbs_attribute *jb, pbs_attribute *dflt); */
-
-void set_resc_deflt(job *pjob, pbs_attribute *ji_wattr, int has_queue_mutex);
+void set_resc_deflt(struct job *pjob, struct pbs_attribute *ji_wattr, int has_queue_mutex);
 
-void set_chkpt_deflt(job *pjob, pbs_queue *pque);
+void set_chkpt_deflt(struct job *pjob, struct pbs_queue *pque);
 
-void set_statechar(job *pjob);
+void set_statechar(struct job *pjob);
 
-/* static void eval_checkpoint(pbs_attribute *jobckp, pbs_attribute *queckp); */
 
 #ifndef NDEBUG
 /* static void correct_ct(); */
diff --git a/src/server/svr_mail.c b/src/server/svr_mail.c
index 99b46fbf67..de3db3bf41 100644
--- a/src/server/svr_mail.c
+++ b/src/server/svr_mail.c
@@ -104,7 +104,7 @@
 /* External Functions Called */
 
 extern void net_close (int);
-extern void svr_format_job (FILE *, mail_info *, char *);
+extern void svr_format_job (FILE *, mail_info *, const char *);
 
 /* Global Data */
 
@@ -145,16 +145,16 @@ void *send_the_mail(
   {
   mail_info *mi = (mail_info *)vp;
 
-  int        i;
-  char      *mailfrom = NULL;
-  char      *subjectfmt = NULL;
-  char      *bodyfmt = NULL;
-  char      *cmdbuf = NULL;
-  char       bodyfmtbuf[MAXLINE];
-  FILE      *outmail;
+  int         i;
+  const char *mailfrom = NULL;
+  const char *subjectfmt = NULL;
+  char       *bodyfmt = NULL;
+  char       *cmdbuf = NULL;
+  char        bodyfmtbuf[MAXLINE];
+  FILE       *outmail;
   
   /* Who is mail from, if SRV_ATR_mailfrom not set use default */
-  get_svr_attr_str(SRV_ATR_mailfrom, &mailfrom);
+  get_svr_attr_str(SRV_ATR_mailfrom, (char **)&mailfrom);
   if (mailfrom == NULL)
     {
     if (LOGLEVEL >= 5)
@@ -174,7 +174,7 @@ void *send_the_mail(
     }
 
   /* mail subject line formating statement */
-  get_svr_attr_str(SRV_ATR_MailSubjectFmt, &subjectfmt);
+  get_svr_attr_str(SRV_ATR_MailSubjectFmt, (char **)subjectfmt);
   if (subjectfmt == NULL)
     {
     subjectfmt = "PBS JOB %i";
@@ -202,7 +202,7 @@ void *send_the_mail(
   /* setup sendmail command line with -f from_whom */
   i = strlen(SENDMAIL_CMD) + strlen(mailfrom) + strlen(mi->mailto) + 6;
 
-  if ((cmdbuf = calloc(1, i + 1)) == NULL)
+  if ((cmdbuf = (char *)calloc(1, i + 1)) == NULL)
     {
     char tmpBuf[LOG_BUF_SIZE];
 
@@ -302,10 +302,10 @@ void svr_mailowner(
   job   *pjob,      /* I */
   int    mailpoint, /* note, single character  */
   int    force,     /* if set to MAIL_FORCE, force mail delivery */
-  char  *text)      /* (optional) additional message text */
+  const char  *text)      /* (optional) additional message text */
 
   {
-  static char          *memory_err = "Cannot allocate memory to send email";
+  static const char   *memory_err = "Cannot allocate memory to send email";
 
   char                  mailto[1024];
   char                 *domain = NULL;
@@ -395,7 +395,7 @@ void svr_mailowner(
       }
     }
 
-  mi = calloc(1, sizeof(mail_info));
+  mi = (mail_info *)calloc(1, sizeof(mail_info));
 
   if (mi == NULL)
     {
diff --git a/src/server/svr_mail.h b/src/server/svr_mail.h
index 46ec8ce8e1..75193f8fd0 100644
--- a/src/server/svr_mail.h
+++ b/src/server/svr_mail.h
@@ -5,6 +5,6 @@
 #include "server.h" /* mail_info */
 #include "pbs_job.h" /* job */
 
-void svr_mailowner(job *pjob, int mailpoint, int force, char *text);
+void svr_mailowner(job *pjob, int mailpoint, int force, const char *text);
 
 #endif /* _SVR_MAIL_H */
diff --git a/src/server/svr_movejob.c b/src/server/svr_movejob.c
index 1bd9de7a85..248b58ac12 100644
--- a/src/server/svr_movejob.c
+++ b/src/server/svr_movejob.c
@@ -110,6 +110,7 @@
 #include "svrfunc.h"
 #include "mcom.h"
 #include "array.h"
+#include "job_route.h"
 #include "threadpool.h"
 #include "../lib/Libutils/u_lock_ctl.h" /* unlock_node */
 #include "queue_func.h" /* find_queuebyname */
@@ -329,13 +330,13 @@ int local_move(
   /* check the destination */
   if ((*my_err = svr_chkque(pjob, dest_que, get_variable(pjob, pbs_o_host), mtype, NULL)))
     {
-    unlock_queue(dest_que, __func__, (char *)NULL, 0);
+    unlock_queue(dest_que, __func__, NULL, 0);
 
     /* should this queue be retried? */
     return(should_retry_route(*my_err));
     }
 
-  unlock_queue(dest_que, __func__, (char *)NULL, 0);
+  unlock_queue(dest_que, __func__, NULL, 0);
 
   /* dequeue job from present queue, update destination and */
   /* queue_rank for new queue and enqueue into destination  */
@@ -407,9 +408,9 @@ void finish_routing_processing(
         /* job delete in progress, just set to queued status */
         svr_setjobstate(pjob, JOB_STATE_QUEUED, JOB_SUBSTATE_ABORT, FALSE);
         
-        svr_mailowner(pjob, 'a', TRUE, "Coudln't route job to remote server");
+        svr_mailowner(pjob, 'a', TRUE, "Couldn't route job to remote server");
 
-        unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
         return;
         }
@@ -420,7 +421,7 @@ void finish_routing_processing(
 
     default: /* try routing again */
        
-      svr_mailowner(pjob, 'a', TRUE, "Coudln't route job to remote server");
+      svr_mailowner(pjob, 'a', TRUE, "Couldn't route job to remote server");
 
       /* force re-eval of job state out of Transit */
 
@@ -435,9 +436,9 @@ void finish_routing_processing(
         else if (status != 0)
           job_abt(&pjob, msg_routexceed);
         else
-          unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
 
-        unlock_queue(pque, __func__, (char *)NULL, LOGLEVEL);
+        unlock_queue(pque, __func__, NULL, LOGLEVEL);
         }
       else if (pjob != NULL)
         {
@@ -512,7 +513,7 @@ void finish_moving_processing(
         svr_evaljobstate(pjob, &newstate, &newsub, 1);
         svr_setjobstate(pjob, newstate, newsub, FALSE);
    
-        unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
         }
 
       req_reject(status, 0, req, NULL, NULL);
@@ -568,7 +569,7 @@ void finish_move_process(
         
       case MOVE_TYPE_Exec:
 
-        unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
         pjob = NULL;
         finish_sendmom(job_id, preq, time, node_name, status, mom_err);
         
@@ -577,7 +578,7 @@ void finish_move_process(
     }
 
   if (pjob != NULL)
-    unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
   } /* END finish_move_process() */
 
 
@@ -596,7 +597,7 @@ void free_server_attrs(
 
   while (pal != NULL)
     {
-    tmp = GET_NEXT(pal->al_link);
+    tmp = (svrattrl *)GET_NEXT(pal->al_link);
     delete_link(&pal->al_link);
     free(pal);
 
@@ -738,7 +739,7 @@ int send_job_work(
       {
       snprintf(script_name, sizeof(script_name), "%s%s%s",
         path_jobs, pa->ai_qs.fileprefix, JOB_SCRIPT_SUFFIX);
-      unlock_ai_mutex(pa, __func__, (char *)NULL, LOGLEVEL);
+      unlock_ai_mutex(pa, __func__, NULL, LOGLEVEL);
       }
     else if (pjob == NULL)
       return(PBSE_JOB_RECYCLED);
@@ -755,7 +756,7 @@ int send_job_work(
         (get_job_file_path(pjob ,StdErr, stderr_path, sizeof(stderr_path)) != 0) ||
         (get_job_file_path(pjob, Checkpoint, chkpt_path, sizeof(chkpt_path)) != 0))
       {
-      unlock_ji_mutex(pjob, __func__, (char *)"2", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "2", LOGLEVEL);
       goto send_job_work_end;
       }
     }
@@ -771,7 +772,7 @@ int send_job_work(
       change_substate_on_attempt_to_queue = TRUE;
     }
   
-  unlock_ji_mutex(pjob, __func__, (char *)"3", LOGLEVEL);
+  unlock_ji_mutex(pjob, __func__, "3", LOGLEVEL);
 
   for (NumRetries = 0;NumRetries < RETRY;NumRetries++)
     {
@@ -817,7 +818,7 @@ int send_job_work(
 
     if (con == PBS_LOCAL_CONNECTION)
       {
-      log_err(-1, __func__, (char *)"attempting to run the job on pbs_server???");
+      log_err(-1, __func__, "attempting to run the job on pbs_server???");
       return(PBSE_SYSTEM);
       }
 
@@ -832,7 +833,7 @@ int send_job_work(
           {
           pjob->ji_qs.ji_substate = JOB_SUBSTATE_TRNOUT;
           job_save(pjob, SAVEJOB_QUICK, 0);
-          unlock_ji_mutex(pjob, __func__, (char *)"4", LOGLEVEL);
+          unlock_ji_mutex(pjob, __func__, "4", LOGLEVEL);
           }
         else
           break;
@@ -896,7 +897,7 @@ int send_job_work(
         {
         pjob->ji_qs.ji_substate = JOB_SUBSTATE_TRNOUTCM;      
         job_save(pjob, SAVEJOB_QUICK, 0);
-        unlock_ji_mutex(pjob, __func__, (char *)"5", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "5", LOGLEVEL);
         }
       else
         break;
@@ -974,7 +975,7 @@ int send_job_work(
         {
         pjob->ji_wattr[JOB_ATR_session_id].at_val.at_long = sid;
         pjob->ji_wattr[JOB_ATR_session_id].at_flags |= ATR_VFLAG_SET;
-        unlock_ji_mutex(pjob, __func__, (char *)"6", LOGLEVEL);
+        unlock_ji_mutex(pjob, __func__, "6", LOGLEVEL);
         }
       else
         {
@@ -1061,7 +1062,7 @@ void *send_job(
   if (pjob != NULL)
     {
     job_momaddr = pjob->ji_qs.ji_un.ji_exect.ji_momaddr;
-    unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+    unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
 
     if (LOGLEVEL >= 6)
       {
@@ -1139,7 +1140,7 @@ int net_move(
 
   svr_setjobstate(jobp, JOB_STATE_TRANSIT, JOB_SUBSTATE_TRNOUT, TRUE);
 
-  args = calloc(1, sizeof(send_job_request));
+  args = (send_job_request *)calloc(1, sizeof(send_job_request));
 
   if (args != NULL)
     {
diff --git a/src/server/svr_recov.c b/src/server/svr_recov.c
index fbe3ec28dd..53017b41ad 100644
--- a/src/server/svr_recov.c
+++ b/src/server/svr_recov.c
@@ -107,6 +107,7 @@
 #include "log.h"
 #include "../lib/Liblog/pbs_log.h"
 #include "../lib/Liblog/log_event.h"
+#include "../lib/Libifl/lib_ifl.h"
 #include "pbs_error.h"
 #include "resource.h"
 #include "utils.h"
@@ -173,16 +174,16 @@ int svr_recov(
   /* read in server structure */
   lock_sv_qs_mutex(server.sv_qs_mutex, __func__);
 
-  i = read(sdb, (char *) & server.sv_qs, sizeof(struct server_qs));
+  i = read_ac_socket(sdb, (char *) & server.sv_qs, sizeof(server_qs));
 
-  if (i != sizeof(struct server_qs))
+  if (i != sizeof(server_qs))
     {
     unlock_sv_qs_mutex(server.sv_qs_mutex, log_buf);
 
     if (i < 0)
-      log_err(errno, __func__, (char *)"read of serverdb failed");
+      log_err(errno, __func__, "read of serverdb failed");
     else
-      log_err(errno, __func__, (char *)"short read of serverdb");
+      log_err(errno, __func__, "short read of serverdb");
 
     close(sdb);
 
@@ -204,7 +205,7 @@ int svr_recov(
         !read_only) != 0 ) 
     {
     unlock_sv_qs_mutex(server.sv_qs_mutex, log_buf);
-    log_err(errno, __func__, (char *)"error on recovering server attr");
+    log_err(errno, __func__, "error on recovering server attr");
 
     close(sdb);
 
@@ -238,7 +239,7 @@ int svr_recov(
         PBS_SVRACL,
         svr_attr_def[i].at_name);
 
-      if ((!read_only) && (svr_attr_def[i].at_action != (int (*)())0))
+      if ((!read_only) && (svr_attr_def[i].at_action != (int (*)(pbs_attribute*, void*, int))0))
         {
         svr_attr_def[i].at_action(
           &server.sv_attr[i],
@@ -511,7 +512,7 @@ int str_to_attr(
       (val  == NULL) ||
       (attr == NULL))
     {
-    log_err(-1, __func__, (char *)"Illegal NULL pointer argument");
+    log_err(-1, __func__, "Illegal NULL pointer argument");
 
     return(-10);
     }
@@ -554,7 +555,7 @@ int str_to_attr(
 
       if (attr[index].at_val.at_str == NULL)
         {
-        log_err(PBSE_SYSTEM, __func__, (char *)"Cannot allocate memory\n");
+        log_err(PBSE_SYSTEM, __func__, "Cannot allocate memory\n");
 
         return(PBSE_SYSTEM);
         }
@@ -732,7 +733,7 @@ int svr_recov_xml(
     return(-1);
     }
 
-  bytes_read = read(sdb,buffer,sizeof(buffer));
+  bytes_read = read_ac_socket(sdb,buffer,sizeof(buffer));
 
   if (bytes_read < 0)
     {
@@ -769,7 +770,7 @@ int svr_recov_xml(
   if (end == NULL)
     {
     /* no server tag???? */
-    log_err(-1, __func__, (char *)"No server tag found in the database file???");
+    log_err(-1, __func__, "No server tag found in the database file???");
     close(sdb);
 
     return(-1);
@@ -889,7 +890,7 @@ int svr_save_xml(
   char log_buf[LOCAL_LOG_BUF_SIZE + 1];
 
   tmp_file_len = strlen(path_svrdb) + 5;
-  if ((tmp_file = calloc(sizeof(char), tmp_file_len)) == NULL)
+  if ((tmp_file = (char *)calloc(sizeof(char), tmp_file_len)) == NULL)
     {
     rc = PBSE_MEM_MALLOC;
     return(rc);
@@ -1008,7 +1009,7 @@ int save_acl(
   const char   *name)  /* parent object name = file name */
 
   {
-  static char *this_function_name = "save_acl";
+  static const char *this_function_name = "save_acl";
   int          fds;
   char         filename1[MAXPATHLEN];
   char         filename2[MAXPATHLEN];
@@ -1071,7 +1072,7 @@ int save_acl(
     {
     /* write entry, but without terminating null */
 
-    while ((i = write(fds, pentry->al_value, pentry->al_valln - 1)) != pentry->al_valln - 1)
+    while ((i = write_ac_socket(fds, pentry->al_value, pentry->al_valln - 1)) != pentry->al_valln - 1)
       {
       if ((i == -1) && (errno == EINTR))
         continue;
@@ -1127,7 +1128,7 @@ void recov_acl(
   const char  *name) /* parent object name = file name */
 
   {
-  static char   *this_function_name = "recov_acl";
+  static const char   *this_function_name = "recov_acl";
   char          *buf;
   int            fds;
   char           filename1[MAXPATHLEN];
@@ -1171,7 +1172,7 @@ void recov_acl(
     return;  /* no data */
     }
 
-  buf = calloc(1, (size_t)sb.st_size + 1); /* 1 extra for added null */
+  buf = (char *)calloc(1, (size_t)sb.st_size + 1); /* 1 extra for added null */
 
   if (buf == NULL)
     {
@@ -1180,7 +1181,7 @@ void recov_acl(
     return;
     }
 
-  if (read(fds, buf, (unsigned int)sb.st_size) != (int)sb.st_size)
+  if (read_ac_socket(fds, buf, (unsigned int)sb.st_size) != (int)sb.st_size)
     {
     log_err(errno, this_function_name, (char *)"unable to read acl file");
 
diff --git a/src/server/svr_resccost.c b/src/server/svr_resccost.c
index 19f1825772..46711c17cc 100644
--- a/src/server/svr_resccost.c
+++ b/src/server/svr_resccost.c
@@ -140,7 +140,7 @@ static struct resource_cost *add_cost_entry(
   {
   struct resource_cost *pcost;
 
-  pcost = calloc(1, sizeof(struct resource_cost));
+  pcost = (struct resource_cost *)calloc(1, sizeof(struct resource_cost));
 
   if (pcost != NULL)
     {
@@ -171,8 +171,8 @@ int decode_rcost(
 
   pbs_attribute *patr,
   const char   *name,  /* pbs_attribute name */
-  char          *rescn, /* resource name, unused here */
-  char          *val,   /* pbs_attribute value */
+  const char *rescn, /* resource name, unused here */
+  const char    *val,   /* pbs_attribute value */
   int            perm)  /* used only with resources */
 
   {
diff --git a/src/server/svr_resccost.h b/src/server/svr_resccost.h
index 9f6074c99b..679431d22a 100644
--- a/src/server/svr_resccost.h
+++ b/src/server/svr_resccost.h
@@ -9,7 +9,7 @@
 
 /* static struct resource_cost *add_cost_entry(pbs_attribute *patr, resource_def *prdef); */
 
-int decode_rcost(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm);
+int decode_rcost(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm);
  
 int encode_rcost(pbs_attribute *attr, tlist_head *phead, const char *atname, const char *rsname, int mode, int perm);
 
diff --git a/src/server/svr_task.c b/src/server/svr_task.c
index 2e5fcb2cb1..302227a359 100644
--- a/src/server/svr_task.c
+++ b/src/server/svr_task.c
@@ -172,7 +172,7 @@ struct work_task *set_task(
     }
   else
     {
-    if ((pnew->wt_mutex = calloc(1, sizeof(pthread_mutex_t))) == NULL)
+    if ((pnew->wt_mutex = (pthread_mutex_t*)calloc(1, sizeof(pthread_mutex_t))) == NULL)
       {
       free(pnew);
       return(NULL);
@@ -306,14 +306,14 @@ void initialize_all_tasks_array(
 
   if (at->ra == NULL)
     {
-    log_err(ENOMEM, __func__, (char *)"Cannot allocate space for array...FAILURE");
+    log_err(ENOMEM, __func__, "Cannot allocate space for array...FAILURE");
     }
   
-  at->alltasks_mutex = calloc(1, sizeof(pthread_mutex_t));
+  at->alltasks_mutex = (pthread_mutex_t*)calloc(1, sizeof(pthread_mutex_t));
 
   if (at->alltasks_mutex == NULL)
     {
-    log_err(ENOMEM, __func__, (char *)"Cannot allocate space for mutex...FAILURE");
+    log_err(ENOMEM, __func__, "Cannot allocate space for mutex...FAILURE");
     }
   else
     {
@@ -337,7 +337,7 @@ work_task *next_task(
 
   pthread_mutex_lock(at->alltasks_mutex);
 
-  wt = next_thing(at->ra,iter);
+  wt = (work_task *)next_thing(at->ra,iter);
   if (wt != NULL)
     pthread_mutex_lock(wt->wt_mutex);
 
@@ -376,7 +376,7 @@ int insert_task(
   if ((rc = insert_thing(at->ra,wt)) == -1)
     {
     rc = ENOMEM;
-    log_err(rc, __func__, (char *)"Cannot allocate space to resize the array");
+    log_err(rc, __func__, "Cannot allocate space to resize the array");
     }
 
   wt->wt_tasklist = at;
@@ -430,7 +430,7 @@ int insert_task_before(
     if ((rc = insert_thing_before(at->ra,before,i)) == -1)
       {
       rc = ENOMEM;
-      log_err(rc, __func__, (char *)"Cannot allocate space to resize the array");
+      log_err(rc, __func__, "Cannot allocate space to resize the array");
       }
     else
       rc = PBSE_NONE;
@@ -460,7 +460,7 @@ int insert_task_first(
   if ((rc = insert_thing_after(at->ra,wt,ALWAYS_EMPTY_INDEX)) == -1)
     {
     rc = ENOMEM;
-    log_err(rc, __func__, (char *)"Cannot allocate space to resize the array");
+    log_err(rc, __func__, "Cannot allocate space to resize the array");
     }
 
   wt->wt_tasklist = at;
@@ -537,7 +537,7 @@ void initialize_task_recycler()
   initialize_all_tasks_array(&tr.tasks);
   tr.iter = -1;
 
-  tr.mutex = calloc(1, sizeof(pthread_mutex_t));
+  tr.mutex = (pthread_mutex_t*)calloc(1, sizeof(pthread_mutex_t));
   pthread_mutex_init(tr.mutex, NULL);
   } /* END initialize_task_recycler() */
 
@@ -553,7 +553,7 @@ work_task *next_task_from_recycler(
   work_task *wt = NULL;
 
   pthread_mutex_lock(at->alltasks_mutex);
-  wt = next_thing(at->ra,iter);
+  wt = (work_task *)next_thing(at->ra,iter);
   if (wt != NULL)
     pthread_mutex_lock(wt->wt_mutex);
   pthread_mutex_unlock(at->alltasks_mutex);
diff --git a/src/server/test/Makefile.am b/src/server/test/Makefile.am
index 2129c80f80..d8e2fd99fc 100644
--- a/src/server/test/Makefile.am
+++ b/src/server/test/Makefile.am
@@ -21,3 +21,6 @@ SUBDIRS = . accounting array_func array_upgrade attr_recov dis_read geteusernam
 					svr_recov svr_resccost svr_task display_alps_status process_alps_status login_nodes \
 					track_alps_reservations user_info exiting_jobs job_container receive_mom_communication \
 					process_mom_update batch_request 
+
+$(SUBDIRS)::
+	$(MAKE) -C $@ $(MAKECMDGOALS)
diff --git a/src/server/test/array_func/scaffolding.c b/src/server/test/array_func/scaffolding.c
index 52054797c3..cf6f14d869 100644
--- a/src/server/test/array_func/scaffolding.c
+++ b/src/server/test/array_func/scaffolding.c
@@ -14,7 +14,7 @@
 
 
 char *path_arrays;
-char *pbs_o_host = "PBS_O_HOST";
+const char *pbs_o_host = "PBS_O_HOST";
 struct server server;
 int LOGLEVEL = 7; /* force logging code to be exercised as tests run */
 int array_259_upgrade = 0;
@@ -247,7 +247,7 @@ int svr_job_purge(job *pjob)
   return(0);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
@@ -327,3 +327,12 @@ void *next_from_hash_map(
   return(NULL);
   }
 
+ssize_t write_ac_socket(int fd, const void *buf, ssize_t count)
+  {
+  return(0);
+  }
+
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
+  {
+  return(0);
+  }
diff --git a/src/server/test/attr_recov/scaffolding.c b/src/server/test/attr_recov/scaffolding.c
index fcbcf82cdf..06d0637a89 100644
--- a/src/server/test/attr_recov/scaffolding.c
+++ b/src/server/test/attr_recov/scaffolding.c
@@ -31,7 +31,7 @@ ssize_t write_nonblocking_socket(int fd, const void *buf, ssize_t count)
   exit(1);
   }
 
-int find_attr(struct attribute_def *attr_def, char *name, int limit)
+int find_attr(struct attribute_def *attr_def, const char *name, int limit)
   {
   fprintf(stderr, "The call to find_attr needs to be mocked!!\n");
   exit(1);
@@ -67,3 +67,7 @@ void free_dynamic_string(dynamic_string *ds)
   exit(1);
   }
 
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
+  {
+  return(0);
+  }
diff --git a/src/server/test/exiting_jobs/scaffolding.c b/src/server/test/exiting_jobs/scaffolding.c
index 2b20d7e5cc..aed4b3fb89 100644
--- a/src/server/test/exiting_jobs/scaffolding.c
+++ b/src/server/test/exiting_jobs/scaffolding.c
@@ -61,7 +61,7 @@ void *next_from_hash_map(hash_map *hm, int *iter)
     
   if (*iter < 2)
     {
-    jeri = calloc(1, sizeof(job_exiting_retry_info));
+    jeri = (job_exiting_retry_info*)calloc(1, sizeof(job_exiting_retry_info));
 
     if (*iter == -1)
       snprintf(jeri->jobid, sizeof(jeri->jobid), "1.napali");
@@ -77,7 +77,7 @@ void *next_from_hash_map(hash_map *hm, int *iter)
     return(NULL);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/issue_request/scaffolding.c b/src/server/test/issue_request/scaffolding.c
index 3e12d5749c..d0d6508a9d 100644
--- a/src/server/test/issue_request/scaffolding.c
+++ b/src/server/test/issue_request/scaffolding.c
@@ -11,14 +11,14 @@
 #include "list_link.h" /* tlist_head, list_link */
 
 int pbs_errno = 0;
-char *msg_daemonname = "unset";
+const char *msg_daemonname = "unset";
 struct connect_handle connection[10];
 struct connection svr_conn[PBS_NET_MAX_CONNECTIONS];
-char *msg_norelytomom = "Server could not connect to MOM";
+const char *msg_norelytomom = "Server could not connect to MOM";
 unsigned int pbs_server_port_dis;
 int LOGLEVEL = 7; /* force logging code to be exercised as tests run */
 all_tasks task_list_event;
-char *msg_issuebad = "attempt to issue invalid request of type %d";
+const char *msg_issuebad = "attempt to issue invalid request of type %d";
 
 char *parse_servername(char *name, unsigned int *service)
   {
@@ -231,7 +231,7 @@ job *svr_find_job(char *jobid, int get_subjob)
   return(NULL);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/job_container/scaffolding.c b/src/server/test/job_container/scaffolding.c
index c109de960f..b97c0d9d96 100644
--- a/src/server/test/job_container/scaffolding.c
+++ b/src/server/test/job_container/scaffolding.c
@@ -11,7 +11,7 @@ struct all_jobs        alljobs;
 int                    LOGLEVEL;
 
 void log_err(int errno, const char *ident, const char *msg) {}
-void log_event(int type, int class, const char *ident, char *msg) {}
+void log_event(int type, int cls, const char *ident, const char *msg) {}
 
 
 int insert_thing(resizable_array *ra, void *thing)
@@ -34,7 +34,7 @@ int lock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
   return(0);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/job_func/scaffolding.c b/src/server/test/job_func/scaffolding.c
index 8bc14aaefc..75f7afbb6d 100644
--- a/src/server/test/job_func/scaffolding.c
+++ b/src/server/test/job_func/scaffolding.c
@@ -30,10 +30,10 @@ char *path_jobs;
 char path_checkpoint[MAXPATHLEN + 1];
 char *job_log_file = NULL;
 char server_name[PBS_MAXSERVERNAME + 1];
-char *msg_abt_err = "Unable to abort Job %s which was in substate %d";
+const char *msg_abt_err = "Unable to abort Job %s which was in substate %d";
 int queue_rank = 0;
 char *path_spool;
-char *msg_err_purgejob = "Unlink of job file failed";
+const char *msg_err_purgejob = "Unlink of job file failed";
 struct server server;
 struct all_jobs array_summary;
 char *path_jobinfo_log;
@@ -72,7 +72,7 @@ int job_save(job *pjob, int updatetype, int mom_port)
   exit(1);
   }
 
-void svr_mailowner(job *pjob, int mailpoint, int force, char *text)
+void svr_mailowner(job *pjob, int mailpoint, int force, const char *text)
   {
   fprintf(stderr, "The call to svr_mailowner needs to be mocked!!\n");
   exit(1);
@@ -405,7 +405,7 @@ int resize_if_needed(
     /* need to resize */
     difference = new_size - ds->size;
 
-    if ((tmp = realloc(ds->str, new_size)) == NULL)
+    if ((tmp = (char *)realloc(ds->str, new_size)) == NULL)
       return(-1);
 
     ds->str = tmp;
@@ -447,7 +447,7 @@ void clear_dynamic_string(dynamic_string *ds)
 
 dynamic_string *get_dynamic_string(int initial_size, const char *str)
   {
-  dynamic_string *ds = calloc(1, sizeof(dynamic_string));
+  dynamic_string *ds = (dynamic_string *)calloc(1, sizeof(dynamic_string));
 
   if (ds == NULL)
     return(ds);
@@ -457,7 +457,7 @@ dynamic_string *get_dynamic_string(int initial_size, const char *str)
   else
     ds->size = DS_INITIAL_SIZE;
     
-  ds->str = calloc(1, ds->size);
+  ds->str = (char *)calloc(1, ds->size);
 
   if (ds->str == NULL)
     {
@@ -516,8 +516,8 @@ int decode_ll(
 
   pbs_attribute *patr,
   const char   *name,  /* pbs_attribute name */
-  char          *rescn, /* resource name, unused here */
-  char          *val,   /* pbs_attribute value */
+  const char *rescn, /* resource name, unused here */
+  const char    *val,   /* pbs_attribute value */
   int            perm)  /* only used for resources */
 
   {
@@ -564,7 +564,7 @@ int remove_alps_reservation(
   return(0);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
@@ -600,7 +600,7 @@ int set_str(
 
     case SET: /* set is replace old string with new */
 
-      if ((new_value = calloc(1, nsize)) == NULL)
+      if ((new_value = (char *)calloc(1, nsize)) == NULL)
         return (PBSE_SYSTEM);
 
       if (attr->at_val.at_str)
@@ -614,7 +614,7 @@ int set_str(
     case INCR: /* INCR is concatenate new to old string */
 
       nsize += strlen(attr->at_val.at_str);
-      new_value = calloc(1, nsize + 1);
+      new_value = (char *)calloc(1, nsize + 1);
 
       if (new_value == NULL)
         return (PBSE_SYSTEM);
@@ -690,4 +690,14 @@ int get_jobs_index(struct all_jobs *aj, job             *pjob)
   {
   return(0);
   }
+
+ssize_t write_ac_socket(int fd, const void *buf, ssize_t count)
+  {
+  return(0);
+  }
+
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
+  {
+  return(0);
+  }
   
diff --git a/src/server/test/job_qs_upgrade/scaffolding.c b/src/server/test/job_qs_upgrade/scaffolding.c
index a44174d8bc..0c2defc27f 100644
--- a/src/server/test/job_qs_upgrade/scaffolding.c
+++ b/src/server/test/job_qs_upgrade/scaffolding.c
@@ -7,3 +7,8 @@ ssize_t read_nonblocking_socket(int fd, void *buf, ssize_t count)
   fprintf(stderr, "The call to read_nonblocking_socket needs to be mocked!!\n");
   exit(1);
   }
+
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
+  {
+  return(0);
+  }
diff --git a/src/server/test/job_recov/scaffolding.c b/src/server/test/job_recov/scaffolding.c
index 85177db263..26e25230f6 100644
--- a/src/server/test/job_recov/scaffolding.c
+++ b/src/server/test/job_recov/scaffolding.c
@@ -102,7 +102,7 @@ int add_to_ms_list(char *node_id, job *pjob)
   return(0);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
@@ -111,3 +111,13 @@ int unlock_ai_mutex(job_array *pa, const char *func_id, char *msg, int logging)
   {
   return(0);
   }
+
+ssize_t write_ac_socket(int fd, const void *buf, ssize_t count)
+  {
+  return(0);
+  }
+
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
+  {
+  return(0);
+  }
diff --git a/src/server/test/job_recycler/scaffolding.c b/src/server/test/job_recycler/scaffolding.c
index efa1aa88d1..121bdfa2ea 100644
--- a/src/server/test/job_recycler/scaffolding.c
+++ b/src/server/test/job_recycler/scaffolding.c
@@ -44,7 +44,7 @@ void *next_thing(resizable_array *ra, int *iter)
   return(NULL);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/job_route/scaffolding.c b/src/server/test/job_route/scaffolding.c
index 28e0eb5865..5793305ac0 100644
--- a/src/server/test/job_route/scaffolding.c
+++ b/src/server/test/job_route/scaffolding.c
@@ -8,9 +8,9 @@
 #include "batch_request.h" /* batach_request */
 #include "resource.h"
 
-char *msg_err_noqueue = "Unable to requeue job, queue is not defined";
-char *msg_err_malloc = "malloc failed";
-char *msg_routexceed = "Route queue lifetime exceeded";
+const char *msg_err_noqueue = "Unable to requeue job, queue is not defined";
+const char *msg_err_malloc = "malloc failed";
+const char *msg_routexceed = "Route queue lifetime exceeded";
 int svr_resc_size = 0;
 int LOGLEVEL = 7; /* force logging code to be exercised as tests run */
 resource_def *svr_resc_def;
@@ -175,7 +175,7 @@ job *svr_find_job(char *jobid, int get_subjob)
   exit(1);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/login_nodes/scaffolding.c b/src/server/test/login_nodes/scaffolding.c
index d1b50a4676..95c9ede51b 100644
--- a/src/server/test/login_nodes/scaffolding.c
+++ b/src/server/test/login_nodes/scaffolding.c
@@ -71,7 +71,7 @@ resizable_array *initialize_resizable_array(
   int               size)
 
   {
-  resizable_array *ra = calloc(1, sizeof(resizable_array));
+  resizable_array *ra = (resizable_array *)calloc(1, sizeof(resizable_array));
   size_t           amount = sizeof(slot) * size;
 
   ra->max       = size;
@@ -79,7 +79,7 @@ resizable_array *initialize_resizable_array(
   ra->next_slot = 1;
   ra->last      = 0;
 
-  ra->slots = calloc(1, amount);
+  ra->slots = (slot *)calloc(1, amount);
 
   return(ra);
   } /* END initialize_resizable_array() */
@@ -104,7 +104,7 @@ int check_and_resize(
     /* double the size if we're out of space */
     size = (ra->max * 2) * sizeof(slot);
 
-    if ((tmp = realloc(ra->slots,size)) == NULL)
+    if ((tmp = (slot *)realloc(ra->slots,size)) == NULL)
       {
       return(ENOMEM);
       }
diff --git a/src/server/test/node_func/scaffolding.c b/src/server/test/node_func/scaffolding.c
index aa66493335..84814f0f6a 100644
--- a/src/server/test/node_func/scaffolding.c
+++ b/src/server/test/node_func/scaffolding.c
@@ -86,7 +86,7 @@ struct work_task *set_task(enum work_type type, long event_id, void (*func)(), v
   exit(1);
   }
 
-int find_attr(struct attribute_def *attr_def, char *name, int limit)
+int find_attr(struct attribute_def *attr_def, const char *name, int limit)
   {
   fprintf(stderr, "The call to find_attr needs to be mocked!!\n");
   exit(1);
@@ -352,7 +352,7 @@ int insert_addr_name_info(
   return(0);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/node_func/test_node_func.c b/src/server/test/node_func/test_node_func.c
index 4ff68e4e77..56989b5369 100644
--- a/src/server/test/node_func/test_node_func.c
+++ b/src/server/test/node_func/test_node_func.c
@@ -9,7 +9,7 @@
 #include "resizable_array.h"
 
 
-struct pbsnode *find_nodebyname(char *nodeid);
+struct pbsnode *find_nodebyname(const char *nodeid);
 int cray_enabled;
 
 
diff --git a/src/server/test/node_manager/scaffolding.c b/src/server/test/node_manager/scaffolding.c
index 3403b063f2..f784662124 100644
--- a/src/server/test/node_manager/scaffolding.c
+++ b/src/server/test/node_manager/scaffolding.c
@@ -99,7 +99,7 @@ int enqueue_threadpool_request(void *(*func)(void *), void *arg)
   exit(1);
   }
 
-struct pbsnode *find_nodebyname(char *nodename)
+struct pbsnode *find_nodebyname(const char *nodename)
   {
   static struct pbsnode bob;
 
@@ -201,7 +201,7 @@ resource_def *find_resc_def(resource_def *rscdf, const char *name, int limit)
   exit(1);
   }
 
-int decode_arst(struct pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_arst(struct pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   fprintf(stderr, "The call to decode_arst needs to be mocked!!\n");
   exit(1);
@@ -260,7 +260,7 @@ job *svr_find_job(char *jobid, int get_subjob)
   static job pjob;
 
   memset(&pjob, 0, sizeof(pjob));
-  pjob.ji_mutex = calloc(1, sizeof(pthread_mutex_t));
+  pjob.ji_mutex = (pthread_mutex_t *)calloc(1, sizeof(pthread_mutex_t));
   strcpy(pjob.ji_qs.ji_jobid, jobid);
 
   if ((!strcmp(jobid, "1")) ||
@@ -434,7 +434,7 @@ void *pop_thing(resizable_array *ra)
   return(NULL);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/pbsd_init/scaffolding.c b/src/server/test/pbsd_init/scaffolding.c
index 632163726f..3e29475baa 100644
--- a/src/server/test/pbsd_init/scaffolding.c
+++ b/src/server/test/pbsd_init/scaffolding.c
@@ -25,14 +25,14 @@ int scheduler_jobct = 0;
 pthread_mutex_t *job_log_mutex;
 pthread_mutex_t *reroute_job_mutex;
 pthread_mutex_t *log_mutex;
-char *msg_init_chdir = "unable to change to directory %s";
+const char *msg_init_chdir = "unable to change to directory %s";
 char *path_jobs;
-char *msg_err_noqueue = "Unable to requeue job, queue is not defined";
+const char *msg_err_noqueue = "Unable to requeue job, queue is not defined";
 all_nodes allnodes;
 char *path_nodestate;
 char *path_priv = NULL;
-char *msg_init_exptjobs = "Expected %d, recovered %d jobs";
-char *msg_daemonname = "unset";
+const char *msg_init_exptjobs = "Expected %d, recovered %d jobs";
+const char *msg_daemonname = "unset";
 char *path_track;
 char *path_checkpoint;
 char *job_log_file = NULL;
@@ -40,43 +40,43 @@ char *plogenv = NULL;
 pthread_mutex_t *node_state_mutex = NULL;
 pthread_mutex_t *acctfile_mutex = NULL;
 pthread_mutex_t *check_tasks_mutex = NULL;
-char *msg_init_queued = "Requeued in queue: ";
+const char *msg_init_queued = "Requeued in queue: ";
 char *path_svrlog;
 char path_acct[_POSIX_PATH_MAX];
 char *path_nodes;
-char *msg_init_recovque = "Recovered queue %s";
+const char *msg_init_recovque = "Recovered queue %s";
 attribute_def job_attr_def[10];
-char *msg_init_expctq = "Expected %d, recovered %d queues";
+const char *msg_init_expctq = "Expected %d, recovered %d queues";
 char *path_arrays;
 char *log_file = NULL;
-char *msg_script_open = "Unable to open script file";
+const char *msg_script_open = "Unable to open script file";
 struct all_jobs newjobs;
 char server_name[PBS_MAXSERVERNAME + 1];
 char *path_nodenote;
 struct all_jobs alljobs;
 char *path_queues;
 char path_log[MAXPATHLEN + 1];
-char *msg_init_nojobs = "No jobs to open";
+const char *msg_init_nojobs = "No jobs to open";
 tlist_head svr_newnodes;
-char *msg_err_malloc = "malloc failed";
+const char *msg_err_malloc = "malloc failed";
 int rpp_dbprt = 0;
 char *path_credentials;
-char *msg_init_badjob = "Recover of job %s failed";
+const char *msg_init_badjob = "Recover of job %s failed";
 char *path_nodes_new;
 resource_def *svr_resc_def;
 tlist_head svr_requests;
 attribute_def que_attr_def[10];
 int queue_rank = 0;
 char *path_spool;
-char *msg_init_abt = "Job aborted on PBS Server initialization";
-char *msg_init_noqueues = "No queues to open";
+const char *msg_init_abt = "Job aborted on PBS Server initialization";
+const char *msg_init_noqueues = "No queues to open";
 char *path_nodenote_new;
 char *path_svrdb = NULL;
 threadpool_t *request_pool;
-char *msg_init_baddb = "Unable to read server database";
+const char *msg_init_baddb = "Unable to read server database";
 struct server server;
-char *msg_init_substate = "Requeueing job, substate: %d ";
-char *msg_init_unkstate = "Unable to recover job in strange substate: %d";
+const char *msg_init_substate = "Requeueing job, substate: %d ";
+const char *msg_init_unkstate = "Unable to recover job in strange substate: %d";
 struct all_jobs array_summary;
 attribute_def svr_attr_def[10];
 int a_opt_init = -1;
@@ -86,13 +86,11 @@ int LOGLEVEL = 7; /* force logging code to be exercised as tests run */
 pthread_mutex_t *svr_requests_mutex = NULL;
 all_tasks task_list_event;
 char *path_svrdb_new;
-char *path_home = PBS_SERVER_HOME;
+const char *path_home = PBS_SERVER_HOME;
 char *acct_file = NULL;
-char *path_mom_hierarchy = "/dev/null";
+const char *path_mom_hierarchy = "/dev/null";
 pthread_mutex_t *svr_do_schedule_mutex;
 pthread_mutex_t *listener_command_mutex;
-pthread_mutex_t *acctfile_mutex;
-pthread_mutex_t *check_tasks_mutex;
 pthread_mutex_t *retry_routing_mutex;
 user_info_holder users;
 
@@ -139,7 +137,7 @@ int net_move(job *jobp, struct batch_request *req)
   exit(1);
   }
 
-void svr_mailowner(job *pjob, int mailpoint, int force, char *text)
+void svr_mailowner(job *pjob, int mailpoint, int force, const char *text)
   {
   fprintf(stderr, "The call to svr_mailowner needs to be mocked!!\n");
   exit(1);
@@ -209,7 +207,7 @@ char *pbs_get_server_list(void)
   exit(1);
   }
 
-int csv_length(char *csv_str)
+int csv_length(const char *csv_str)
   {
   fprintf(stderr, "The call to csv_length needs to be mocked!!\n");
   exit(1);
@@ -221,7 +219,7 @@ struct work_task *set_task(enum work_type type, long event_id, void (*func)(), v
   exit(1);
   }
 
-char *csv_nth(char *csv_str, int n)
+char *csv_nth(const char *csv_str, int n)
   {
   fprintf(stderr, "The call to csv_nth needs to be mocked!!\n");
   exit(1);
@@ -401,7 +399,7 @@ void free_arst(struct pbs_attribute *attr)
   exit(1);
   }
 
-int decode_arst_direct(struct pbs_attribute *patr,  char *val)
+int decode_arst_direct(struct pbs_attribute *patr,  const char *val)
   {
   fprintf(stderr, "The call to decode_arst_direct needs to be mocked!!\n");
   exit(1);
@@ -504,7 +502,7 @@ dynamic_string *get_dynamic_string(int initial_size, const char *str)
   return(NULL);
   }
 
-struct pbsnode *find_nodebyname(char *name)
+struct pbsnode *find_nodebyname(const char *name)
   {
   return(NULL);
   }
@@ -597,7 +595,7 @@ int insert_addr_name_info(
   return(0);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
@@ -631,3 +629,9 @@ job_array *get_array(
   {
   return(NULL);
   }
+
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
+  {
+  return(0);
+  }
+
diff --git a/src/server/test/pbsd_main/scaffolding.c b/src/server/test/pbsd_main/scaffolding.c
index 0cc617dfdc..0541be4721 100644
--- a/src/server/test/pbsd_main/scaffolding.c
+++ b/src/server/test/pbsd_main/scaffolding.c
@@ -20,17 +20,17 @@ hello_container failures;
 pthread_mutex_t *job_log_mutex;
 pthread_mutex_t *log_mutex;
 all_queues svr_queues;
-char *msg_daemonname = "unset";
-char *msg_startup2 = "Server Ready, pid = %d, loglevel=%d";
+const char *msg_daemonname = "unset";
+const char *msg_startup2 = "Server Ready, pid = %d, loglevel=%d";
 char pbs_current_user[PBS_MAXUSER];
-char *msg_svrdown = "Server shutdown completed";
-char *msg_info_server = "Torque Server Version = %s, loglevel = %d";
+const char *msg_svrdown = "Server shutdown completed";
+const char *msg_info_server = "Torque Server Version = %s, loglevel = %d";
 struct all_jobs alljobs;
 long *log_event_mask = NULL;
-char *msg_startup3 = "%s %s: %s mode and %s exist, \ndo you wish to continue y/(n)?";
+const char *msg_startup3 = "%s %s: %s mode and %s exist, \ndo you wish to continue y/(n)?";
 pbs_net_t pbs_server_addr;
 int listener_command = SCH_SCHEDULE_NULL;
-char *msg_startup1 = "Server %s started, initialization type = %d";
+const char *msg_startup1 = "Server %s started, initialization type = %d";
 int svr_chngNodesfile = 0; /* 1 signals want nodes file update */
 int svr_totnodes = 0; /* total number nodes defined */
 hello_container hellos;
@@ -75,7 +75,7 @@ char * netaddr(struct sockaddr_in *ap)
   exit(1);
   }
 
-int decode_b(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_b(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   fprintf(stderr, "The call to decode_b needs to be mocked!!\n");
   exit(1);
@@ -356,7 +356,7 @@ int unlock_node(struct pbsnode *pnode, const char *id, char *msg, int log_level)
   exit(1);
   }
 
-struct pbsnode *find_nodebyname(char *name)
+struct pbsnode *find_nodebyname(const char *name)
   {
   fprintf(stderr, "The call to find_nodebyname needs to be mocked!\n");
   exit(1);
@@ -486,7 +486,7 @@ void DIS_tcp_cleanup(struct tcp_chan *chan) {}
 
 void scheduler_close() {}
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
@@ -499,3 +499,8 @@ void *inspect_exiting_jobs(void *vp)
   {
   return(NULL);
   }
+
+ssize_t write_ac_socket(int fd, const void *buf, ssize_t count)
+  {
+  return(0);
+  }
diff --git a/src/server/test/process_alps_status/scaffolding.c b/src/server/test/process_alps_status/scaffolding.c
index c1af1d243e..eafc7995e3 100644
--- a/src/server/test/process_alps_status/scaffolding.c
+++ b/src/server/test/process_alps_status/scaffolding.c
@@ -38,7 +38,7 @@ all_nodes allnodes;
 struct node_state
   {
   short  bit;
-  char  *name;
+  const char  *name;
   } ns[] =
 
 {
@@ -97,7 +97,7 @@ int resize_if_needed(
     /* need to resize */
     difference = new_size - ds->size;
 
-    if ((tmp = realloc(ds->str, new_size)) == NULL)
+    if ((tmp = (char *)realloc(ds->str, new_size)) == NULL)
       return(ENOMEM);
 
     ds->str = tmp;
@@ -159,7 +159,7 @@ dynamic_string *get_dynamic_string(
   const char *str)          /* I (optional) */
 
   {
-  dynamic_string *ds = calloc(1, sizeof(dynamic_string));
+  dynamic_string *ds = (dynamic_string *)calloc(1, sizeof(dynamic_string));
 
   if (ds == NULL)
     return(ds);
@@ -169,7 +169,7 @@ dynamic_string *get_dynamic_string(
   else
     ds->size = DS_INITIAL_SIZE;
     
-  ds->str = calloc(1, ds->size);
+  ds->str = (char *)calloc(1, ds->size);
 
   if (ds->str == NULL)
     {
@@ -272,7 +272,7 @@ void update_node_state(
 
 struct pbsnode *find_nodebyname(
 
-  char *nodename) /* I */
+  const char *nodename) /* I */
 
   {
   static struct pbsnode pnode;
@@ -282,7 +282,7 @@ struct pbsnode *find_nodebyname(
     {
     memset(&pnode, 0, sizeof(struct pbsnode));
     pnode.nd_name = strdup("george");
-    pnode.alps_subnodes.allnodes_mutex = calloc(1, sizeof(pthread_mutex_t));
+    pnode.alps_subnodes.allnodes_mutex = (pthread_mutex_t*)calloc(1, sizeof(pthread_mutex_t));
     pthread_mutex_init(pnode.alps_subnodes.allnodes_mutex, NULL);
     }
 
@@ -517,7 +517,7 @@ int mgr_set_node_attr(
 
 
 /* nothing needed for this function */
-int decode_arst(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_arst(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   return(0);
   }  /* END decode_arst() */
@@ -696,7 +696,7 @@ int str_nc_cmp(
 int find_attr(
 
     struct attribute_def *attr_def, /* ptr to pbs_attribute definitions */
-    char                 *name,     /* pbs_attribute name to find */
+    const char          *name,     /* pbs_attribute name to find */
     int                   limit)    /* limit on size of def array */
 
   {
@@ -911,7 +911,7 @@ int set_arst(
 
         nsize += nsize / 2;   /* alloc extra space */
 
-        if (!(pas->as_buf = calloc(1, (size_t)nsize)))
+        if (!(pas->as_buf = (char *)calloc(1, (size_t)nsize)))
           {
           pas->as_bufsize = 0;
 
@@ -942,12 +942,12 @@ int set_arst(
 
         if (pas->as_buf)
           {
-          pc = realloc(pas->as_buf, (size_t)need);
+          pc = (char *)realloc(pas->as_buf, (size_t)need);
           if (pc != NULL)
             memset(pc + pas->as_bufsize, 0, need - pas->as_bufsize);
           }
         else
-          pc = calloc(1, (size_t)need);
+          pc = (char *)calloc(1, (size_t)need);
 
         if (pc == NULL)
           {
@@ -1044,7 +1044,7 @@ int set_arst(
       tmp_arst->as_bufsize = need;
 
       /* calloc the buffer size */
-      pc = calloc(1, need);
+      pc = (char *)calloc(1, need);
 
       if (pc == NULL)
         return(PBSE_SYSTEM);
@@ -1516,7 +1516,7 @@ int initialize_pbsnode(
   pnode->nd_mutex = (pthread_mutex_t *)calloc(1, sizeof(pthread_mutex_t));
   if (pnode->nd_mutex == NULL)
     {
-    log_err(ENOMEM, __func__, (char *)"Could not allocate memory for the node's mutex");
+    log_err(ENOMEM, __func__, "Could not allocate memory for the node's mutex");
 
     return(ENOMEM);
     }
@@ -1551,7 +1551,7 @@ int check_and_resize(
   resizable_array *ra)
 
   {
-  static char *id = "check_and_resize";
+  static const char *id = "check_and_resize";
   slot        *tmp;
   size_t       remaining;
   size_t       size;
@@ -1561,7 +1561,7 @@ int check_and_resize(
     /* double the size if we're out of space */
     size = (ra->max * 2) * sizeof(slot);
 
-    if ((tmp = realloc(ra->slots,size)) == NULL)
+    if ((tmp = (slot *)realloc(ra->slots,size)) == NULL)
       {
       log_err(ENOMEM,id, (char *)"No memory left to resize the array");
       return(ENOMEM);
@@ -1646,7 +1646,7 @@ int comp_null(struct pbs_attribute *attr, struct pbs_attribute *with)
   return(0);
   }
 
-int decode_ntype(pbs_attribute *pattr, const char *name, char *rescn, char *val, int perm)
+int decode_ntype(pbs_attribute *pattr, const char *name, const char *rescn, const char *val, int perm)
   {
   return(0);
   }
@@ -1661,7 +1661,7 @@ int encode_str(pbs_attribute *attr, tlist_head *phead, const char *atname, const
   return(0);
   }
 
-int decode_null(pbs_attribute *patr, const char *name, char *rn, char *val, int perm)
+int decode_null(pbs_attribute *patr, const char *name, const char *rn, const char *val, int perm)
   {
   return(0);
   }
@@ -1807,7 +1807,7 @@ int get_hash(
 
   {
   /* since key is a job name, just get the numbers from the front */
-  size_t   len = strlen(key);
+  size_t   len = strlen((char *)key);
   uint32_t hash;
   uint32_t mask = 0;
   uint32_t counter = ht->size >> 1;
@@ -1832,7 +1832,7 @@ void add_to_bucket(
   if (buckets[index] == NULL)
     {
     /* empty bucket, just add it here */
-    buckets[index] = calloc(1, sizeof(bucket));
+    buckets[index] = (bucket *)calloc(1, sizeof(bucket));
     buckets[index]->value = value;
     buckets[index]->key   = key;
     buckets[index]->next  = NULL;
@@ -1845,7 +1845,7 @@ void add_to_bucket(
     while (b->next != NULL)
       b = b->next;
 
-    b->next = calloc(1, sizeof(bucket));
+    b->next = (bucket *)calloc(1, sizeof(bucket));
     b->next->value = value;
     b->next->key   = key;
     b->next->next  = NULL;
@@ -1894,7 +1894,7 @@ int add_hash(hash_table_t *ht, int value, void *key)
     int      old_bucket_size = ht->size;
     int      new_bucket_size = ht->size * 2;
     size_t   amount = new_bucket_size * sizeof(bucket *);
-    bucket **tmp = calloc(1, amount);
+    bucket **tmp = (bucket **)calloc(1, amount);
     int      i;
     int      new_index;
 
@@ -1924,7 +1924,7 @@ int add_hash(hash_table_t *ht, int value, void *key)
 
   index = get_hash(ht,key);
 
-  add_to_bucket(ht->buckets,index,key,value);
+  add_to_bucket(ht->buckets,index,(char *)key,value);
 
   ht->num++;
 
@@ -2006,7 +2006,7 @@ char *parse_comma_string(
   return(rv);
   }  /* END parse_comma_string() */
 
-int decode_str(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_str(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   return(0);
   }
@@ -2031,7 +2031,7 @@ int set_note_str(struct pbs_attribute *attr, struct pbs_attribute *new_attr, enu
   return(0);
   }
 
-int decode_state(pbs_attribute *pattr, const char *name, char *rescn, char *val, int perm)
+int decode_state(pbs_attribute *pattr, const char *name, const char *rescn, const char *val, int perm)
   {
   return(0);
   }
@@ -2103,7 +2103,7 @@ int node_numa_action(pbs_attribute *new_attr, void *pnode, int actmode)
   return(0);
   }
 
-int decode_l( pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_l( pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   return(0);
   }
@@ -2150,7 +2150,7 @@ job *svr_find_job(char *jobid, int get_subjob)
 
   if (i == 0)
     {
-    pjob.ji_mutex = calloc(1, sizeof(pthread_mutex_t));
+    pjob.ji_mutex = (pthread_mutex_t*)calloc(1, sizeof(pthread_mutex_t));
     }
   i++;
 
@@ -2254,7 +2254,7 @@ int enqueue_threadpool_request(
   return(0);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/process_mom_update/scaffolding.c b/src/server/test/process_mom_update/scaffolding.c
index 3b126e143c..8ed148a317 100644
--- a/src/server/test/process_mom_update/scaffolding.c
+++ b/src/server/test/process_mom_update/scaffolding.c
@@ -70,7 +70,7 @@ int unlock_ji_mutex(
 
   job        *pjob,
   const char *id,
-  char       *msg,
+  const char *msg,
   int        logging)
   
   {
@@ -135,7 +135,7 @@ void update_node_state(
 
 struct pbsnode *find_nodebyname(
 
-  char *nodename) /* I */
+  const char *nodename) /* I */
 
   {
   return(NULL);
@@ -199,8 +199,8 @@ int decode_arst(
 
   pbs_attribute *patr,    /* O (modified) */
   const char   *name,    /* I pbs_attribute name (notused) */
-  char          *rescn,   /* I resource name (notused) */
-  char          *val,     /* I pbs_attribute value */
+  const char *rescn,   /* I resource name (notused) */
+  const char    *val,     /* I pbs_attribute value */
   int            perm) /* only used for resources */
 
   {
diff --git a/src/server/test/process_request/scaffolding.c b/src/server/test/process_request/scaffolding.c
index f9903426f9..6a0fdb0a19 100644
--- a/src/server/test/process_request/scaffolding.c
+++ b/src/server/test/process_request/scaffolding.c
@@ -13,12 +13,12 @@
 #include "pbs_nodes.h" /* pbsnode */
 #include "attribute.h" /* pbs_attribute */
 
-char *msg_err_noqueue = "Unable to requeue job, queue is not defined";
+const char *msg_err_noqueue = "Unable to requeue job, queue is not defined";
 struct credential conn_credent[PBS_NET_MAX_CONNECTIONS];
 char server_name[PBS_MAXSERVERNAME + 1];
-char *msg_err_malloc = "malloc failed";
+const char *msg_err_malloc = "malloc failed";
 struct connection svr_conn[PBS_NET_MAX_CONNECTIONS];
-char *msg_request = "Type %s request received from %s@%s, sock=%d";
+const char *msg_request = "Type %s request received from %s@%s, sock=%d";
 struct server server;
 char *server_host;
 int LOGLEVEL = 7; /* force logging code to be exercised as tests run */
@@ -277,7 +277,7 @@ void *req_locatejob(void *vp)
   exit(1);
   }
 
-char * csv_find_string(char *csv_str, char *search_str)
+char * csv_find_string(const char *csv_str, const char *search_str)
   {
   fprintf(stderr, "The call to csv_find_string needs to be mocked!!\n");
   exit(1);
@@ -475,7 +475,7 @@ int remove_batch_request(
   return(0);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/queue_func/scaffolding.c b/src/server/test/queue_func/scaffolding.c
index d7502c1f2e..bec0c206af 100644
--- a/src/server/test/queue_func/scaffolding.c
+++ b/src/server/test/queue_func/scaffolding.c
@@ -10,7 +10,7 @@
 #include "pbs_job.h" /* job */
 #include "user_info.h"
 
-char *msg_err_unlink = "Unlink of %s file %s failed";
+const char *msg_err_unlink = "Unlink of %s file %s failed";
 all_queues svr_queues;
 attribute_def que_attr_def[10];
 struct server server;
@@ -113,7 +113,7 @@ int lock_sv_qs_mutex(pthread_mutex_t *sv_qs_mutex, const char *msg_string)
   return(0);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/queue_recov/scaffolding.c b/src/server/test/queue_recov/scaffolding.c
index 8ad6b0eda4..e845755999 100644
--- a/src/server/test/queue_recov/scaffolding.c
+++ b/src/server/test/queue_recov/scaffolding.c
@@ -64,3 +64,8 @@ int save_attr_xml(struct attribute_def *padef, struct pbs_attribute *pattr, int
   fprintf(stderr, "The call to save_attr_xml needs to be mocked!!\n");
   exit(1);
   }
+
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
+  {
+  return(0);
+  }
diff --git a/src/server/test/receive_mom_communication/scaffolding.c b/src/server/test/receive_mom_communication/scaffolding.c
index 8af4eb969b..89c2f56b1a 100644
--- a/src/server/test/receive_mom_communication/scaffolding.c
+++ b/src/server/test/receive_mom_communication/scaffolding.c
@@ -115,7 +115,7 @@ unsigned long disrul(
 
 struct pbsnode *find_nodebyname(
 
-  char *nodename) /* I */
+  const char *nodename) /* I */
 
   {
   return(NULL);
diff --git a/src/server/test/reply_send/scaffolding.c b/src/server/test/reply_send/scaffolding.c
index 90194f9323..bbda15ea6c 100644
--- a/src/server/test/reply_send/scaffolding.c
+++ b/src/server/test/reply_send/scaffolding.c
@@ -7,7 +7,7 @@
 #include "batch_request.h" /* batach_request */
 #include "list_link.h" /* list_link */
 
-char *msg_daemonname = "unset";
+const char *msg_daemonname = "unset";
 int LOGLEVEL = 7; /* force logging code to be exercised as tests run */
 all_tasks task_list_event;
 
diff --git a/src/server/test/req_delete/scaffolding.c b/src/server/test/req_delete/scaffolding.c
index c966262ecc..c018408d5d 100644
--- a/src/server/test/req_delete/scaffolding.c
+++ b/src/server/test/req_delete/scaffolding.c
@@ -12,12 +12,12 @@
 #include "node_func.h" /* node_info */
 
 
-char *msg_deletejob = "Job deleted";
+const char *msg_deletejob = "Job deleted";
 struct all_jobs alljobs;
-char *msg_delrunjobsig = "Job sent signal %s on delete";
+const char *msg_delrunjobsig = "Job sent signal %s on delete";
 struct server server;
+const char *msg_manager = "%s at request of %s@%s";
 int LOGLEVEL = 7; /* force logging code to be exercised as tests run */
-char *msg_manager = "%s at request of %s@%s";
 
 
 struct batch_request *alloc_br(int type)
@@ -56,7 +56,7 @@ void chk_job_req_permissions(job **pjob_ptr, struct batch_request *preq)
   exit(1);
   }
 
-void svr_mailowner(job *pjob, int mailpoint, int force, char *text)
+void svr_mailowner(job *pjob, int mailpoint, int force, const char *text)
   {
   fprintf(stderr, "The call to svr_mailowner needs to be mocked!!\n");
   exit(1);
@@ -228,7 +228,7 @@ int get_batch_request_id(
   return(0);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/req_deletearray/scaffolding.c b/src/server/test/req_deletearray/scaffolding.c
index e223ed0b64..88eec8ce1b 100644
--- a/src/server/test/req_deletearray/scaffolding.c
+++ b/src/server/test/req_deletearray/scaffolding.c
@@ -10,7 +10,7 @@
 #include "queue.h" /* pbs_queue */
 #include "array.h" /* job_array */
 
-char *msg_permlog = "Unauthorized Request, request type: %d, Object: %s, Name: %s, request from: %s@%s";
+const char *msg_permlog = "Unauthorized Request, request type: %d, Object: %s, Name: %s, request from: %s@%s";
 struct server server;
 int LOGLEVEL = 7; /* force logging code to be exercised as tests run */
 
@@ -169,7 +169,7 @@ int get_batch_request_id(
   return(0);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/req_getcred/scaffolding.c b/src/server/test/req_getcred/scaffolding.c
index a24c42406a..4fe407a513 100644
--- a/src/server/test/req_getcred/scaffolding.c
+++ b/src/server/test/req_getcred/scaffolding.c
@@ -33,3 +33,13 @@ void req_reject(int code, int aux, struct batch_request *preq, const char *HostN
   fprintf(stderr, "The call to req_reject needs to be mocked!!\n");
   exit(1);
   }
+
+ssize_t write_ac_socket(int fd, const void *buf, ssize_t count)
+  {
+  return(0);
+  }
+
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
+  {
+  return(0);
+  }
diff --git a/src/server/test/req_holdarray/scaffolding.c b/src/server/test/req_holdarray/scaffolding.c
index cd1331acb7..d96ebb0f2e 100644
--- a/src/server/test/req_holdarray/scaffolding.c
+++ b/src/server/test/req_holdarray/scaffolding.c
@@ -8,7 +8,7 @@
 #include "attribute.h" /* pbs_attribute */
 #include "pbs_job.h" /* job */
 
-char *msg_permlog = "Unauthorized Request, request type: %d, Object: %s, Name: %s, request from: %s@%s";
+const char *msg_permlog = "Unauthorized Request, request type: %d, Object: %s, Name: %s, request from: %s@%s";
 int LOGLEVEL=0;
 
 int svr_authorize_req(struct batch_request *preq, char *owner, char *submit_host)
@@ -53,7 +53,7 @@ int chk_hold_priv(long val, int perm)
   exit(1);
   }
 
-char * csv_find_string(char *csv_str, char *search_str)
+char * csv_find_string(const char *csv_str, const char *search_str)
   {
   fprintf(stderr, "The call to csv_find_string to be mocked!!\n");
   exit(1);
@@ -82,7 +82,7 @@ job *svr_find_job(char *jobid, int get_subjob)
   return(NULL);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/req_holdjob/scaffolding.c b/src/server/test/req_holdjob/scaffolding.c
index b5f3b61a09..fd0f8242e4 100644
--- a/src/server/test/req_holdjob/scaffolding.c
+++ b/src/server/test/req_holdjob/scaffolding.c
@@ -11,10 +11,10 @@
 
 int LOGLEVEL = 7; /* force logging code to be exercised as tests run */
 attribute_def job_attr_def[10];
-char *msg_jobholdrel = "Holds %s released at request of %s@%s";
-char *msg_mombadhold = "MOM rejected hold request: %d";
-char *msg_postmomnojob = "Job not found after hold reply from MOM";
-char *msg_jobholdset = "Holds %s set at request of %s@%s";
+const char *msg_jobholdrel = "Holds %s released at request of %s@%s";
+const char *msg_mombadhold = "MOM rejected hold request: %d";
+const char *msg_postmomnojob = "Job not found after hold reply from MOM";
+const char *msg_jobholdset = "Holds %s set at request of %s@%s";
 
 void account_record(int acctype, job *pjob, char *text)
   {
@@ -70,7 +70,7 @@ void *get_next(list_link pl, char *file, int line)
   exit(1);
   }
 
-char * csv_find_string(char *csv_str, char *search_str)
+char * csv_find_string(const char *csv_str, const char *search_str)
   {
   fprintf(stderr, "The call to csv_find_string to be mocked!!\n");
   exit(1);
@@ -133,7 +133,7 @@ int get_batch_request_id(
   return(0);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/req_jobobit/scaffolding.c b/src/server/test/req_jobobit/scaffolding.c
index 8388bbd957..829bb73179 100644
--- a/src/server/test/req_jobobit/scaffolding.c
+++ b/src/server/test/req_jobobit/scaffolding.c
@@ -22,34 +22,40 @@
 
 
 
-char *msg_momnoexec2 = "Job cannot be executed\nSee job standard error file";
-char *msg_job_end_sig = "Terminated on signal %d";
-char *msg_obitnojob  = "Job Obit notice received from %s has error %d";
+const char *msg_momnoexec2 = "Job cannot be executed\nSee job standard error file";
+const char *msg_job_end_sig = "Terminated on signal %d";
+const char *msg_obitnojob  = "Job Obit notice received from %s has error %d";
 attribute_def job_attr_def[10];
-char *msg_obitnocpy = "Post job file processing error; job %s on host %s";
+const char *msg_obitnocpy = "Post job file processing error; job %s on host %s";
 int   server_init_type = RECOV_WARM;
 char *path_spool;
-char *msg_init_abt = "Job aborted on PBS Server initialization";
+const char *msg_init_abt = "Job aborted on PBS Server initialization";
 pbs_net_t pbs_server_addr;
 const char *PJobState[] = {"hi", "hello"};
 struct server server;
 int  svr_do_schedule = SCH_SCHEDULE_NULL;
 int listener_command = SCH_SCHEDULE_NULL;
 int LOGLEVEL = 10;
-char *msg_obitnodel = "Unable to delete files for job %s, on host %s";
-char *msg_momnoexec1 = "Job cannot be executed\nSee Administrator for help";
-char *msg_job_end_stat = "Exit_status=%d";
-char *msg_momjoboverlimit = "Job exceeded some resource limit (walltime, mem, etc.). Job was aborted\nSee Administrator for help";
+const char *msg_obitnodel = "Unable to delete files for job %s, on host %s";
+const char *msg_momnoexec1 = "Job cannot be executed\nSee Administrator for help";
+const char *msg_job_end_stat = "Exit_status=%d";
+const char *msg_momjoboverlimit = "Job exceeded some resource limit (walltime, mem, etc.). Job was aborted\nSee Administrator for help";
 pthread_mutex_t *svr_do_schedule_mutex;
 pthread_mutex_t *listener_command_mutex;
+extern int alloc_br_null;
 
 
 
 
 struct batch_request *alloc_br(int type)
   {
-  batch_request *preq = calloc(1, sizeof(batch_request));
+  batch_request *preq;
+  if (alloc_br_null)
+    return(NULL);
+
+  preq = (batch_request *)calloc(1, sizeof(batch_request));
   preq->rq_type = type;
+
   return(preq);
   }
 
@@ -61,8 +67,7 @@ job_array *get_jobs_array(job **pjob)
 
 char *parse_servername(char *name, unsigned int *service)
   {
-  fprintf(stderr, "The call to parse_servername to be mocked!!\n");
-  exit(1);
+  return(strdup(name));
   }
 
 int job_save(job *pjob, int updatetype, int mom_port)
@@ -77,7 +82,7 @@ int svr_job_purge(job *pjob)
   exit(1);
   }
 
-void svr_mailowner(job *pjob, int mailpoint, int force, char *text) {}
+void svr_mailowner(job *pjob, int mailpoint, int force, const char *text) {}
 
 int modify_job_attr(job *pjob, svrattrl *plist, int perm, int *bad)
   {
@@ -87,20 +92,18 @@ int modify_job_attr(job *pjob, svrattrl *plist, int perm, int *bad)
 
 pbs_net_t get_hostaddr(int *local_errno, char *hostname)
   {
-  fprintf(stderr, "The call to get_hostaddr to be mocked!!\n");
-  exit(1);
+  return(0);
   }
 
 long attr_ifelse_long(pbs_attribute *attr1, pbs_attribute *attr2, long deflong)
   {
-  fprintf(stderr, "The call to attr_ifelse_long to be mocked!!\n");
-  exit(1);
+  return(0);
   }
 
 pbs_queue *get_jobs_queue(job **pjob)
   {
-  fprintf(stderr, "The call to get_jobs_queue to be mocked!!\n");
-  exit(1);
+  static pbs_queue bob;
+  return(&bob);
   }
 
 void reply_ack(struct batch_request *preq)
@@ -123,11 +126,7 @@ void release_req(struct work_task *pwt)
 
 void free_nodes(node_info **ninfo_arr) {}
 
-void free_br(struct batch_request *preq)
-  {
-  fprintf(stderr, "The call to free_br to be mocked!!\n");
-  exit(1);
-  }
+void free_br(struct batch_request *preq) {}
 
 void remove_job_delete_nanny( struct job *pjob)
   {
@@ -172,8 +171,7 @@ void *get_next(list_link pl, char *file, int line)
 
 int issue_Drequest(int conn, struct batch_request *request, void (*func)(struct work_task *), struct work_task **ppwt)
   {
-  fprintf(stderr, "The call to issue_Drequest to be mocked!!\n");
-  exit(1);
+  return(0);
   }
 
 void set_resc_assigned(job *pjob, enum batch_op op) {}
@@ -186,14 +184,30 @@ void update_array_values(job_array *pa, int old_state, enum ArrayEventsEnum even
 
 void append_link(tlist_head *head, list_link *new_link, void *pobj)
   {
-  fprintf(stderr, "The call to append_link to be mocked!!\n");
-  exit(1);
+  if (pobj != NULL)
+    {
+    new_link->ll_struct = pobj;
+    }
+  else
+    {
+    /* WARNING: This mixes list_link pointers and ll_struct
+         pointers, and may break if the list_link we are operating
+         on is not the first embeded list_link in the surrounding
+         structure, e.g. work_task.wt_link_obj */
+
+    new_link->ll_struct = (void *)new_link;
+    }
+
+  new_link->ll_prior = head->ll_prior;
+
+  new_link->ll_next  = head;
+  head->ll_prior = new_link;
+  new_link->ll_prior->ll_next = new_link; /* now visible to forward iteration */
   }
 
 int svr_connect(pbs_net_t hostaddr, unsigned int port, struct pbsnode *pnode, void *(*func)(void *), enum conn_type cntype)
   {
-  fprintf(stderr, "The call to svr_connect to be mocked!!\n");
-  exit(1);
+  return(1);
   }
 
 void issue_track(job *pjob)
@@ -222,8 +236,7 @@ int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *
 
 int unlock_queue(struct pbs_queue *the_queue, const char *method_name, char *msg, int logging)
   {
-  fprintf(stderr, "The call to unlock_queue to be mocked!!\n");
-  exit(1);
+  return(0);
   }
 
 void svr_evaljobstate(job *pjob, int *newstate, int *newsub, int forceeval)
@@ -240,8 +253,7 @@ int insert_task(all_tasks *at, work_task *wt)
 
 void get_jobowner(char *from, char *to)
   {
-  fprintf(stderr, "The call to get_jobowner to be mocked!!\n");
-  exit(1);
+  strcpy(to, "dbeer");
   }
 
 
@@ -283,7 +295,7 @@ int get_batch_request_id(
   return(0);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
@@ -295,7 +307,7 @@ int lock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
 
 struct pbsnode *find_nodebyname(
 
-  char *nodename) /* I */
+  const char *nodename) /* I */
 
   {
   return(NULL);
diff --git a/src/server/test/req_jobobit/test_req_jobobit.c b/src/server/test/req_jobobit/test_req_jobobit.c
index 895de5049d..0ffb6418d1 100644
--- a/src/server/test/req_jobobit/test_req_jobobit.c
+++ b/src/server/test/req_jobobit/test_req_jobobit.c
@@ -1,6 +1,7 @@
 #include "license_pbs.h" /* See here for the software license */
 #include <stdlib.h>
 #include <stdio.h>
+#include <pthread.h>
 
 #include "pbs_job.h"
 #include "req_jobobit.h"
@@ -8,20 +9,30 @@
 #include "pbs_error.h"
 #include "batch_request.h"
 #include "sched_cmds.h"
+#include "server.h"
 
 
-char *setup_from(job *pjob, char *suffix);
+char *setup_from(job *pjob, const char *suffix);
 int   is_joined(job *pjob, enum job_atr ati);
 batch_request *return_stdfile(batch_request *preq, job *pjob, enum job_atr ati);
 void rel_resc(job *pjob);
 int handle_exiting_or_abort_substate(job *pjob);
 int setrerun(job *pjob);
+batch_request *setup_cpyfiles(batch_request *preq, job *pjob, char *from, char *to, int direction, int tflag);
+int handle_returnstd(job *pjob, batch_request *preq, int type);
 
 extern pthread_mutex_t *svr_do_schedule_mutex;
 extern pthread_mutex_t *listener_command_mutex;
 extern int svr_do_schedule;
 extern int listener_command;
+int alloc_br_null;
+extern struct server server;
 
+void init_server()
+  {
+  server.sv_attr_mutex = calloc(1, sizeof(pthread_mutex_t));
+  pthread_mutex_init(server.sv_attr_mutex, NULL);
+  }
 
 
 START_TEST(setup_from_test)
@@ -146,6 +157,52 @@ END_TEST
 
 
 
+START_TEST(setup_cpyfiles_test)
+  {
+  job           *pjob = calloc(1, sizeof(job));
+  batch_request *preq;
+  alloc_br_null = 1;
+  fail_unless(setup_cpyfiles(NULL, pjob, strdup("from"), strdup("to"), 1, 1) == NULL);
+  alloc_br_null = 0;
+
+  strcpy(pjob->ji_qs.ji_jobid, "1.napali");
+  preq = setup_cpyfiles(NULL, pjob, strdup("from"), strdup("to"), 1, 1);
+  fail_unless(preq != NULL);
+
+  pjob->ji_wattr[JOB_ATR_egroup].at_val.at_str = strdup("dbeer");
+  preq = setup_cpyfiles(NULL, pjob, strdup("from"), strdup("to"), 1, 1);
+
+  preq = setup_cpyfiles(preq, pjob, strdup("from"), strdup("to"), 1, 1);
+  fail_unless(preq != NULL);
+  }
+END_TEST
+
+
+
+
+START_TEST(handle_returnstd_test)
+  {
+  batch_request *preq;
+  job           *pjob;
+
+  pjob = calloc(1, sizeof(job));
+  preq = calloc(1, sizeof(batch_request));
+
+  strcpy(pjob->ji_qs.ji_jobid, "1.napali");
+  strcpy(pjob->ji_qs.ji_fileprefix, "1.napali");
+  
+  fail_unless(handle_returnstd(pjob, preq, WORK_Immed) == PBSE_JOB_FILE_CORRUPT);
+  
+  pjob->ji_wattr[JOB_ATR_exec_host].at_val.at_str = strdup("napali/0");
+  fail_unless(handle_returnstd(pjob, preq, WORK_Deferred_Reply) == PBSE_NONE);
+  
+  fail_unless(handle_returnstd(pjob, preq, WORK_Immed) == PBSE_NONE);
+  }
+END_TEST
+
+
+
+
 Suite *req_jobobit_suite(void)
   {
   Suite *s = suite_create("req_jobobit_suite methods");
@@ -173,6 +230,14 @@ Suite *req_jobobit_suite(void)
   tcase_add_test(tc_core, setrerun_test);
   suite_add_tcase(s, tc_core);
 
+  tc_core = tcase_create("setup_cpyfiles_test");
+  tcase_add_test(tc_core, setup_cpyfiles_test);
+  suite_add_tcase(s, tc_core);
+
+  tc_core = tcase_create("handle_returnstd_test");
+  tcase_add_test(tc_core, handle_returnstd_test);
+  suite_add_tcase(s, tc_core);
+
   return(s);
   }
 
@@ -184,6 +249,7 @@ int main(void)
   {
   int number_failed = 0;
   SRunner *sr = NULL;
+  init_server();
   rundebug();
   sr = srunner_create(req_jobobit_suite());
   srunner_set_log(sr, "req_jobobit_suite.log");
diff --git a/src/server/test/req_locate/scaffolding.c b/src/server/test/req_locate/scaffolding.c
index 4719eefd1b..a1c2ca1afb 100644
--- a/src/server/test/req_locate/scaffolding.c
+++ b/src/server/test/req_locate/scaffolding.c
@@ -29,7 +29,7 @@ job *svr_find_job(char *jobid, int get_subjob)
   }
 
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/req_manager/scaffolding.c b/src/server/test/req_manager/scaffolding.c
index c713fed2e8..9e632c49f8 100644
--- a/src/server/test/req_manager/scaffolding.c
+++ b/src/server/test/req_manager/scaffolding.c
@@ -16,19 +16,19 @@ all_nodes allnodes;
 int svr_resc_size = 0;
 int disable_timeout_check = 1;
 all_queues svr_queues;
-char *msg_daemonname = "unset";
-char *msg_man_del = "deleted";
-char *msg_attrtype = "Warning: type of queue %s incompatible with attribute %s";
-char *msg_man_cre = "created";
-char *msg_man_set = "attributes set: ";
-char *msg_manager = "%s at request of %s@%s";
-char *msg_man_uns = "attributes unset: ";
+const char *msg_daemonname = "unset";
+const char *msg_man_del = "deleted";
+const char *msg_attrtype = "Warning: type of queue %s incompatible with attribute %s";
+const char *msg_man_cre = "created";
+const char *msg_man_set = "attributes set: ";
+const char *msg_manager = "%s at request of %s@%s";
+const char *msg_man_uns = "attributes unset: ";
 char server_name[PBS_MAXSERVERNAME + 1];
 resource_def *svr_resc_def;
 attribute_def que_attr_def[10];
 attribute_def node_attr_def[2];
 struct server server;
-char *array_disallowed_types[] = {"hi", "hello"};
+const char *array_disallowed_types[] = {"hi", "hello"};
 attribute_def svr_attr_def[10];
 int LOGLEVEL = 7; /* force logging code to be exercised as tests run */
 int svr_chngNodesfile = 0;
@@ -83,7 +83,7 @@ int chk_characteristic(struct pbsnode *pnode, node_check_info *nci, int *pneed_t
   exit(1);
   }
 
-struct pbsnode *find_nodebyname(char *nodename)
+struct pbsnode *find_nodebyname(const char *nodename)
   {
   fprintf(stderr, "The call to find_nodebyname to be mocked!!\n");
   exit(1);
@@ -113,7 +113,7 @@ int unlock_node(struct pbsnode *the_node, const char *id, char *msg, int logging
   exit(1);
   }
 
-int find_attr(struct attribute_def *attr_def, char *name, int limit)
+int find_attr(struct attribute_def *attr_def, const char *name, int limit)
   {
   fprintf(stderr, "The call to find_attr to be mocked!!\n");
   exit(1);
diff --git a/src/server/test/req_message/scaffolding.c b/src/server/test/req_message/scaffolding.c
index 2ccd4f2c4e..9364c96f44 100644
--- a/src/server/test/req_message/scaffolding.c
+++ b/src/server/test/req_message/scaffolding.c
@@ -6,7 +6,7 @@
 #include "pbs_job.h" /* job */
 #include "work_task.h" /* work_task */
 
-char *msg_messagejob = "Message request to job status %d";
+const char *msg_messagejob = "Message request to job status %d";
 int LOGLEVEL = 7; /* force logging code to be exercised as tests run */
 
 void reply_ack(struct batch_request *preq)
@@ -56,7 +56,7 @@ int get_batch_request_id(
   return(0);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/req_modify/scaffolding.c b/src/server/test/req_modify/scaffolding.c
index 28a0f1e0a7..f08c4c0f89 100644
--- a/src/server/test/req_modify/scaffolding.c
+++ b/src/server/test/req_modify/scaffolding.c
@@ -15,9 +15,9 @@
 
 const char *PJobSubState[10];
 int svr_resc_size = 0;
-char *msg_mombadmodify = "MOM rejected modify request, error: %d";
-char *msg_jobmod = "Job Modified";
-char *msg_manager = "%s at request of %s@%s";
+const char *msg_mombadmodify = "MOM rejected modify request, error: %d";
+const char *msg_jobmod = "Job Modified";
+const char *msg_manager = "%s at request of %s@%s";
 attribute_def job_attr_def[10];
 resource_def *svr_resc_def;
 const char *PJobState[] = {"hi", "hello"};
@@ -72,7 +72,7 @@ struct work_task *set_task(enum work_type type, long event_id, void (*func)(), v
   exit(1);
   }
 
-int find_attr(struct attribute_def *attr_def, char *name, int limit)
+int find_attr(struct attribute_def *attr_def, const char *name, int limit)
   {
   fprintf(stderr, "The call to find_attr to be mocked!!\n");
   exit(1);
@@ -248,7 +248,7 @@ int get_batch_request_id(
   return(0);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/req_movejob/scaffolding.c b/src/server/test/req_movejob/scaffolding.c
index 903406ba76..117d0c570e 100644
--- a/src/server/test/req_movejob/scaffolding.c
+++ b/src/server/test/req_movejob/scaffolding.c
@@ -6,9 +6,9 @@
 #include "batch_request.h" /* batch_request */
 #include "queue.h" /* pbs_queue */
 
-char *pbs_o_host = "PBS_O_HOST";
-char *msg_movejob = "Job moved to ";
-char *msg_manager = "%s at request of %s@%s";
+const char *pbs_o_host = "PBS_O_HOST";
+const char *msg_movejob = "Job moved to ";
+const char *msg_manager = "%s at request of %s@%s";
 int LOGLEVEL = 7; /* force logging code to be exercised as tests run */
 
 int job_save(job *pjob, int updatetype, int mom_port)
@@ -97,7 +97,7 @@ job *svr_find_job(
   return(NULL);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/req_quejob/scaffolding.c b/src/server/test/req_quejob/scaffolding.c
index 22ba13a296..4a6c4475b5 100644
--- a/src/server/test/req_quejob/scaffolding.c
+++ b/src/server/test/req_quejob/scaffolding.c
@@ -16,20 +16,20 @@
 
 const char *PJobSubState[10];
 char *path_jobs;
-char *msg_script_write = "Unable to write script file";
+const char *msg_script_write = "Unable to write script file";
 int svr_resc_size = 0;
 attribute_def job_attr_def[10];
-char *msg_script_open = "Unable to open script file";
-char *msg_jobnew = "Job Queued at request of %s@%s, owner = %s, job name = %s, queue = %s";
+const char *msg_script_open = "Unable to open script file";
+const char *msg_jobnew = "Job Queued at request of %s@%s, owner = %s, job name = %s, queue = %s";
 struct all_jobs newjobs;
 char server_name[PBS_MAXSERVERNAME + 1];
-char *pbs_o_host = "PBS_O_HOST";
+const char *pbs_o_host = "PBS_O_HOST";
 resource_def *svr_resc_def;
 int queue_rank = 0;
 char *path_spool;
 struct server server;
+const char *msg_daemonname = "unset";
 int LOGLEVEL = 7; /* force logging code to be exercised as tests run */
-char *msg_daemonname = "unset";
 user_info_holder users;
 
 
@@ -105,7 +105,7 @@ struct work_task *set_task(enum work_type type, long event_id, void (*func)(), v
   exit(1);
   }
 
-char * csv_find_value(char *csv_str, char *search_str)
+char * csv_find_value(const char *csv_str, char *search_str)
   {
   fprintf(stderr, "The call to csv_find_value to be mocked!!\n");
   exit(1);
@@ -123,13 +123,13 @@ int insert_job(struct all_jobs *aj, job *pjob)
   exit(1);
   }
 
-int find_attr(struct attribute_def *attr_def, char *name, int limit)
+int find_attr(struct attribute_def *attr_def, const char *name, int limit)
   {
   fprintf(stderr, "The call to find_attr to be mocked!!\n");
   exit(1);
   }
 
-int decode_resc(struct pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_resc(struct pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   fprintf(stderr, "The call to decode_resc to be mocked!!\n");
   exit(1);
@@ -346,7 +346,7 @@ int lock_queue(
   return(0);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
@@ -360,3 +360,8 @@ int  increment_queued_jobs(user_info_holder *uih, char *user_name, job *pjob)
   {
   return(0);
   }
+
+ssize_t write_ac_socket(int fd, const void *buf, ssize_t count)
+  {
+  return(0);
+  }
diff --git a/src/server/test/req_register/scaffolding.c b/src/server/test/req_register/scaffolding.c
index 30f01abe15..b75fd476c0 100644
--- a/src/server/test/req_register/scaffolding.c
+++ b/src/server/test/req_register/scaffolding.c
@@ -12,15 +12,15 @@
 #include "work_task.h" /* work_task */
 #include "queue.h"
 
-char *msg_illregister = "Illegal op in register request received for job %s";
-char *msg_registerdel = "Job deleted as result of dependency on job %s";
+const char *msg_illregister = "Illegal op in register request received for job %s";
+const char *msg_registerdel = "Job deleted as result of dependency on job %s";
 char server_name[PBS_MAXSERVERNAME + 1];
-char *msg_err_malloc = "malloc failed";
+const char *msg_err_malloc = "malloc failed";
 const char *PJobState[] = {"hi", "hello"};
 struct server server;
 int LOGLEVEL = 10;
-char *msg_regrej = "Dependency request for job rejected by ";
-char *msg_registerrel = "Dependency on job %s released.";
+const char *msg_regrej = "Dependency request for job rejected by ";
+const char *msg_registerrel = "Dependency on job %s released.";
 int   i = 2;
 int   svr = 2;
 
@@ -36,7 +36,7 @@ int job_save(job *pjob, int updatetype, int mom_port)
   return(0);
   }
 
-void svr_mailowner(job *pjob, int mailpoint, int force, char *text)
+void svr_mailowner(job *pjob, int mailpoint, int force, const char *text)
   {
   fprintf(stderr, "The call to svr_mailowner to be mocked!!\n");
   exit(1);
@@ -55,7 +55,7 @@ svrattrl *attrlist_create(const char *aname, const char *rname, int vsize)
   else
     rsz = strlen(rname) + 1;
 
-  pal = calloc(1, sizeof(svrattrl) + asz + rsz + vsize);
+  pal = (svrattrl *)calloc(1, sizeof(svrattrl) + asz + rsz + vsize);
 
   CLEAR_LINK(pal->al_link); /* clear link */
 
@@ -145,7 +145,7 @@ void release_req(struct work_task *pwt)
 
 char *pbse_to_txt(int err)
   {
-  return("");
+  return((char *)"");
   }
 
 void append_link(tlist_head *head, list_link *new_link, void *pobj)
@@ -181,7 +181,7 @@ int svr_setjobstate(job *pjob, int newstate, int newsubstate, int has_queue_mute
 
 job *svr_find_job(char *jobid, int get_subjob)
   {
-  job *pjob = calloc(1, sizeof(job));
+  job *pjob = (job *)calloc(1, sizeof(job));
   strcpy(pjob->ji_qs.ji_jobid, jobid);
   CLEAR_HEAD(pjob->ji_wattr[JOB_ATR_depend].at_val.at_list);
 
@@ -302,7 +302,7 @@ int get_batch_request_id(
 
 void free_br(batch_request *preq) {} 
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/req_register/test_req_register.c b/src/server/test/req_register/test_req_register.c
index 64c34683fb..0e59be36c6 100644
--- a/src/server/test/req_register/test_req_register.c
+++ b/src/server/test/req_register/test_req_register.c
@@ -23,10 +23,10 @@ void del_depend(struct depend *pd);
 int comp_depend(pbs_attribute *a1, pbs_attribute *a2);
 void free_depend(pbs_attribute *pattr);
 int build_depend(pbs_attribute *pattr, char *value);
-void fast_strcat(char **Dest, char *Src);
+void fast_strcat(char **Dest, const char *Src);
 int dup_depend(pbs_attribute *pattr, struct depend *pd);
 void cat_jobsvr(char **Dest, char *Src);
-int decode_depend(pbs_attribute *pattr, const char *name, char *rescn, char *val, int perm);
+int decode_depend(pbs_attribute *pattr, const char *name, const char *rescn, const char *val, int perm);
 int encode_depend(pbs_attribute *pattr, tlist_head *phead, const char *atname, const char *rsname, int mode, int perm);
 int set_depend(pbs_attribute *attr, pbs_attribute *new_attr, enum batch_op op);
 int unregister_sync(pbs_attribute *attr, batch_request *preq);
diff --git a/src/server/test/req_rerun/scaffolding.c b/src/server/test/req_rerun/scaffolding.c
index bea9f34a1a..d7cf350904 100644
--- a/src/server/test/req_rerun/scaffolding.c
+++ b/src/server/test/req_rerun/scaffolding.c
@@ -7,9 +7,9 @@
 #include "batch_request.h" /* batch_request.h */
 #include "work_task.h" /* work_task, all_tasks */
 
-char *msg_jobrerun = "Job Rerun";
+const char *msg_jobrerun = "Job Rerun";
 attribute_def job_attr_def[10];
-char *msg_manager = "%s at request of %s@%s";
+const char *msg_manager = "%s at request of %s@%s";
 int LOGLEVEL = 7; /* force logging code to be exercised as tests run */
 
 
@@ -25,7 +25,7 @@ char *parse_servername(char *name, unsigned int *service)
   exit(1);
   }
 
-void svr_mailowner(job *pjob, int mailpoint, int force, char *text)
+void svr_mailowner(job *pjob, int mailpoint, int force, const char *text)
   {
   fprintf(stderr, "The call to svr_mailowner to be mocked!!\n");
   exit(1);
@@ -121,7 +121,7 @@ int get_batch_request_id(
 
 void free_br(batch_request *preq) {} 
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/req_runjob/scaffolding.c b/src/server/test/req_runjob/scaffolding.c
index 6616fac0ce..27fa91dfae 100644
--- a/src/server/test/req_runjob/scaffolding.c
+++ b/src/server/test/req_runjob/scaffolding.c
@@ -23,15 +23,15 @@ const char *PJobSubState[10];
 int svr_tsnodes = 0;
 int svr_resc_size = 0;
 attribute_def job_attr_def[10];
-char *msg_jobrun = "Job Run";
+const char *msg_jobrun = "Job Run";
 resource_def *svr_resc_def;
 char mom_host[PBS_MAXHOSTNAME + 1];
 int scheduler_jobct = 0;
 struct server server;
 int scheduler_sock = -1;
 pbs_net_t pbs_mom_addr;
+const char *msg_manager = "%s at request of %s@%s";
 int LOGLEVEL = 7; /* force logging code to be exercised as tests run */
-char *msg_manager = "%s at request of %s@%s";
 int svr_totnodes = 0;
 
 
@@ -60,7 +60,7 @@ int job_save(job *pjob, int updatetype, int mom_port)
   exit(1);
   }
 
-void svr_mailowner(job *pjob, int mailpoint, int force, char *text)
+void svr_mailowner(job *pjob, int mailpoint, int force, const char *text)
   {
   fprintf(stderr, "The call to svr_mailowner to be mocked!!\n");
   exit(1);
@@ -108,7 +108,7 @@ char *PAddrToString(pbs_net_t *Addr)
   exit(1);
   }
 
-struct pbsnode *find_nodebyname(char *nodename)
+struct pbsnode *find_nodebyname(const char *nodename)
   {
   static struct pbsnode pnode;
 
@@ -308,7 +308,7 @@ int get_batch_request_id(
   return(0);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/req_select/scaffolding.c b/src/server/test/req_select/scaffolding.c
index e0078da975..52b0298e51 100644
--- a/src/server/test/req_select/scaffolding.c
+++ b/src/server/test/req_select/scaffolding.c
@@ -51,13 +51,13 @@ int svr_authorize_jobreq(struct batch_request *preq, job *pjob)
   exit(1);
   }
 
-int decode_str(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_str(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   fprintf(stderr, "The call to decode_str to be mocked!!\n");
   exit(1);
   }
 
-int find_attr(struct attribute_def *attr_def, char *name, int limit)
+int find_attr(struct attribute_def *attr_def, const char *name, int limit)
   {
   fprintf(stderr, "The call to find_attr to be mocked!!\n");
   exit(1);
@@ -147,7 +147,7 @@ int get_svr_attr_l(int index, long *l)
   }
 
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/req_shutdown/scaffolding.c b/src/server/test/req_shutdown/scaffolding.c
index b63e5283cf..6613bb4e9d 100644
--- a/src/server/test/req_shutdown/scaffolding.c
+++ b/src/server/test/req_shutdown/scaffolding.c
@@ -11,13 +11,13 @@
 
 all_queues              svr_queues;
 int lockfds=0;
-char *msg_daemonname = "unset";
-char *msg_shutdown_start = "Starting to shutdown the server, type is ";
-char *msg_init_queued = "Requeued in queue: ";
-char *msg_on_shutdown = " on Server shutdown";
-char *msg_leftrunning = "job running on at Server shutdown";
-char *msg_shutdown_op = "Shutdown request from %s@%s ";
-char *msg_job_abort = "Aborted by PBS Server ";
+const char *msg_daemonname = "unset";
+const char *msg_shutdown_start = "Starting to shutdown the server, type is ";
+const char *msg_init_queued = "Requeued in queue: ";
+const char *msg_on_shutdown = " on Server shutdown";
+const char *msg_leftrunning = "job running on at Server shutdown";
+const char *msg_shutdown_op = "Shutdown request from %s@%s ";
+const char *msg_job_abort = "Aborted by PBS Server ";
 attribute_def job_attr_def[10];
 struct all_jobs alljobs;
 struct server server;
@@ -66,7 +66,7 @@ int issue_signal(job *pjob, char *signame, void (*func)(struct work_task *), voi
   exit(1);
   }
 
-char * csv_find_string(char *csv_str, char *search_str)
+char * csv_find_string(const char *csv_str, const char *search_str)
   {
   fprintf(stderr, "The call to csv_find_string to be mocked!!\n");
   exit(1);
@@ -128,7 +128,7 @@ int get_batch_request_id(
   return(0);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/req_signal/scaffolding.c b/src/server/test/req_signal/scaffolding.c
index e57ed11eaa..8761db52c6 100644
--- a/src/server/test/req_signal/scaffolding.c
+++ b/src/server/test/req_signal/scaffolding.c
@@ -98,7 +98,7 @@ int get_batch_request_id(
   return(0);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/req_stat/scaffolding.c b/src/server/test/req_stat/scaffolding.c
index 936febc075..2079b60aad 100644
--- a/src/server/test/req_stat/scaffolding.c
+++ b/src/server/test/req_stat/scaffolding.c
@@ -46,7 +46,7 @@ int job_save(job *pjob, int updatetype, int mom_port)
   exit(1);
   }
 
-void svr_mailowner(job *pjob, int mailpoint, int force, char *text)
+void svr_mailowner(job *pjob, int mailpoint, int force, const char *text)
   {
   fprintf(stderr, "The call to svr_mailowner to be mocked!!\n");
   exit(1);
@@ -94,7 +94,7 @@ int lock_node(struct pbsnode *the_node, const char *id, char *msg, int logging)
   exit(1);
   }
 
-struct pbsnode *find_nodebyname(char *nodename)
+struct pbsnode *find_nodebyname(const char *nodename)
   {
   fprintf(stderr, "The call to find_nodebyname to be mocked!!\n");
   exit(1);
@@ -312,7 +312,7 @@ int lock_sv_qs_mutex(pthread_mutex_t *sv_qs_mutex, const char *msg_string)
   }
 
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/req_track/scaffolding.c b/src/server/test/req_track/scaffolding.c
index 77c825b887..c92ab2859e 100644
--- a/src/server/test/req_track/scaffolding.c
+++ b/src/server/test/req_track/scaffolding.c
@@ -56,3 +56,8 @@ int issue_to_svr(char *servern, struct batch_request *preq, void (*replyfunc)(st
   }
 
 void free_br(batch_request *preq) {}
+
+ssize_t write_ac_socket(int fd, const void *buf, ssize_t count)
+  {
+  return(0);
+  }
diff --git a/src/server/test/resc_def_all/scaffolding.c b/src/server/test/resc_def_all/scaffolding.c
index d5d06df6bb..94bedee1f7 100644
--- a/src/server/test/resc_def_all/scaffolding.c
+++ b/src/server/test/resc_def_all/scaffolding.c
@@ -45,7 +45,7 @@ int set_unkn(struct pbs_attribute *old, struct pbs_attribute *new_attr, enum bat
   exit(1);
   }
 
-int decode_unkn(pbs_attribute *patr, const char *name, char *rescn, char *value, int perm)
+int decode_unkn(pbs_attribute *patr, const char *name, const char *rescn, const char *value, int perm)
   {
   fprintf(stderr, "The call to decode_unkn to be mocked!!\n");
   exit(1);
@@ -75,7 +75,7 @@ int encode_b(pbs_attribute *attr, tlist_head *phead, const char *atname, const c
   exit(1);
   }
 
-int decode_b(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_b(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   fprintf(stderr, "The call to decode_b to be mocked!!\n");
   exit(1);
@@ -99,7 +99,7 @@ int comp_l(struct pbs_attribute *attr, struct pbs_attribute *with)
   exit(1);
   }
 
-int decode_l(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_l(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   fprintf(stderr, "The call to decode_l to be mocked!!\n");
   exit(1);
@@ -111,7 +111,7 @@ int encode_str(pbs_attribute *attr, tlist_head *phead, const char *atname, const
   exit(1);
   }
 
-int decode_str(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_str(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   fprintf(stderr, "The call to decode_str to be mocked!!\n");
   exit(1);
@@ -153,7 +153,7 @@ int encode_ll(pbs_attribute *attr, tlist_head *phead, const char *atname, const
   exit(1);
   }
 
-int decode_ll(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_ll(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   fprintf(stderr, "The call to decode_ll to be mocked!!\n");
   exit(1);
@@ -165,7 +165,7 @@ int encode_time(pbs_attribute *attr, tlist_head *phead, const char *atname, cons
   exit(1);
   }
 
-int decode_time(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_time(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   fprintf(stderr, "The call to decode_time to be mocked!!\n");
   exit(1);
@@ -177,7 +177,7 @@ int encode_size(pbs_attribute *attr, tlist_head *phead, const char *atname, cons
   exit(1);
   }
 
-int decode_size(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_size(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   fprintf(stderr, "The call to decode_size to be mocked!!\n");
   exit(1);
@@ -201,7 +201,7 @@ void free_null(struct pbs_attribute *attr)
   exit(1);
   }
 
-int decode_tokens(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_tokens(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   fprintf(stderr, "The call to decode_tokens to be mocked!!\n");
   exit(1);
diff --git a/src/server/test/run_sched/scaffolding.c b/src/server/test/run_sched/scaffolding.c
index d97e86427a..44649d0ca1 100644
--- a/src/server/test/run_sched/scaffolding.c
+++ b/src/server/test/run_sched/scaffolding.c
@@ -12,10 +12,10 @@
 
 unsigned int pbs_scheduler_port;
 listener_connection listener_conns[MAXLISTENERS];
-char *msg_sched_called = "Scheduler was sent the command %s";
-char *msg_listnr_nocall = "Could not contact Listener";
-char *msg_listnr_called = "Listener %d sent event %s";
-char *msg_sched_nocall = "Could not contact Scheduler";
+const char *msg_sched_called = "Scheduler was sent the command %s";
+const char *msg_listnr_nocall = "Could not contact Listener";
+const char *msg_listnr_called = "Listener %d sent event %s";
+const char *msg_sched_nocall = "Could not contact Scheduler";
 char server_name[PBS_MAXSERVERNAME + 1];
 struct connection svr_conn[PBS_NET_MAX_CONNECTIONS];
 pbs_net_t pbs_scheduler_addr;
@@ -97,3 +97,8 @@ int add_scheduler_conn(
   {
   return(0);
   }
+
+ssize_t write_ac_socket(int fd, const void *buf, ssize_t count)
+  {
+  return(0);
+  }
diff --git a/src/server/test/scaffolding_job_attr_def.c b/src/server/test/scaffolding_job_attr_def.c
index 2be6ab4655..1e18b9c0e0 100644
--- a/src/server/test/scaffolding_job_attr_def.c
+++ b/src/server/test/scaffolding_job_attr_def.c
@@ -30,7 +30,7 @@ int encode_arst(pbs_attribute *attr, tlist_head *phead, const char *atname, cons
   exit(1);
   }
 
-int decode_arst(struct pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_arst(struct pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   fprintf(stderr, "The call to decode_arst needs to be mocked!!\n");
   exit(1);
@@ -60,7 +60,7 @@ int encode_str(pbs_attribute *attr, tlist_head *phead, const char *atname, const
   exit(1);
   }
 
-int decode_str(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_str(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   fprintf(stderr, "The call to decode_str needs to be mocked!!\n");
   exit(1);
@@ -90,7 +90,7 @@ int encode_resc(pbs_attribute *attr, tlist_head *phead, const char *atname, cons
   exit(1);
   }
 
-int decode_resc(struct pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_resc(struct pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   fprintf(stderr, "The call to decode_resc needs to be mocked!!\n");
   exit(1);
@@ -126,7 +126,7 @@ int encode_unkn(pbs_attribute *attr, tlist_head *phead, const char *atname, cons
   exit(1);
   }
 
-int decode_unkn(pbs_attribute *patr, const char *name, char *rescn, char *value, int perm)
+int decode_unkn(pbs_attribute *patr, const char *name,const char *rescn, const char *value, int perm)
   {
   fprintf(stderr, "The call to decode_unkn needs to be mocked!!\n");
   exit(1);
@@ -156,7 +156,7 @@ int encode_depend(pbs_attribute *attr, tlist_head *phead, const char *atname, co
   exit(1);
   }
 
-int decode_depend(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_depend(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   fprintf(stderr, "The call to decode_depend needs to be mocked!!\n");
   exit(1);
@@ -174,7 +174,7 @@ int encode_hold(pbs_attribute *attr, tlist_head *phead, const char *atname, cons
   exit(1);
   }
 
-int decode_hold(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_hold(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   fprintf(stderr, "The call to decode_hold needs to be mocked!!\n");
   exit(1);
@@ -198,7 +198,7 @@ int encode_l(pbs_attribute *attr, tlist_head *phead, const char *atname, const c
   exit(1);
   }
 
-int decode_l(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_l(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   fprintf(stderr, "The call to decode_l needs to be mocked!!\n");
   exit(1);
@@ -222,7 +222,7 @@ int encode_b(pbs_attribute *attr, tlist_head *phead, const char *atname, const c
   exit(1);
   }
 
-int decode_b(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_b(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   fprintf(stderr, "The call to decode_b needs to be mocked!!\n");
   exit(1);
@@ -246,7 +246,7 @@ int encode_c(pbs_attribute *attr, tlist_head *phead, const char *atname, const c
   exit(1);
   }
 
-int decode_c(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_c(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   fprintf(stderr, "The call to decode_c needs to be mocked!!\n");
   exit(1);
@@ -270,7 +270,7 @@ int encode_tv(pbs_attribute *attr, tlist_head *phead, const char *atname, const
   exit(1);
   }
 
-int decode_tv(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_tv(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   fprintf(stderr, "The call to decode_tv needs to be mocked!!\n");
   exit(1);
diff --git a/src/server/test/scaffolding_svr.c b/src/server/test/scaffolding_svr.c
index c97bf2b6e0..01ba898e34 100644
--- a/src/server/test/scaffolding_svr.c
+++ b/src/server/test/scaffolding_svr.c
@@ -2,8 +2,8 @@
 #include <stdlib.h>
 #include <stdio.h> /* fprintf */
 #include "pbs_job.h" /* job */
-#include "batch_request.h" /* batch_request */
 #include "work_task.h" /* work_task */
+#include "batch_request.h" /* batch_request */
 
 int relay_to_mom(job **pjob, struct batch_request *request, void (*func)(struct work_task *))
   {
diff --git a/src/server/test/stat_job/scaffolding.c b/src/server/test/stat_job/scaffolding.c
index f42b96afa3..4cf5eda9dd 100644
--- a/src/server/test/stat_job/scaffolding.c
+++ b/src/server/test/stat_job/scaffolding.c
@@ -24,7 +24,7 @@ int svr_authorize_jobreq(struct batch_request *preq, job *pjob)
   exit(1);
   }
 
-int find_attr(struct attribute_def *attr_def, char *name, int limit)
+int find_attr(struct attribute_def *attr_def, const char *name, int limit)
   {
   fprintf(stderr, "The call to find_attr to be mocked!!\n");
   exit(1);
diff --git a/src/server/test/svr_chk_owner/scaffolding.c b/src/server/test/svr_chk_owner/scaffolding.c
index 5963c5f5dc..6bf6cc4cc9 100644
--- a/src/server/test/svr_chk_owner/scaffolding.c
+++ b/src/server/test/svr_chk_owner/scaffolding.c
@@ -7,8 +7,8 @@
 #include "batch_request.h" /* batch_request */
 #include "server.h" /* server */
 
-char *pbs_o_host = "PBS_O_HOST";
-char *msg_permlog = "Unauthorized Request, request type: %d, Object: %s, Name: %s, request from: %s@%s";
+const char *pbs_o_host = "PBS_O_HOST";
+const char *msg_permlog = "Unauthorized Request, request type: %d, Object: %s, Name: %s, request from: %s@%s";
 const char *PJobState[] = {"hi", "hello"};
 struct server server;
 char *server_host;
@@ -105,7 +105,7 @@ struct sockaddr_in *get_cached_addrinfo(
   return(NULL);
   }
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/svr_format_job/scaffolding.c b/src/server/test/svr_format_job/scaffolding.c
index a0fee22c59..6ee932623c 100644
--- a/src/server/test/svr_format_job/scaffolding.c
+++ b/src/server/test/svr_format_job/scaffolding.c
@@ -2,13 +2,13 @@
 #include <stdlib.h>
 #include <stdio.h> /* fprintf */
 
-char *msg_job_stageinfail = "File stage in failed, see below.\nJob will be retried later, please investigate and correct problem.";
-char *msg_job_start = "Begun execution";
-char *msg_job_end = "Execution terminated";
-char *msg_job_copychkptfail = "Checkpoint file copy failed, see below.\nJob will be retried later, please investigate and correct problem.";
-char *msg_job_otherfail = "An error has occurred processing your job, see below.";
-char *msg_job_abort = "Aborted by PBS Server ";
-char *msg_job_del       = "job deleted";
+const char *msg_job_stageinfail = "File stage in failed, see below.\nJob will be retried later, please investigate and correct problem.";
+const char *msg_job_start = "Begun execution";
+const char *msg_job_end = "Execution terminated";
+const char *msg_job_copychkptfail = "Checkpoint file copy failed, see below.\nJob will be retried later, please investigate and correct problem.";
+const char *msg_job_otherfail = "An error has occurred processing your job, see below.";
+const char *msg_job_abort = "Aborted by PBS Server ";
+const char *msg_job_del       = "job deleted";
 
 char *pbse_to_txt(int err)
   {
diff --git a/src/server/test/svr_func/scaffolding.c b/src/server/test/svr_func/scaffolding.c
index 7bd63a379d..a897acfc0d 100644
--- a/src/server/test/svr_func/scaffolding.c
+++ b/src/server/test/svr_func/scaffolding.c
@@ -56,13 +56,13 @@ pbs_queue *get_jobs_queue(job **pjob)
   exit(1);
   }
 
-int csv_length(char *csv_str)
+int csv_length(const char *csv_str)
   {
   fprintf(stderr, "The call to csv_length to be mocked!!\n");
   exit(1);
   }
 
-char *csv_nth(char *csv_str, int n)
+char *csv_nth(const char *csv_str, int n)
   {
   fprintf(stderr, "The call to csv_nth to be mocked!!\n");
   exit(1);
diff --git a/src/server/test/svr_jobfunc/scaffolding.c b/src/server/test/svr_jobfunc/scaffolding.c
index 2762c1f9ec..aecc1c120b 100644
--- a/src/server/test/svr_jobfunc/scaffolding.c
+++ b/src/server/test/svr_jobfunc/scaffolding.c
@@ -11,7 +11,6 @@
 #include "work_task.h" /* work_task */
 #include "sched_cmds.h" /* SCH_SCHEDULE_NULL */
 #include "list_link.h" /* list_link */
-#include "user_info.h"
 
 
 int svr_resc_size = 0;
@@ -28,7 +27,7 @@ struct server server;
 struct all_jobs array_summary;
 int svr_do_schedule = SCH_SCHEDULE_NULL;
 int listener_command = SCH_SCHEDULE_NULL;
-int LOGLEVEL = 7; /* force logging code to be exercised as tests run */
+int LOGLEVEL = 0;
 pthread_mutex_t *svr_do_schedule_mutex;
 pthread_mutex_t *listener_command_mutex;
 
@@ -41,8 +40,20 @@ resource *add_resource_entry(pbs_attribute *pattr, resource_def *prdef)
 
 pbs_queue *find_queuebyname(char *quename)
   {
-  fprintf(stderr, "The call to find_queuebyname to be mocked!!\n");
-  exit(1);
+  pbs_queue *pq = (pbs_queue *)calloc(1, sizeof(pbs_queue));
+
+  pq->qu_qs.qu_type = QTYPE_Unset;
+
+  pq->qu_mutex = calloc(1, sizeof(pthread_mutex_t));
+  pq->qu_jobs = calloc(1, sizeof(struct all_jobs));
+  pq->qu_jobs_array_sum = calloc(1, sizeof(struct all_jobs));
+
+  snprintf(pq->qu_qs.qu_name, sizeof(pq->qu_qs.qu_name), "%s", quename);
+
+  /* set up the user info struct */
+  pq->qu_uih = calloc(1, sizeof(user_info_holder));
+
+  return(pq);
   }
 
 void account_record(int acctype, job *pjob, char *text)
@@ -53,26 +64,35 @@ void account_record(int acctype, job *pjob, char *text)
 
 char *arst_string(const char *str, pbs_attribute *pattr)
   {
-  fprintf(stderr, "The call to arst_string to be mocked!!\n");
-  exit(1);
+  return(NULL);
   }
 
 int job_save(job *pjob, int updatetype, int mom_port)
   {
-  fprintf(stderr, "The call to job_save to be mocked!!\n");
-  exit(1);
+  return(0);
   }
 
 long attr_ifelse_long(pbs_attribute *attr1, pbs_attribute *attr2, long deflong)
   {
-  fprintf(stderr, "The call to attr_ifelse_long to be mocked!!\n");
-  exit(1);
+  return(0);
   }
 
 pbs_queue *get_jobs_queue(job **pjob)
   {
-  fprintf(stderr, "The call to get_jobs_queue to be mocked!!\n");
-  exit(1);
+  pbs_queue *pq = (pbs_queue *)calloc(1, sizeof(pbs_queue));
+
+  pq->qu_qs.qu_type = QTYPE_Unset;
+
+  pq->qu_mutex = calloc(1, sizeof(pthread_mutex_t));
+  pq->qu_jobs = calloc(1, sizeof(struct all_jobs));
+  pq->qu_jobs_array_sum = calloc(1, sizeof(struct all_jobs));
+
+  snprintf(pq->qu_qs.qu_name, sizeof(pq->qu_qs.qu_name), "%s", "qu_name");
+
+  /* set up the user info struct */
+  pq->qu_uih = calloc(1, sizeof(user_info_holder));
+
+  return(pq);
   }
 
 int procs_available(int proc_ct)
@@ -81,7 +101,7 @@ int procs_available(int proc_ct)
   exit(1);
   }
 
-int decode_str(pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_str(pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
   {
   fprintf(stderr, "The call to decode_str to be mocked!!\n");
   exit(1);
@@ -101,8 +121,7 @@ int insert_job_after(struct all_jobs *aj, job *already_in, job *pjob)
 
 int has_job(struct all_jobs *aj, job *pjob)
   {
-  fprintf(stderr, "The call to has_job to be mocked!!\n");
-  exit(1);
+  return(0);
   }
 
 struct work_task *set_task(enum work_type type, long event_id, void (*func)(), void *parm, int get_lock)
@@ -113,8 +132,7 @@ struct work_task *set_task(enum work_type type, long event_id, void (*func)(), v
 
 int insert_job(struct all_jobs *aj, job *pjob)
   {
-  fprintf(stderr, "The call to insert_job to be mocked!!\n");
-  exit(1);
+  return(0);
   }
 
 int procs_requested(char *spec)
@@ -137,20 +155,17 @@ job *next_job(struct all_jobs *aj, int *iter)
 
 job *next_job_from_back(struct all_jobs *aj, int *iter)
   {
-  fprintf(stderr, "The call to next_job_from_back to be mocked!!\n");
-  exit(1);
+  return(NULL);
   }
 
 int comp_resc2(struct pbs_attribute *attr, struct pbs_attribute *with, int IsQueueCentric, char *EMsg, enum compare_types type)
   {
-  fprintf(stderr, "The call to comp_resc2 to be mocked!!\n");
-  exit(1);
+  return(0);
   }
 
 resource_def *find_resc_def(resource_def *rscdf, const char *name, int limit)
   {
-  fprintf(stderr, "The call to find_resc_def to be mocked!!\n");
-  exit(1);
+  return(NULL);
   }
 
 char * csv_find_string(char *csv_str, char *search_str)
@@ -173,38 +188,44 @@ work_task *next_task(all_tasks *at, int *iter)
 
 pbs_queue *next_queue(all_queues *aq, int *iter)
   {
-  fprintf(stderr, "The call to next_queue to be mocked!!\n");
-  exit(1);
+  return(NULL);
   }
 
 int remove_job(struct all_jobs *aj, job *pjob)
   {
-  fprintf(stderr, "The call to remove_job to be mocked!!\n");
-  exit(1);
+  return(PBSE_JOB_RECYCLED);
   }
 
 int set_jobexid(job *pjob, pbs_attribute *attrry, char *EMsg)
   {
-  fprintf(stderr, "The call to set_jobexid to be mocked!!\n");
-  exit(1);
+  return(0);
   }
 
 int site_acl_check(job *pjob, pbs_queue *pque)
   {
-  fprintf(stderr, "The call to site_acl_check to be mocked!!\n");
-  exit(1);
+  return(0);
   }
 
 resource *find_resc_entry(pbs_attribute *pattr, resource_def *rscdf)
   {
-  fprintf(stderr, "The call to find_resc_entry to be mocked!!\n");
-  exit(1);
+  return(0);
   }
 
 job *svr_find_job(char *jobid, int get_subjob)
   {
-  fprintf(stderr, "The call to find_job to be mocked!!\n");
-  exit(1);
+  char *job_id = "job_id";
+
+  if (jobid != NULL)
+  {
+    if (strcmp(job_id,jobid) == 0)
+      {
+      static struct job job_id_job;
+      memset(&job_id_job, 0, sizeof(job_id_job));
+      return(&job_id_job);
+      }
+  }
+
+  return(NULL);
   }
 
 int insert_job_first(struct all_jobs *aj, job *pjob)
@@ -215,14 +236,12 @@ int insert_job_first(struct all_jobs *aj, job *pjob)
 
 int unlock_queue(struct pbs_queue *the_queue, const char *id, char *msg, int logging)
   {
-  fprintf(stderr, "The call to unlock_queue to be mocked!!\n");
-  exit(1);
+  return(0);
   }
 
 int acl_check(pbs_attribute *pattr, char *name, int type)
   {
-  fprintf(stderr, "The call to acl_check to be mocked!!\n");
-  exit(1);
+  return(0);
   }
 
 int insert_task(all_tasks *at, work_task *wt)
@@ -239,8 +258,7 @@ void free_str(struct pbs_attribute *attr)
 
 void *get_next(list_link pl, char *file, int line)
   {
-  fprintf(stderr, "The call to get_next to be mocked!!\n");
-  exit(1);
+  return(NULL);
   }
 
 int append_dynamic_string (dynamic_string *ds, const char *str)
@@ -302,11 +320,11 @@ int decrement_queued_jobs(
   return(0);
   }
 
-int get_jobs_index(
-
-  struct all_jobs *aj,
-  job             *pjob)
-
+int get_jobs_index(struct all_jobs *aj, struct job *pjob)
   {
   return(0);
   }
+
+void log_err(int error, const char *func_id, char *msg) {}
+
+void log_event(int eventtype, int objclass, const char *objname, char *text) {}
diff --git a/src/server/test/svr_jobfunc/test_svr_jobfunc.c b/src/server/test/svr_jobfunc/test_svr_jobfunc.c
index c4f8af0b98..b4f3f623a9 100644
--- a/src/server/test/svr_jobfunc/test_svr_jobfunc.c
+++ b/src/server/test/svr_jobfunc/test_svr_jobfunc.c
@@ -1,33 +1,451 @@
 #include "license_pbs.h" /* See here for the software license */
 #include "svr_jobfunc.h"
+#include "pbs_job.h"
+#include "server.h"
+#include "queue.h"
+#include "attribute.h"
 #include "test_svr_jobfunc.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include "pbs_error.h"
 
-START_TEST(test_one)
+START_TEST(svr_enquejob_test)
   {
+  struct job test_job;
+  int result = PBSE_NONE;
 
+  /*initialize_globals*/
+  server.sv_qs_mutex = calloc(1, sizeof(pthread_mutex_t));
+  server.sv_attr_mutex = calloc(1, sizeof(pthread_mutex_t));
+  server.sv_jobstates_mutex = calloc(1, sizeof(pthread_mutex_t));
 
+  pthread_mutex_init(server.sv_qs_mutex,NULL);
+  pthread_mutex_init(server.sv_attr_mutex,NULL);
+  pthread_mutex_init(server.sv_jobstates_mutex,NULL);
+
+  memset(&test_job, 0, sizeof(test_job));
+
+  result = svr_enquejob(NULL, 0, 0);
+  fail_unless(result != PBSE_NONE, "NULL input pointer fail");
+
+  result = svr_enquejob(&test_job, 0, 0);
+  /*Need more complicated mocking in order to have other result than PBSE_JOBNOTFOUND*/
+  fail_unless(result == PBSE_JOBNOTFOUND, "svr_enquejob fail: %d", result);
+
+  }
+END_TEST
+
+START_TEST(svr_dequejob_test)
+  {
+  int result = PBSE_NONE;
+
+  result = svr_dequejob(NULL, 0);
+  fail_unless(result != PBSE_NONE, "NULL input pointer fail");
+
+  struct job j;
+  result = svr_dequejob(&j, 0);
+  fail_unless(result == PBSE_JOBNOTFOUND, "svr_dequejob fail");
+  }
+END_TEST
+
+START_TEST(svr_setjobstate_test)
+  {
+  struct job test_job;
+  int result = PBSE_NONE;
+
+  memset(&test_job, 0, sizeof(test_job));
+
+  /*initialize_globals*/
+  server.sv_qs_mutex = calloc(1, sizeof(pthread_mutex_t));
+  server.sv_attr_mutex = calloc(1, sizeof(pthread_mutex_t));
+  server.sv_jobstates_mutex = calloc(1, sizeof(pthread_mutex_t));
+
+  pthread_mutex_init(server.sv_qs_mutex,NULL);
+  pthread_mutex_init(server.sv_attr_mutex,NULL);
+  pthread_mutex_init(server.sv_jobstates_mutex,NULL);
+
+  result = svr_setjobstate(NULL, 0, 0, 0);
+  fail_unless(result == PBSE_BAD_PARAMETER, "NULL input pointer fail");
+
+  result = svr_setjobstate(&test_job, 0, 0, 0);
+  fail_unless(result == PBSE_NONE, "svr_setjobstate fail");
+
+  result = svr_setjobstate(&test_job, 1, 2, 3);
+  fail_unless(result == PBSE_NONE, "svr_setjobstate fail");
+
+  }
+END_TEST
+
+START_TEST(svr_evaljobstate_test)
+  {
+  struct job test_job;
+  int state = 0;
+  int substate = 0;
+
+  memset(&test_job, 0, sizeof(test_job));
+
+  svr_evaljobstate(NULL, &state, &substate, 0);
+  svr_evaljobstate(&test_job, NULL, &substate, 0);
+  svr_evaljobstate(&test_job, &state, NULL, 0);
+
+  test_job.ji_qs.ji_state = JOB_STATE_RUNNING;
+  svr_evaljobstate(&test_job, &state, &substate, 0);
+  fail_unless(test_job.ji_qs.ji_state == state, "svr_setjobstate state fail case 1");
+  fail_unless(test_job.ji_qs.ji_substate == substate, "svr_setjobstate substate fail case 1");
+  memset(&test_job, 0, sizeof(test_job));
+
+  test_job.ji_wattr[JOB_ATR_hold].at_val.at_long = 1;
+  svr_evaljobstate(&test_job, &state, &substate, 0);
+  fail_unless(test_job.ji_qs.ji_state == state, "svr_setjobstate state fail case 2");
+  fail_unless(test_job.ji_qs.ji_substate == substate, "svr_setjobstate substate fail case 2");
+  memset(&test_job, 0, sizeof(test_job));
+
+  test_job.ji_wattr[JOB_ATR_stagein].at_flags = 1;
+  svr_evaljobstate(&test_job, &state, &substate, 0);
+  fail_unless(test_job.ji_qs.ji_state == state, "svr_setjobstate state fail case 3");
+  fail_unless(test_job.ji_qs.ji_substate == substate, "svr_setjobstate substate fail case 3");
+  memset(&test_job, 0, sizeof(test_job));
+
+  svr_evaljobstate(&test_job, &state, &substate, 0);
+  fail_unless(test_job.ji_qs.ji_state == state, "svr_setjobstate state fail case 4");
+  fail_unless(test_job.ji_qs.ji_substate == substate, "svr_setjobstate substate fail case 4");
+  memset(&test_job, 0, sizeof(test_job));
+
+  svr_evaljobstate(&test_job, &state, &substate, 1);
+  fail_unless(JOB_STATE_QUEUED == state, "svr_setjobstate state fail case 5");
+  fail_unless(JOB_SUBSTATE_QUEUED == substate, "svr_setjobstate substate fail case 5");
+
+  }
+END_TEST
+
+START_TEST(get_variable_test)
+  {
+  struct job test_job;
+  char* variable = "variable";
+  char* result = NULL;
+
+  memset(&test_job, 0, sizeof(test_job));
+
+  result = get_variable(NULL, variable);
+  fail_unless(result == NULL, "NULL input job pointer fail");
+
+  result = get_variable(&test_job, NULL);
+  fail_unless(result == NULL, "NULL input variable string pointer fail");
+
+  result = get_variable(&test_job, variable);
+  fail_unless(result == NULL, "svr_setjobstate fail");
+
+  }
+END_TEST
+
+START_TEST(chk_resc_limits_test)
+  {
+  struct pbs_attribute test_attribute;
+  struct pbs_queue test_queue;
+  char message[] = "message";
+  int result = -1;
+
+  /*initialize_globals*/
+  server.sv_qs_mutex = calloc(1, sizeof(pthread_mutex_t));
+  server.sv_attr_mutex = calloc(1, sizeof(pthread_mutex_t));
+  server.sv_jobstates_mutex = calloc(1, sizeof(pthread_mutex_t));
+
+  pthread_mutex_init(server.sv_qs_mutex,NULL);
+  pthread_mutex_init(server.sv_attr_mutex,NULL);
+  pthread_mutex_init(server.sv_jobstates_mutex,NULL);
+
+  memset(&test_attribute, 0, sizeof(test_attribute));
+  memset(&test_queue, 0, sizeof(test_queue));
+
+  result = chk_resc_limits(NULL, &test_queue, message);
+  fail_unless(result == PBSE_BAD_PARAMETER, "NULL input pbs_attribute pointer fail");
+
+  result = chk_resc_limits(&test_attribute, NULL, message);
+  fail_unless(result == PBSE_BAD_PARAMETER, "NULL input pbs_queue pointer fail");
+
+  result = chk_resc_limits(&test_attribute, &test_queue, NULL);
+  fail_unless(result == PBSE_NONE, "chk_resc_limits with NULL message pointer fail");
+
+  result = chk_resc_limits(&test_attribute, &test_queue, message);
+  fail_unless(result == PBSE_NONE, "chk_resc_limits fail");
+
+  }
+END_TEST
+
+START_TEST(svr_chkque_test)
+  {
+  struct job test_job;
+  struct pbs_queue test_queue;
+  struct array_strings disallowed_types_array_strings;
+  char* hostname = "hostname";
+  int result = -1;
+
+  /*initialize_globals*/
+  server.sv_qs_mutex = calloc(1, sizeof(pthread_mutex_t));
+  server.sv_attr_mutex = calloc(1, sizeof(pthread_mutex_t));
+  server.sv_jobstates_mutex = calloc(1, sizeof(pthread_mutex_t));
+
+  pthread_mutex_init(server.sv_qs_mutex,NULL);
+  pthread_mutex_init(server.sv_attr_mutex,NULL);
+  pthread_mutex_init(server.sv_jobstates_mutex,NULL);
+
+  memset(&test_job, 0, sizeof(test_job));
+  memset(&test_queue, 0, sizeof(test_queue));
+
+  result = svr_chkque(NULL, &test_queue, hostname, 0, NULL);
+  fail_unless(result == PBSE_BAD_PARAMETER, "NULL input job pointer fail");
+
+
+  memset(&test_queue, 0, sizeof(test_queue));
+  result = svr_chkque(&test_job, NULL, hostname, 0, NULL);
+  result = svr_chkque(&test_job, NULL, hostname, 0, NULL);
+  fail_unless(result == PBSE_BAD_PARAMETER, "NULL input pbs_queue pointer fail");
+
+  result = svr_chkque(&test_job, &test_queue, NULL, 0, NULL);
+  fail_unless(result != PBSE_NONE, "NULL input hostname pointer fail");
+
+  test_queue.qu_qs.qu_type = QTYPE_Execution;
+  result = svr_chkque(&test_job, &test_queue, hostname, 0, NULL);
+  fail_unless(result == PBSE_QUNOENB, "svr_chkque fail");
+
+  test_queue.qu_attr[QA_ATR_Enabled].at_val.at_long = 1;
+  result = svr_chkque(&test_job, &test_queue, hostname, 0, NULL);
+  fail_unless(result == PBSE_BAD_PARAMETER, "svr_chkque fail");
+
+  test_queue.qu_attr[QA_ATR_AclGroupEnabled].at_val.at_long = 1;
+  result = svr_chkque(&test_job, &test_queue, hostname, 0, NULL);
+  fail_unless(result != PBSE_NONE, "svr_chkque fail");
+
+
+  /* several test cases for check_queue_disallowed_types (not all)*/
+  memset(&test_job, 0, sizeof(test_job));
+  memset(&test_queue, 0, sizeof(test_queue));
+  memset(&disallowed_types_array_strings,
+         0,
+         sizeof(disallowed_types_array_strings));
+  test_queue.qu_qs.qu_type = QTYPE_Execution;
+  test_queue.qu_attr[QA_ATR_DisallowedTypes].at_flags = ATR_VFLAG_SET;
+  test_queue.qu_attr[QA_ATR_DisallowedTypes].at_val.at_arst = &disallowed_types_array_strings;
+  char* some_string = "some_string";
+  disallowed_types_array_strings.as_string[0] = some_string;
+  disallowed_types_array_strings.as_usedptr = 1;
+
+  result = svr_chkque(&test_job, &test_queue, hostname, 0, NULL);
+  fail_unless(result == PBSE_QUNOENB, "svr_chkque some_string fail");
+
+  disallowed_types_array_strings.as_string[0] = Q_DT_batch;
+  result = svr_chkque(&test_job, &test_queue, hostname, 0, NULL);
+  fail_unless(result == PBSE_NOBATCH, "svr_chkque PBSE_NOBATCH fail");
+
+  disallowed_types_array_strings.as_string[0] = Q_DT_rerunable;
+  test_job.ji_wattr[JOB_ATR_rerunable].at_flags = ATR_VFLAG_SET;
+  test_job.ji_wattr[JOB_ATR_rerunable].at_val.at_long = 1;
+  result = svr_chkque(&test_job, &test_queue, hostname, 0, NULL);
+  fail_unless(result == PBSE_NORERUNABLE, "svr_chkque PBSE_NORERUNABLE fail");
+
+  disallowed_types_array_strings.as_string[0] = Q_DT_nonrerunable;
+  test_job.ji_wattr[JOB_ATR_rerunable].at_val.at_long = 0;
+  result = svr_chkque(&test_job, &test_queue, hostname, 0, NULL);
+  fail_unless(result == PBSE_NONONRERUNABLE, "svr_chkque PBSE_NONONRERUNABLE fail");
+
+  disallowed_types_array_strings.as_usedptr = 2;
+  disallowed_types_array_strings.as_string[0] = some_string;
+  disallowed_types_array_strings.as_string[1] = Q_DT_fault_intolerant;
+  result = svr_chkque(&test_job, &test_queue, hostname, 0, NULL);
+  fail_unless(result == PBSE_NOFAULTINTOLERANT, "svr_chkque PBSE_NOFAULTINTOLERANT fail");
+  }
+END_TEST
+
+START_TEST(job_set_wait_test)
+  {
+  struct job test_job;
+  struct pbs_attribute test_attribute;
+  int result = -1;
+
+  memset(&test_job, 0, sizeof(test_job));
+  memset(&test_attribute, 0, sizeof(test_attribute));
+
+  result = job_set_wait(NULL, &test_job, 0);
+  fail_unless(result == PBSE_BAD_PARAMETER, "NULL input attribute pointer fail");
+
+  result = job_set_wait(&test_attribute, NULL, 0);
+  fail_unless(result == PBSE_BAD_PARAMETER, "NULL input job pointer fail");
+
+  result = job_set_wait(&test_attribute, &test_job, 0);
+  fail_unless(result == PBSE_NONE, "job_set_wait fail");
+  }
+END_TEST
+
+START_TEST(prefix_std_file_test)
+  {
+  struct job test_job;
+  struct dynamic_string test_string;
+  char *result = NULL;
+
+  memset(&test_job, 0, sizeof(test_job));
+  memset(&test_string, 0, sizeof(test_string));
+
+  result = prefix_std_file(NULL, &test_string, 0);
+  fail_unless(result == NULL, "NULL input job pointer fail");
+
+  result = prefix_std_file(&test_job, NULL, 0);
+  fail_unless(result == NULL, "NULL input dynamic_string pointer fail");
+
+  result = prefix_std_file(&test_job, &test_string, 0);
+  fail_unless(result == NULL, "prefix_std_file fail");
+
+  }
+END_TEST
+
+START_TEST(add_std_filename_test)
+  {
+  struct job test_job;
+  char* path = "path";
+  struct dynamic_string test_string;
+  char* result = NULL;
+  char* at_str = "string";
+
+  memset(&test_job, 0, sizeof(test_job));
+  memset(&test_string, 0, sizeof(test_string));
+  test_job.ji_wattr[JOB_ATR_jobname].at_val.at_str = at_str;
+
+  result = add_std_filename(NULL, path, 0, &test_string);
+  fail_unless(result == NULL, "NULL input job pointer fail");
+
+  result = add_std_filename(&test_job, NULL, 0, &test_string);
+  fail_unless(result == NULL, "NULL input path pointer fail");
+
+  result = add_std_filename(&test_job, path, 0, NULL);
+  fail_unless(result == NULL, "NULL input dynamic_string pointer fail");
+
+  result = add_std_filename(&test_job, path, 0, &test_string);
+  fail_unless(result == NULL, "add_std_filename fail");
+
+  }
+END_TEST
+
+START_TEST(get_jobowner_test)
+  {
+  char* from = "owner@host";
+  char to[PBS_MAXUSER+1];
+
+  memset(to, 0, sizeof(to));
+
+  get_jobowner(NULL, to);
+  get_jobowner(from, NULL);
+
+  get_jobowner(from, to);
+  fail_unless(strcmp(to,"owner") == 0, "get_jobowner fail");
+
+  }
+END_TEST
+
+START_TEST(set_resc_deflt_test)
+  {
+  struct job test_job;
+  struct pbs_attribute test_attribute;
+
+  /*initialize_globals*/
+  server.sv_qs_mutex = calloc(1, sizeof(pthread_mutex_t));
+  server.sv_attr_mutex = calloc(1, sizeof(pthread_mutex_t));
+  server.sv_jobstates_mutex = calloc(1, sizeof(pthread_mutex_t));
+
+  pthread_mutex_init(server.sv_qs_mutex,NULL);
+  pthread_mutex_init(server.sv_attr_mutex,NULL);
+  pthread_mutex_init(server.sv_jobstates_mutex,NULL);
+
+  memset(&test_job, 0, sizeof(test_job));
+  memset(&test_attribute, 0, sizeof(test_attribute));
+
+  set_resc_deflt(NULL, &test_attribute, 0);
+  set_resc_deflt(&test_job, NULL, 0);
+  set_resc_deflt(&test_job, &test_attribute, 0);
+  set_resc_deflt(&test_job, &test_attribute, 1);
   }
 END_TEST
 
-START_TEST(test_two)
+START_TEST(set_chkpt_deflt_test)
   {
+  struct job test_job;
+  struct pbs_queue test_queue;
 
+  memset(&test_job, 0, sizeof(test_job));
+  memset(&test_queue, 0, sizeof(test_queue));
 
+  set_chkpt_deflt(NULL, &test_queue);
+  set_chkpt_deflt(&test_job, NULL);
+  set_chkpt_deflt(&test_job, &test_queue);
+  }
+END_TEST
+
+START_TEST(set_statechar_test)
+  {
+  struct job test_job;
+
+  memset(&test_job, 0, sizeof(test_job));
+
+  set_statechar(NULL);
+  set_statechar(&test_job);
   }
 END_TEST
 
 Suite *svr_jobfunc_suite(void)
   {
   Suite *s = suite_create("svr_jobfunc_suite methods");
-  TCase *tc_core = tcase_create("test_one");
-  tcase_add_test(tc_core, test_one);
+  TCase *tc_core = tcase_create("svr_enquejob_test");
+  tcase_add_test(tc_core, svr_enquejob_test);
+  suite_add_tcase(s, tc_core);
+
+  tc_core = tcase_create("svr_dequejob_test");
+  tcase_add_test(tc_core, svr_dequejob_test);
+  suite_add_tcase(s, tc_core);
+
+  tc_core = tcase_create("svr_setjobstate_test");
+  tcase_add_test(tc_core, svr_setjobstate_test);
+  suite_add_tcase(s, tc_core);
+
+  tc_core = tcase_create("svr_evaljobstate_test");
+  tcase_add_test(tc_core, svr_evaljobstate_test);
+  suite_add_tcase(s, tc_core);
+
+  tc_core = tcase_create("get_variable_test");
+  tcase_add_test(tc_core, get_variable_test);
+  suite_add_tcase(s, tc_core);
+
+  tc_core = tcase_create("chk_resc_limits_test");
+  tcase_add_test(tc_core, chk_resc_limits_test);
+  suite_add_tcase(s, tc_core);
+
+  tc_core = tcase_create("svr_chkque_test");
+  tcase_add_test(tc_core, svr_chkque_test);
+  suite_add_tcase(s, tc_core);
+
+  tc_core = tcase_create("job_set_wait_test");
+  tcase_add_test(tc_core, job_set_wait_test);
+  suite_add_tcase(s, tc_core);
+
+  tc_core = tcase_create("prefix_std_file_test");
+  tcase_add_test(tc_core, prefix_std_file_test);
+  suite_add_tcase(s, tc_core);
+
+  tc_core = tcase_create("add_std_filename_test");
+  tcase_add_test(tc_core, add_std_filename_test);
+  suite_add_tcase(s, tc_core);
+
+  tc_core = tcase_create("get_jobowner_test");
+  tcase_add_test(tc_core, get_jobowner_test);
+  suite_add_tcase(s, tc_core);
+
+  tc_core = tcase_create("set_resc_deflt_test");
+  tcase_add_test(tc_core, set_resc_deflt_test);
+  suite_add_tcase(s, tc_core);
+
+  tc_core = tcase_create("set_chkpt_deflt_test");
+  tcase_add_test(tc_core, set_chkpt_deflt_test);
   suite_add_tcase(s, tc_core);
 
-  tc_core = tcase_create("test_two");
-  tcase_add_test(tc_core, test_two);
+  tc_core = tcase_create("set_statechar_test");
+  tcase_add_test(tc_core, set_statechar_test);
   suite_add_tcase(s, tc_core);
 
   return s;
diff --git a/src/server/test/svr_mail/scaffolding.c b/src/server/test/svr_mail/scaffolding.c
index 597b800371..d1a0a818d3 100644
--- a/src/server/test/svr_mail/scaffolding.c
+++ b/src/server/test/svr_mail/scaffolding.c
@@ -13,7 +13,7 @@ int enqueue_threadpool_request(void *(*func)(void *),void *arg)
   exit(1);
   }
 
-void svr_format_job(FILE *fh, mail_info *mi, char *fmt)
+void svr_format_job(FILE *fh, mail_info *mi, const char *fmt)
   {
   fprintf(stderr, "The call to svr_format_job to be mocked!!\n");
   exit(1);
diff --git a/src/server/test/svr_movejob/scaffolding.c b/src/server/test/svr_movejob/scaffolding.c
index 09edba89d8..4c3ce44f60 100644
--- a/src/server/test/svr_movejob/scaffolding.c
+++ b/src/server/test/svr_movejob/scaffolding.c
@@ -15,15 +15,15 @@
 char *path_jobs;
 struct connect_handle connection[10];
 attribute_def job_attr_def[10];
-char *pbs_o_host = "PBS_O_HOST";
-char *msg_routexceed = "Route queue lifetime exceeded";
+const char *pbs_o_host = "PBS_O_HOST";
+const char *msg_routexceed = "Route queue lifetime exceeded";
 int queue_rank = 0;
 char *path_spool;
-char *msg_movejob = "Job moved to ";
+const char *msg_movejob = "Job moved to ";
 pbs_net_t pbs_server_addr;
 unsigned int pbs_server_port_dis;
+const char *msg_manager = "%s at request of %s@%s";
 int LOGLEVEL = 7; /* force logging code to be exercised as tests run */
-char *msg_manager = "%s at request of %s@%s";
 
 
 
@@ -268,9 +268,9 @@ struct pbs_queue *lock_queue_with_job_held(
   return(NULL);
   }
 
-void svr_mailowner(job *pjob, int mailpoint, int force, char *text) {}
+void svr_mailowner(job *pjob, int mailpoint, int force, const char *text) {}
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/test/svr_recov/scaffolding.c b/src/server/test/svr_recov/scaffolding.c
index 8e5b556436..38a8f6acbe 100644
--- a/src/server/test/svr_recov/scaffolding.c
+++ b/src/server/test/svr_recov/scaffolding.c
@@ -7,7 +7,7 @@
 #include "dynamic_string.h" /* dynamic_string */
 
 char *path_priv = NULL;
-char *msg_svdbopen = "Unable to open server data base";
+const char *msg_svdbopen = "Unable to open server data base";
 char *path_svrdb = NULL;
 struct server server;
 attribute_def svr_attr_def[10];
@@ -45,13 +45,13 @@ ssize_t write_nonblocking_socket(int fd, const void *buf, ssize_t count)
  exit(1);
  }
 
-int find_attr(struct attribute_def *attr_def, char *name, int limit)
+int find_attr(struct attribute_def *attr_def, const char *name, int limit)
  {
  fprintf(stderr, "The call to find_attr to be mocked!!\n");
  exit(1);
  }
 
-int decode_resc(struct pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_resc(struct pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
  {
  fprintf(stderr, "The call to decode_resc to be mocked!!\n");
  exit(1);
@@ -75,7 +75,7 @@ void *get_next(list_link pl, char *file, int line)
  exit(1);
  }
 
-int decode_arst(struct pbs_attribute *patr, const char *name, char *rescn, char *val, int perm)
+int decode_arst(struct pbs_attribute *patr, const char *name, const char *rescn, const char *val, int perm)
  {
  fprintf(stderr, "The call to decode_arst to be mocked!!\n");
  exit(1);
@@ -120,3 +120,13 @@ int lock_sv_qs_mutex(pthread_mutex_t *sv_qs_mutex, const char *msg_string)
   {
   return(0);
   }
+
+ssize_t write_ac_socket(int fd, const void *buf, ssize_t count)
+  {
+  return(0);
+  }
+
+ssize_t read_ac_socket(int fd, void *buf, ssize_t count)
+  {
+  return(0);
+  }
diff --git a/src/server/test/track_alps_reservations/scaffolding.c b/src/server/test/track_alps_reservations/scaffolding.c
index 8335984239..fe55227380 100644
--- a/src/server/test/track_alps_reservations/scaffolding.c
+++ b/src/server/test/track_alps_reservations/scaffolding.c
@@ -37,16 +37,16 @@ job *svr_find_job(
     return(NULL);
   else if (count <= 3)
     {
-    pjob = calloc(1, sizeof(job));
+    pjob = (job *)calloc(1, sizeof(job));
     pjob->ji_qs.ji_state = JOB_STATE_RUNNING;
-    pjob->ji_mutex = calloc(1, sizeof(pthread_mutex_t));
+    pjob->ji_mutex = (pthread_mutex_t *)calloc(1, sizeof(pthread_mutex_t));
     return(pjob);
     }
   else
     {
-    pjob = calloc(1, sizeof(job));
+    pjob = (job *)calloc(1, sizeof(job));
     pjob->ji_qs.ji_state = JOB_STATE_COMPLETE;
-    pjob->ji_mutex = calloc(1, sizeof(pthread_mutex_t));
+    pjob->ji_mutex = (pthread_mutex_t *)calloc(1, sizeof(pthread_mutex_t));
     return(pjob);
     }
   }
@@ -57,7 +57,7 @@ int check_and_resize(
   resizable_array *ra)
 
   {
-  static char *id = "check_and_resize";
+  static const char *id = "check_and_resize";
   slot        *tmp;
   size_t       remaining;
   size_t       size;
@@ -67,7 +67,7 @@ int check_and_resize(
     /* double the size if we're out of space */
     size = (ra->max * 2) * sizeof(slot);
 
-    if ((tmp = realloc(ra->slots,size)) == NULL)
+    if ((tmp = (slot *)realloc(ra->slots,size)) == NULL)
       {
       log_err(ENOMEM,id, (char *)"No memory left to resize the array");
       return(ENOMEM);
@@ -143,7 +143,7 @@ resizable_array *initialize_resizable_array(
   int               size)
 
   {
-  resizable_array *ra = calloc(1, sizeof(resizable_array));
+  resizable_array *ra = (resizable_array *)calloc(1, sizeof(resizable_array));
   size_t           amount = sizeof(slot) * size;
 
   ra->max       = size;
@@ -151,7 +151,7 @@ resizable_array *initialize_resizable_array(
   ra->next_slot = 1;
   ra->last      = 0;
 
-  ra->slots = calloc(1, amount);
+  ra->slots = (slot *)calloc(1, amount);
 
   return(ra);
   } /* END initialize_resizable_array() */
@@ -189,7 +189,7 @@ void add_to_bucket(
   if (buckets[index] == NULL)
     {
     /* empty bucket, just add it here */
-    buckets[index] = calloc(1, sizeof(bucket));
+    buckets[index] = (bucket *)calloc(1, sizeof(bucket));
     buckets[index]->value = value;
     buckets[index]->key   = key;
     buckets[index]->next  = NULL;
@@ -202,7 +202,7 @@ void add_to_bucket(
     while (b->next != NULL)
       b = b->next;
 
-    b->next = calloc(1, sizeof(bucket));
+    b->next = (bucket *)calloc(1, sizeof(bucket));
     b->next->value = value;
     b->next->key   = key;
     b->next->next  = NULL;
@@ -282,7 +282,7 @@ int add_hash(
     int      old_bucket_size = ht->size;
     int      new_bucket_size = ht->size * 2;
     size_t   amount = new_bucket_size * sizeof(bucket *);
-    bucket **tmp = calloc(1, amount);
+    bucket **tmp = (bucket **)calloc(1, amount);
     int      i;
     int      new_index;
       
@@ -312,7 +312,7 @@ int add_hash(
 
   index = get_hash(ht,key);
 
-  add_to_bucket(ht->buckets,index,key,value);
+  add_to_bucket(ht->buckets,index,(char *)key,value);
 
   ht->num++;
 
@@ -330,7 +330,7 @@ int get_value_hash(
 
   while (b != NULL)
     {
-    if (!strcmp(b->key,key))
+    if (!strcmp(b->key,(char *)key))
       {
       value = b->value;
       break;
@@ -349,12 +349,12 @@ hash_table_t *create_hash(
   int size)
 
   {
-  hash_table_t *ht = calloc(1, sizeof(hash_table_t));
+  hash_table_t *ht = (hash_table_t *)calloc(1, sizeof(hash_table_t));
   size_t        amount = sizeof(bucket *) * size;
 
   ht->size = size;
   ht->num  = 0;
-  ht->buckets = calloc(1, amount);
+  ht->buckets = (bucket **)calloc(1, amount);
 
   return(ht);
   } /* END create_hash() */
@@ -455,7 +455,7 @@ int remove_hash(
   } /* END remove_hash() */
 
 
-int unlock_ji_mutex(job *pjob, const char *id, char *msg, int logging)
+int unlock_ji_mutex(job *pjob, const char *id, const char *msg, int logging)
   {
   return(0);
   }
diff --git a/src/server/track_alps_reservations.c b/src/server/track_alps_reservations.c
index c7785d5405..6464580776 100644
--- a/src/server/track_alps_reservations.c
+++ b/src/server/track_alps_reservations.c
@@ -143,7 +143,7 @@ alps_reservation *populate_alps_reservation(
   {
   alps_reservation *ar = NULL;
   
-  if ((ar = calloc(1, sizeof(alps_reservation))) != NULL)
+  if ((ar = (alps_reservation *)calloc(1, sizeof(alps_reservation))) != NULL)
     {
     ar->job_id = strdup(pjob->ji_qs.ji_jobid);
     ar->rsv_id = strdup(pjob->ji_wattr[JOB_ATR_reservation_id].at_val.at_str);
@@ -244,7 +244,7 @@ int is_orphaned(
   pthread_mutex_lock(alps_reservations.rh_mutex);
   index = get_value_hash(alps_reservations.rh_ht, rsv_id);
   if (index != -1)
-    ar = alps_reservations.rh_alps_rsvs->slots[index].item;
+    ar = (alps_reservation *)alps_reservations.rh_alps_rsvs->slots[index].item;
   pthread_mutex_unlock(alps_reservations.rh_mutex);
 
   if (ar != NULL)
@@ -254,7 +254,7 @@ int is_orphaned(
       if (pjob->ji_qs.ji_state == JOB_STATE_COMPLETE)
         orphaned = TRUE;
 
-      unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL);
+      unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL);
       }
     else
       orphaned = TRUE;
@@ -302,7 +302,7 @@ int remove_alps_reservation(
     rc = THING_NOT_FOUND;
   else
     {
-    ar = alps_reservations.rh_alps_rsvs->slots[index].item;
+    ar = (alps_reservation *)alps_reservations.rh_alps_rsvs->slots[index].item;
     remove_thing_from_index(alps_reservations.rh_alps_rsvs, index);
     remove_hash(alps_reservations.rh_ht, rsv_id);
     }
@@ -320,7 +320,7 @@ int remove_alps_reservation(
 void initialize_alps_reservations()
 
   {
-  alps_reservations.rh_mutex = calloc(1, sizeof(pthread_mutex_t));
+  alps_reservations.rh_mutex = (pthread_mutex_t*)calloc(1, sizeof(pthread_mutex_t));
   pthread_mutex_init(alps_reservations.rh_mutex, NULL);
 
   alps_reservations.rh_alps_rsvs = initialize_resizable_array(INITIAL_RESERVATION_HOLDER_SIZE);
diff --git a/src/server/user_info.c b/src/server/user_info.c
index 98a8a52c40..ec54c155ac 100644
--- a/src/server/user_info.c
+++ b/src/server/user_info.c
@@ -95,7 +95,7 @@ void initialize_user_info_holder(
   uih->ui_ra = initialize_resizable_array(INITIAL_USER_INFO_COUNT);
   uih->ui_ht = create_hash(INITIAL_HASH_SIZE);
 
-  uih->ui_mutex = calloc(1, sizeof(pthread_mutex_t));
+  uih->ui_mutex = (pthread_mutex_t*)calloc(1, sizeof(pthread_mutex_t));
   pthread_mutex_init(uih->ui_mutex, NULL);
   } /* END initialize_user_info_holder() */
 
@@ -115,7 +115,7 @@ unsigned int get_num_queued(
 
   if ((index = get_value_hash(uih->ui_ht, user_name)) > 0)
     {
-    ui = uih->ui_ra->slots[index].item;
+    ui = (user_info *)uih->ui_ra->slots[index].item;
     num_queued = ui->num_jobs_queued;
     }
 
@@ -189,20 +189,20 @@ int  increment_queued_jobs(
   /* get the user if there is one */
   if ((index = get_value_hash(uih->ui_ht, user_name)) > 0)
     {
-    ui = uih->ui_ra->slots[index].item;
+    ui = (user_info *)uih->ui_ra->slots[index].item;
     ui->num_jobs_queued += num_submitted;
     }
   else
     {
     /* user doesn't exist, create a new one and insert */
-    ui = calloc(1, sizeof(user_info));
+    ui = (user_info *)calloc(1, sizeof(user_info));
     ui->user_name = strdup(user_name);
     ui->num_jobs_queued = num_submitted;
 
     if ((index = insert_thing(uih->ui_ra, ui)) == -1)
       {
       rc = ENOMEM;
-      log_err(rc, __func__, (char *)"Can't resize the user info array");
+      log_err(rc, __func__, "Can't resize the user info array");
       }
     else
       {
@@ -232,7 +232,7 @@ int  decrement_queued_jobs(
 
   if ((index = get_value_hash(uih->ui_ht, user_name)) > 0)
     {
-    ui = uih->ui_ra->slots[index].item;
+    ui = (user_info *)uih->ui_ra->slots[index].item;
     ui->num_jobs_queued -= 1;
     rc = PBSE_NONE;
     }
diff --git a/src/tools/printjob.c b/src/tools/printjob.c
index 1f1889228b..1d4c8fc901 100644
--- a/src/tools/printjob.c
+++ b/src/tools/printjob.c
@@ -90,6 +90,8 @@
 #include "server_limits.h"
 #include "pbs_job.h"
 #include "tm.h"
+#include "../lib/Libifl/lib_ifl.h"
+
 
 void prt_job_struct(
 
@@ -201,7 +203,7 @@ int read_attr(
   svrattrl *pal;
   svrattrl  tempal;
 
-  i = read(fd, (char *) & tempal, sizeof(tempal));
+  i = read_ac_socket(fd, (char *) & tempal, sizeof(tempal));
 
   if (i != sizeof(tempal))
     {
@@ -234,7 +236,7 @@ int read_attr(
 
   amt = pal->al_tsize - sizeof(svrattrl);
 
-  i = read(fd, (char *)pal + sizeof(svrattrl), amt - 1);
+  i = read_ac_socket(fd, (char *)pal + sizeof(svrattrl), amt - 1);
 
   if (i != amt)
     {
@@ -292,25 +294,25 @@ int read_tm_info(
   tm_task_id taskid;
   tm_task_id nodeid;
 
-  if (read(fds, (char *)&outport, sizeof(int)) != sizeof(int))
+  if (read_ac_socket(fds, (char *)&outport, sizeof(int)) != sizeof(int))
     {
     fprintf(stderr, "short read of TM output info\n");
     exit(2);
     }
 
-  if (read(fds, (char *)&errport, sizeof(int)) != sizeof(int))
+  if (read_ac_socket(fds, (char *)&errport, sizeof(int)) != sizeof(int))
     {
     fprintf(stderr, "short read of TM error info\n");
     exit(2);
     }
 
-  if (read(fds, (char *)&taskid, sizeof(tm_task_id)) != sizeof(tm_task_id))
+  if (read_ac_socket(fds, (char *)&taskid, sizeof(tm_task_id)) != sizeof(tm_task_id))
     {
     fprintf(stderr, "short read of TM task info\n");
     exit(2);
     }
 
-  if (read(fds, (char *)&nodeid, sizeof(tm_node_id)) != sizeof(tm_node_id))
+  if (read_ac_socket(fds, (char *)&nodeid, sizeof(tm_node_id)) != sizeof(tm_node_id))
     {
     fprintf(stderr, "short read of TM nodeid info\n");
     exit(2);
@@ -385,7 +387,7 @@ int main(
       exit(1);
       }
 
-    amt = read(fp, &xjob.ji_qs, sizeof(xjob.ji_qs));
+    amt = read_ac_socket(fp, &xjob.ji_qs, sizeof(xjob.ji_qs));
 
     if (amt != sizeof(xjob.ji_qs))
       {
diff --git a/src/tools/printserverdb.c b/src/tools/printserverdb.c
index f4a540fcf8..b529a5e610 100644
--- a/src/tools/printserverdb.c
+++ b/src/tools/printserverdb.c
@@ -12,6 +12,8 @@
 #include "attribute.h"
 #include "server_limits.h"
 #include "server.h"
+#include "../lib/Libifl/lib_ifl.h"
+
 
 int no_attributes = 0;
 
@@ -51,7 +53,7 @@ int read_attr(
   svrattrl *pal;
   svrattrl  tempal;
 
-  i = read(fd, (char *) & tempal, sizeof(tempal));
+  i = read_ac_socket(fd, (char *) & tempal, sizeof(tempal));
 
   if (i != sizeof(tempal))
     {
@@ -84,7 +86,7 @@ int read_attr(
 
   amt = pal->al_tsize - sizeof(svrattrl);
 
-  i = read(fd, (char *)pal + sizeof(svrattrl) - 1, amt);
+  i = read_ac_socket(fd, (char *)pal + sizeof(svrattrl) - 1, amt);
 
   if (i != amt)
     {
@@ -149,7 +151,7 @@ void dumpdb(char *file)
     exit(1);
     }
 
-  amt = read(fp, &xserver.sv_qs, sizeof(xserver.sv_qs));
+  amt = read_ac_socket(fp, &xserver.sv_qs, sizeof(xserver.sv_qs));
 
   if (amt != sizeof(xserver.sv_qs))
     {
diff --git a/src/tools/printtracking.c b/src/tools/printtracking.c
index 6014f9621a..6a74414814 100644
--- a/src/tools/printtracking.c
+++ b/src/tools/printtracking.c
@@ -88,6 +88,7 @@
 #include "list_link.h"
 #include "work_task.h"
 #include "tracking.h"
+#include "../lib/Libifl/lib_ifl.h"
 
 /*
 struct tracking {
@@ -145,7 +146,7 @@ main(int argc, char *argv[])
       exit(1);
       }
 
-    while ((amt = read(fp, &track, sizeof(track))) == sizeof(track))
+    while ((amt = read_ac_socket(fp, &track, sizeof(track))) == sizeof(track))
       {
       prt_track_struct(&track);
       }
diff --git a/src/tools/tracejob.c b/src/tools/tracejob.c
index 65441fc1de..481c2996ef 100644
--- a/src/tools/tracejob.c
+++ b/src/tools/tracejob.c
@@ -836,7 +836,7 @@ int log_path(
           tm_ptr->tm_mon + 1,
           tm_ptr->tm_mday);
 
-  filenames[filecount] = malloc(strlen(buf)+1);
+  filenames[filecount] = (char *)malloc(strlen(buf)+1);
 
   if(!filenames[filecount])
   {
@@ -854,7 +854,7 @@ int log_path(
     {
     while (fgets(pbuf, 512, fp) != NULL)
       {
-      filenames[filecount] = malloc(strlen(pbuf)+1);
+      filenames[filecount] = (char *)malloc(strlen(pbuf)+1);
 
       if (filenames[filecount] == NULL)
         {
@@ -905,7 +905,7 @@ alloc_more_space(void)
   else
     ll_max_amm *= 2;
 
-  if ((log_lines = realloc(log_lines, ll_max_amm * sizeof(struct log_entry))) == NULL)
+  if ((log_lines = (struct log_entry *)realloc(log_lines, ll_max_amm * sizeof(struct log_entry))) == NULL)
     {
     perror("Error allocating memory");
     exit(1);