Changeset 202 for trunk/run_email2trac.c

Timestamp:

05/27/08 22:43:52 (16 years ago)

Author:

bas

Message:

email2trac.py.in:

• added set_ticket_fields function, #55
• added option -t,--ticket_prefix, #55
• removed obsolete code

run_email2trac.c:

• added some patches from redhat

File:

• trunk/run_email2trac.c (modified) (3 diffs)

trunk/run_email2trac.c

@@ -55 +55 @@
   int status;
 
-  char   *trac_script;
   char   **trac_script_args;
   struct passwd *TRAC; 
   struct passwd *MTA;
   struct stat script_attrs;
+  const char *trac_script = TRAC_SCRIPT_PATH "/" TRAC_SCRIPT_NAME;
  
-  trac_script = malloc((strlen(TRAC_SCRIPT_PATH) 
-        + strlen(TRAC_SCRIPT_NAME) + 10) * sizeof(char));
-
-  strncat(trac_script,TRAC_SCRIPT_PATH, strlen(TRAC_SCRIPT_PATH));
-  strcat(trac_script,"/");
-  strncat(trac_script,TRAC_SCRIPT_NAME, strlen(TRAC_SCRIPT_NAME));
-
   /*
   printf("trac_script = %s\n", trac_script);
@@ -74 +67 @@
   /* First copy arguments passed to the wrapper as scripts arguments
      after filtering out some of the possible script options */
+
   trac_script_args = (char**) malloc((argc+1)*sizeof(char*));
+  if (trac_script_args == NULL) {
+    if ( DEBUG ) printf("malloc failed\n");
+    return 1;
+  }
   trac_script_args[0] = TRAC_SCRIPT_NAME;
   for (i=j=1; i<argc; i++) {
@@ -109 +107 @@
   check_username(TRAC_USER);
   if ( TRAC = getpwnam(TRAC_USER) ) {
-    setgid(TRAC->pw_gid);
-    setuid(TRAC->pw_uid);
+    if (setgid(TRAC->pw_gid) || setuid(TRAC->pw_uid)) {
+      if ( DEBUG ) printf("setgid or setuid failed\n");
+      return -5;
+    }
   } else {
     if ( DEBUG ) printf("Invalid Trac user (%s)\n",TRAC_USER);