X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fmain.c;h=4bded58a17e426031bad5659f962bc71110c302a;hb=refs%2Fheads%2Fprotodoc;hp=025c5a291ff8d2e66c12c1c5c5736a21ad680bcf;hpb=dae3c8b486e3283767205fd78cdf4eb1840c4ef6;p=doldaconnect.git

diff --git a/daemon/main.c b/daemon/main.c
index 025c5a2..4bded58 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -43,6 +43,10 @@
 #include "sysevents.h"
 #include "auth.h"
 
+#ifdef HAVE_KEYUTILS
+#include <keyutils.h>
+#endif
+
 struct module *modchain = NULL;
 static struct timer *timers = NULL;
 static struct child *children = NULL;
@@ -300,9 +304,13 @@ pid_t forksess(uid_t user, struct authhandle *auth, void (*ccbfunc)(pid_t, int,
 		close(i);
 	    }
 	}
-	setpgrp();
+	setpgid(0, 0);
 	signal(SIGHUP, SIG_IGN);
 	errno = 0;
+#ifdef HAVE_KEYUTILS
+	keyctl_join_session_keyring(NULL);
+	keyctl_chown(KEY_SPEC_SESSION_KEYRING, pwent->pw_uid, pwent->pw_gid);
+#endif
 	if((authopensess(auth)) != AUTH_SUCCESS)
 	{
 	    flog(LOG_WARNING, "could not open session for user %s: %s", pwent->pw_name, (errno == 0)?"Unknown error - should be logged above":strerror(errno));
@@ -377,6 +385,7 @@ int main(int argc, char **argv)
     struct child *child;
     double now;
     
+    now = ntime();
     immsyslog = nofork = 0;
     syslogfac = LOG_DAEMON;
     configfile = NULL;
@@ -452,7 +461,7 @@ int main(int argc, char **argv)
     preinit(0);
     if(configfile == NULL)
     {
-	if((configfile = findconfigfile()) == NULL)
+	if((configfile = findfile("doldacond.conf", NULL, 0)) == NULL)
 	{
 	    flog(LOG_CRIT, "could not find a configuration file");
 	    exit(1);
@@ -486,6 +495,7 @@ int main(int argc, char **argv)
 	fprintf(pfstream, "%i\n", getpid());
 	fclose(pfstream);
     }
+    flog(LOG_INFO, "startup took %f seconds", ntime() - now);
     running = 1;
     reinit = 0;
     while(running)