@@ -45,7 +45,7 @@ export makefile_defs

 VERSION = 0

 PATCHLEVEL = 8

 SUBLEVEL =   13

-EXTRAVERSION = -dev-28

+EXTRAVERSION = -dev-29

 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)

 OS = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")

@@ -31,8 +31,12 @@

  *  2004-02-20  removed from ser main.c into its own file (andrei)

  *  2004-03-04  moved setuid/setgid in do_suid() (andrei)

  *  2004-03-25  added increase_open_fds & set_core_dump (andrei)

+ *  2004-04-04  applied pgid patch from janakj

  */

+#define _XOPEN_SOURCE

+#define _XOPEN_SOURCE_EXTENDED

+

 #include <sys/types.h>

 #include <unistd.h>

 #include <signal.h>

@@ -127,6 +131,27 @@ int daemonize(char*  name)

 			fclose(pid_stream);

 		}

 	}

+

+	if (pgid_file!=0){

+		if ((pid_stream=fopen(pgid_file, "r"))!=NULL){

+			fscanf(pid_stream, "%d", &p);

+			fclose(pid_stream);

+			if (p==-1){

+				LOG(L_CRIT, "pgid file %s exists, but doesn't contain a valid"

+				    " pgid number\n", pgid_file);

+				goto error;

+			}

+		}

+		pid=getpgid(0);

+		if ((pid_stream=fopen(pgid_file, "w"))==NULL){

+			LOG(L_WARN, "unable to create pgid file %s: %s\n",

+			    pgid_file, strerror(errno));

+			goto error;

+		}else{

+			fprintf(pid_stream, "%i\n", (int)pid);

+			fclose(pid_stream);

+		}

+	}

 	/* try to replace stdin, stdout & stderr with /dev/null */

 	if (freopen("/dev/null", "r", stdin)==0){

@@ -51,6 +51,7 @@ extern unsigned short port_no;

 extern int uid;

 extern int gid;

 char* pid_file;

+char* pgid_file;

 extern int own_pgid; /* whether or not we have our own pgid (and it's ok

 >--->--->--->--->--->--->--->--->--->--->--- to use kill(0, sig) */

@@ -237,6 +237,7 @@ Options:\n\

     -u uid       Change uid \n\

     -g gid       Change gid \n\

     -P file      Create a pid file\n\

+    -G file      Create a pgid file\n\

     -i fifo_path Create a fifo (usefull for monitoring " NAME ") \n\

     -x socket    Create a unix domain socket \n"

 #ifdef STATS

@@ -405,7 +406,7 @@ extern int yyparse();

 int is_main=1; /* flag = is this the  "main" process? */

 char* pid_file = 0; /* filename as asked by use */

-

+char* pgid_file = 0;

 /* callit before exiting; if show_status==1, mem status is displayed */

@@ -440,6 +441,7 @@ void cleanup(show_status)

 	shm_mem_destroy();

 #endif

 	if (pid_file) unlink(pid_file);

+	if (pgid_file) unlink(pgid_file);

 }

@@ -1125,7 +1127,7 @@ int main(int argc, char** argv)

 #ifdef STATS

 	"s:"

 #endif

-	"f:cp:m:b:l:n:N:rRvdDETVhw:t:u:g:P:i:x:";

+	"f:cp:m:b:l:n:N:rRvdDETVhw:t:u:g:P:G:i:x:";

 	while((c=getopt(argc,argv,options))!=-1){

 		switch(c){

@@ -1248,6 +1250,9 @@ int main(int argc, char** argv)

 			case 'P':

 					pid_file=optarg;

 					break;

+		        case 'G':

+				        pgid_file=optarg;

+				        break;

 			case 'i':

 					fifo=optarg;

 					break;