Dolda2000 GitWeb
/
doldaconnect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added dc_connectlocal.
[doldaconnect.git]
/
daemon
/
main.c
diff --git
a/daemon/main.c
b/daemon/main.c
index
2c6f08d
..
4bded58
100644
(file)
--- a/
daemon/main.c
+++ b/
daemon/main.c
@@
-304,11
+304,12
@@
pid_t forksess(uid_t user, struct authhandle *auth, void (*ccbfunc)(pid_t, int,
close(i);
}
}
close(i);
}
}
- setpg
rp(
);
+ setpg
id(0, 0
);
signal(SIGHUP, SIG_IGN);
errno = 0;
#ifdef HAVE_KEYUTILS
keyctl_join_session_keyring(NULL);
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)
{
#endif
if((authopensess(auth)) != AUTH_SUCCESS)
{
@@
-384,6
+385,7
@@
int main(int argc, char **argv)
struct child *child;
double now;
struct child *child;
double now;
+ now = ntime();
immsyslog = nofork = 0;
syslogfac = LOG_DAEMON;
configfile = NULL;
immsyslog = nofork = 0;
syslogfac = LOG_DAEMON;
configfile = NULL;
@@
-459,7
+461,7
@@
int main(int argc, char **argv)
preinit(0);
if(configfile == NULL)
{
preinit(0);
if(configfile == NULL)
{
- if((configfile = find
configfile(
)) == NULL)
+ if((configfile = find
file("doldacond.conf", NULL, 0
)) == NULL)
{
flog(LOG_CRIT, "could not find a configuration file");
exit(1);
{
flog(LOG_CRIT, "could not find a configuration file");
exit(1);
@@
-493,6
+495,7
@@
int main(int argc, char **argv)
fprintf(pfstream, "%i\n", getpid());
fclose(pfstream);
}
fprintf(pfstream, "%i\n", getpid());
fclose(pfstream);
}
+ flog(LOG_INFO, "startup took %f seconds", ntime() - now);
running = 1;
reinit = 0;
while(running)
running = 1;
reinit = 0;
while(running)