Changeset c90500 in git

Timestamp:

Nov 20, 2012, 4:50:00 PM (10 years ago)

Author:

Zoltan Kovacs <kovzol@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

3e7db4d961b4509d248e12d8e96e2bed08d9cfe8

Parents:

cecef07e441bf8e0ac3da94431b1ca83e92e753f

Message:

Reverting 26c8e6010d08437813f7b3dcc02d4afa785e062d (Disallow "link" command when --no-shell is set on command line) and adding suggested change from Hans Schoenemann instead

Location:

Singular

Files:

• ipid.cc (modified) (2 diffs)
• links/silink.cc (modified) (2 diffs)

Singular/ipid.cc

@@ -29 +29 @@
 #include <Singular/ipid.h>
 #include <Singular/blackbox.h>
-#include "feOpt.h"
 
 #ifdef HAVE_DYNAMIC_LOADING
@@ -153 +152 @@
     //the types with the standard init: set the struct to zero
     case LINK_CMD:
-      if (feOptValue(FE_OPT_NO_SHELL)) Werror("link data type is disallowed in restricted mode");
       return (void*) omAlloc0Bin(sip_link_bin);
     case RING_CMD:

Singular/links/silink.cc

@@ -31 +31 @@
 #include <Singular/links/ssiLink.h>
 #include <Singular/links/pipeLink.h>
+#include "feOpt.h"
 
 // #ifdef HAVE_DBM
@@ -196 +197 @@
 
     if (l->m == NULL) slInit(l, ((char*)""));
+
+    if (feOptValue(FE_OPT_NO_SHELL)) {WerrorS("no links allowed");return TRUE;}
 
     const char *c="_";;