head 1.4; access; symbols OPENPKG_E1_MP_HEAD:1.4 OPENPKG_E1_MP:1.4 OPENPKG_E1_MP_2_STABLE:1.4.2.2 OPENPKG_E1_FP:1.4.2.2 OPENPKG_2_STABLE_MP:1.4 OPENPKG_2_STABLE_20061018:1.4.2.2 OPENPKG_2_STABLE:1.4.0.2 OPENPKG_CW_FP:1.3; locks; strict; comment @# @; 1.4 date 2006.05.22.08.56.15; author cs; state Exp; branches 1.4.2.1; next 1.3; commitid PBYpWNTZHMQjMZxr; 1.3 date 2004.01.24.20.36.33; author rse; state Exp; branches; next 1.2; 1.2 date 2003.11.02.11.59.19; author rse; state Exp; branches; next 1.1; 1.1 date 2003.11.02.11.55.13; author rse; state Exp; branches; next ; 1.4.2.1 date 2006.05.22.08.56.15; author rse; state dead; branches; next 1.4.2.2; commitid iZxwRSmmWscPXUQr; 1.4.2.2 date 2006.10.16.14.53.30; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.4 log @upgrading package: oidentd 2.0.7 -> 2.0.8 @ text @Index: src/oidentd.h --- src/oidentd.h.orig 2003-07-11 16:11:25.000000000 +0200 +++ src/oidentd.h 2003-11-02 12:57:59.000000000 +0100 @@@@ -33,6 +33,12 @@@@ #define UPREFIX "user" /* +** System-wide PID file. +*/ + +#define PIDFILE "/var/run/oidentd.pid" + +/* ** System-wide configuration file. */ Index: src/oidentd.c --- src/oidentd.c.orig 2003-04-24 02:03:54.000000000 +0200 +++ src/oidentd.c 2003-11-02 12:58:23.000000000 +0100 @@@@ -97,6 +97,18 @@@@ exit(-1); } + { + pid_t pid; + FILE *fp; + pid = getpid(); + if ((fp = fopen(PIDFILE, "w")) == NULL) { + o_log(NORMAL, "Fatal: Error writing to pidfile: %s", PIDFILE); + exit(-1); + } + fprintf(fp, "%ld\n", (long)pid); + fclose(fp); + } + if (!opt_enabled(STDIO)) { listen_fds = setup_listen(addr, htons(listen_port)); if (listen_fds == NULL || listen_fds[0] == -1) { @ 1.4.2.1 log @file oidentd.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:53:30 +0000 @ text @d1 38 @ 1.4.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 38 Index: src/oidentd.h --- src/oidentd.h.orig 2003-07-11 16:11:25.000000000 +0200 +++ src/oidentd.h 2003-11-02 12:57:59.000000000 +0100 @@@@ -33,6 +33,12 @@@@ #define UPREFIX "user" /* +** System-wide PID file. +*/ + +#define PIDFILE "/var/run/oidentd.pid" + +/* ** System-wide configuration file. */ Index: src/oidentd.c --- src/oidentd.c.orig 2003-04-24 02:03:54.000000000 +0200 +++ src/oidentd.c 2003-11-02 12:58:23.000000000 +0100 @@@@ -97,6 +97,18 @@@@ exit(-1); } + { + pid_t pid; + FILE *fp; + pid = getpid(); + if ((fp = fopen(PIDFILE, "w")) == NULL) { + o_log(NORMAL, "Fatal: Error writing to pidfile: %s", PIDFILE); + exit(-1); + } + fprintf(fp, "%ld\n", (long)pid); + fclose(fp); + } + if (!opt_enabled(STDIO)) { listen_fds = setup_listen(addr, htons(listen_port)); if (listen_fds == NULL || listen_fds[0] == -1) { @ 1.3 log @add Solaris 10 support @ text @a38 12 Index: configure --- configure.orig 2003-07-11 17:50:57.000000000 +0200 +++ configure 2004-01-24 21:31:19.000000000 +0100 @@@@ -5982,7 +5982,7 @@@@ LIBS="$LIBS -lelf" ;; - *solaris2.9* ) + *solaris2.9* | *solaris2.10* ) cat >>confdefs.h <<\_ACEOF #define SOLARIS 8 @ 1.2 log @correctly die @ text @d39 12 @ 1.1 log @new package: oidentd 2.0.7 (RFC1413 Identification Daemon) @ text @d3 1 a3 1 +++ src/oidentd.h 2003-11-02 12:46:08.000000000 +0100 d19 2 a20 2 +++ src/oidentd.c 2003-11-02 12:47:42.000000000 +0100 @@@@ -97,6 +97,16 @@@@ d28 1 a28 1 + if ((fp = fopen(PIDFILE, "w")) == NULL) d30 2 @