[dovecot-cvs] dovecot/src/master auth-process.c,1.79,1.80

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/master
In directory talvi:/tmp/cvs-serv8306/master

Modified Files:
	auth-process.c 
Log Message:
Make auth worker processes work with chroot enabled.



Index: auth-process.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/auth-process.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- auth-process.c	12 Mar 2005 22:48:33 -0000	1.79
+++ auth-process.c	8 May 2005 17:19:31 -0000	1.80
@@ -294,6 +294,7 @@
 	group->process_count++;
 
 	path = t_strdup_printf("%s/auth-worker.%s",
+			       group->set->chroot != NULL ? group->set->chroot :
 			       group->set->parent->defaults->base_dir,
 			       dec2str(pid));
 	p->worker_listen_fd =
@@ -338,6 +339,8 @@
 	p->group->process_count--;
 
 	path = t_strdup_printf("%s/auth-worker.%s",
+			       p->group->set->chroot != NULL ?
+			       p->group->set->chroot :
 			       p->group->set->parent->defaults->base_dir,
 			       dec2str(p->pid));
 	(void)unlink(path);
@@ -534,6 +537,7 @@
         auth_set_environment(group->set);
 
 	env_put(t_strdup_printf("AUTH_WORKER_PATH=%s/auth-worker.%s",
+				group->set->chroot != NULL ? "" :
 				group->set->parent->defaults->base_dir,
 				dec2str(getpid())));
 	env_put(t_strdup_printf("AUTH_WORKER_MAX_COUNT=%u",