1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00

- Added patch to fix a problem with the pidfile.

PR:		ports/131591
Submitted by:	Paul Schmehl <pauls@utdallas.edu>
This commit is contained in:
Felippe de Meirelles Motta 2009-02-21 21:23:32 +00:00
parent 71184fc15b
commit 60f65fb65b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=228792
2 changed files with 36 additions and 2 deletions

View File

@ -7,9 +7,9 @@
PORTNAME= pads
PORTVERSION= 1.2
PORTREVISION= 1
CATEGORIES= net-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= passive
MASTER_SITES= SF/passive
MAINTAINER= ports@FreeBSD.org
COMMENT= Passively detect network assets

View File

@ -0,0 +1,34 @@
--- src/util.orig.c 2009-02-11 10:29:24.000000000 -0500
+++ src/util.c 2009-02-11 10:30:36.000000000 -0500
@@ -117,16 +117,18 @@
struct passwd *this_user;
/* Default PID File */
- if (gc.pid_file->slen >= 0)
- gc.pid_file = bfromcstr("/var/run/pads.pid");
+ if (pid_file == NULL) {
+ pid_file = bfromcstr("/var/run/pads.pid");
+ gc.pid_file = bfromcstr("/var/run/pads.pid"); // Needed to unlink
+ }
/* Create PID File */
- if ((fp = fopen(bdata(gc.pid_file), "w")) != NULL) {
+ if ((fp = fopen(bdata(pid_file), "w")) != NULL) {
pid = (int) getpid();
fprintf(fp, "%d\n", pid);
fclose(fp);
} else {
- err_message("Unable to create PID file (%s).\n", bdata(gc.pid_file));
+ err_message("Unable to create PID file (%s).\n", bdata(pid_file));
}
/* Change PID File's Ownership */
@@ -137,7 +139,7 @@
err_message("'%s' group does not appear to exist.", bdata(group));
if ((this_user = getpwnam(bdata(user))) == NULL)
err_message("'%s' user does not appear to exist.", bdata(user));
- if ((chown(pid_file, this_user->pw_uid, this_group->gr_gid)) != 0)
+ if ((chown(bdata(pid_file), this_user->pw_uid, this_group->gr_gid)) != 0)
err_message("Unable to change PID file's ownership.");
}