[Pkg-privacy-commits] [onioncat] 188/241: manpage updated
Intrigeri
intrigeri at moszumanska.debian.org
Wed Aug 26 16:17:05 UTC 2015
This is an automated email from the git hooks/post-receive script.
intrigeri pushed a commit to branch upstream-master
in repository onioncat.
commit a98fa122ca86fbb98c0564e125e822714fae3090
Author: eagle <eagle at 58e1ccc2-750e-0410-8d0d-f93ca75ab447>
Date: Fri Jul 3 12:22:26 2009 +0000
manpage updated
git-svn-id: https://www.cypherpunk.at/svn/onioncat/trunk@509 58e1ccc2-750e-0410-8d0d-f93ca75ab447
---
man/ocat.1 | 6 ++++--
src/ocat.c | 7 ++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/man/ocat.1 b/man/ocat.1
index 9496837..d74d5e2 100644
--- a/man/ocat.1
+++ b/man/ocat.1
@@ -103,8 +103,10 @@ Convert \fIIPv6 address\fP to \fIonion_id\fP and exit program.
Use TAP device instead of TUN device. There are a view differences. See \fBTAP
DEVICE\fP later.
.TP
-\fB\-P\fP \fIpid file\fP
-Create \fIpid file\fP instead of \fB/var/run/ocat.pid\fP.
+\fB\-P\fP \fI[pid file]\fP
+Create \fIpid file\fP at \fIpid_file\fP. If the parameter is omitted OC will
+create a pid file at \fB/var/run/ocat.pid\fP. If this option is set without
+parameter it MUST NOT be the last option in the list of options.
.TP
\fB\-r\fP
Run OnionCat as root and do not change user id (see option \fB\-u\fP).
diff --git a/src/ocat.c b/src/ocat.c
index 88e4f25..b3f972f 100644
--- a/src/ocat.c
+++ b/src/ocat.c
@@ -111,9 +111,10 @@ int mk_pid_file(uid_t uid)
void background(void)
{
- pid_t pid;
+ pid_t pid, ppid;
log_debug("backgrounding");
+ ppid = getpid();
pid = fork();
switch(pid)
{
@@ -123,11 +124,11 @@ void background(void)
return;
case 0:
- log_msg(LOG_INFO, "process backgrounded, pid = %d", getpid());
+ log_msg(LOG_INFO, "process backgrounded by parent %d, new pid = %d", ppid, getpid());
return;
default:
- log_debug("parent [%d] exits, background pid = %d", getpid(), pid);
+ log_debug("parent %d exits, background pid = %d", ppid, pid);
if (CNF(logf))
fclose(CNF(logf));
_exit(0);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onioncat.git
More information about the Pkg-privacy-commits
mailing list