op/patches: op-add-paths-option.diff

main.c.old

@@ -592 +592 @@
-regexp          *reg1 = NULL;
-regexp          *reg2 = NULL;
-struct passwd   *pw;
+char            *new_name;
-#ifdef USE_SHADOW
-struct spwd *spw;
-#endif
@@ -603 +604 @@
-struct          SD_CLIENT sd_dat, *sd;
-int             k;
-char            input[64],*p;
+
-#endif
+        if (cmd->args[0][0] != '/') {
+                if ((cp=FindOpt(cmd, "paths")) == NULL)
+                        return logger(LOG_ERR | LOG_PRINT, "No path nor absolute command. Access denied");
+                else {
+                        new_name=NULL;
+                        for (cp = GetField(cp, str, MAXSTRLEN - 1); cp != NULL; cp = GetField(cp, str, MAXSTRLEN - 1)) {
+                                  if (*str != '/')      /* Absolute path required */
+                                        continue;
+
+                                  if (strlen(str)+strlen(cmd->args[0])+1 >= MAXSTRLEN - 1)
+                                        continue;       /* Pathname too long */
+
+                                  new_name=malloc(strlen(str)+strlen(cmd->args[0])+2);
+                                  strcpy(new_name,str);
+                                  strcat(new_name,"/");
+                                  strcat(new_name,cmd->args[0]);
+                                  if (access(new_name,F_OK) != 0)
+                                        new_name=NULL;
+                                  else
+                                        break;          /* A path candidate is found */
+                        }
+                }
+                if (new_name == NULL)
+                        return logger(LOG_ERR | LOG_PRINT, "No valid pathname found. Access denied");
+
+                free(cmd->args[0]);
+                cmd->args[0]=new_name;
+        }
+            
-
-        if ((pw = getpwuid(getuid())) == NULL) return -1;
-