Changeset 374 for trunk

Timestamp:

Nov 1, 2011, 9:53:54 PM (13 years ago)

Author:

katerina

Message:

Patch for ticket #255 (intruder on server). Also disable setting prelink/ps path with --disable-shellexpand.

Location:

trunk/src

Files:

• sh_prelink.c (modified) (1 diff)
• sh_processcheck.c (modified) (2 diffs)

trunk/src/sh_prelink.c

@@ -48 +48 @@
       SL_RETURN((-1), _("sh_prelink_set_path")); 
     }
-
+#ifdef SH_EVAL_SHELL
   prelink_path = sh_util_strdup(str);
-
   SL_RETURN(0, _("sh_prelink_set_path")); 
+#else
+  prelink_path = NULL;
+  SL_RETURN((-1), _("sh_prelink_set_path"));
+#endif
 }
 

trunk/src/sh_processcheck.c

@@ -522 +522 @@
   if (sh_prochk_pspath)
     SH_FREE(sh_prochk_pspath);
+#ifdef SH_EVAL_SHELL
   sh_prochk_pspath = sh_util_strdup (str);
-
   SL_RETURN((0), _("sh_prochk_set_pspath"));
-
+#else
+  sh_prochk_pspath = NULL;
+  SL_RETURN((-1), _("sh_prochk_set_pspath"));
+#endif
 }
 
@@ -536 +539 @@
   if (sh_prochk_psarg)
     SH_FREE(sh_prochk_psarg);
+#ifdef SH_EVAL_SHELL
   sh_prochk_psarg = sh_util_strdup (str);
-
   SL_RETURN((0), _("sh_prochk_set_psarg"));
-
+#else
+  sh_prochk_psarg = NULL;
+  SL_RETURN((-1), _("sh_prochk_set_psarg"));
+#endif
 }