[Pkg-nagios-changes] nsca/src nsca.c,1.2,1.3 send_nsca.c,1.2,1.3
seanius at haydn.debian.org
seanius at haydn.debian.org
Mon Dec 5 10:52:38 UTC 2005
- Previous message: [Pkg-nagios-changes] nsca/debian changelog, 1.4, 1.5 control, 1.3,
1.4 nsca.init, 1.1, 1.2 rules, 1.2, 1.3
- Next message: [Pkg-nagios-changes] nagios/misc - New directory,NONE,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/pkg-nagios/nsca/src
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv2509/src
Modified Files:
nsca.c send_nsca.c
Log Message:
crap, forgot to unpatch before i did that...
Index: nsca.c
===================================================================
RCS file: /cvsroot/pkg-nagios/nsca/src/nsca.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nsca.c 5 Dec 2005 10:51:00 -0000 1.2
+++ nsca.c 5 Dec 2005 10:52:35 -0000 1.3
@@ -60,8 +60,6 @@
int show_license=FALSE;
int show_version=FALSE;
-int foreground=FALSE;
-
static FILE *command_file_fp=NULL;
struct handler_entry{
@@ -111,11 +109,10 @@
}
if(result!=OK || show_help==TRUE){
- printf("Usage: %s -c <config_file> [-f] [mode]\n",argv[0]);
+ printf("Usage: %s -c <config_file> [mode]\n",argv[0]);
printf("\n");
printf("Options:\n");
printf(" <config_file> = Name of config file to use\n");
- printf(" [-f] = run in the foreground, do not fork\n");
printf(" [mode] = Determines how NSCA should run. Valid modes:\n");
printf(" --inetd = Run as a service under inetd or xinetd\n");
printf(" --daemon = Run as a standalone multi-process daemon\n");
@@ -185,7 +182,7 @@
case SINGLE_PROCESS_DAEMON:
/* daemonize and start listening for requests... */
- if(foreground || fork()==0){
+ if(fork()==0){
/* we're a daemon - set up a new process group */
setsid();
@@ -1124,10 +1121,6 @@
else if(!strcmp(argv[x-1],"-V") || !strcmp(argv[x-1],"--version"))
show_version=TRUE;
- /* run in the foreground */
- else if(!strcmp(argv[x-1],"-f"))
- foreground=TRUE;
-
else if(!strcmp(argv[x-1],"-d") || !strcmp(argv[x-1],"--daemon"))
mode=MULTI_PROCESS_DAEMON;
Index: send_nsca.c
===================================================================
RCS file: /cvsroot/pkg-nagios/nsca/src/send_nsca.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- send_nsca.c 5 Dec 2005 10:51:00 -0000 1.2
+++ send_nsca.c 5 Dec 2005 10:52:35 -0000 1.3
@@ -25,7 +25,7 @@
int server_port=DEFAULT_SERVER_PORT;
char server_name[MAX_HOST_ADDRESS_LENGTH];
char password[MAX_INPUT_BUFFER]="";
-char config_file[MAX_INPUT_BUFFER]="/etc/send_nsca.cfg";
+char config_file[MAX_INPUT_BUFFER]="send_nsca.cfg";
char delimiter[2]="\t";
char received_iv[TRANSMITTED_IV_SIZE];
- Previous message: [Pkg-nagios-changes] nsca/debian changelog, 1.4, 1.5 control, 1.3,
1.4 nsca.init, 1.1, 1.2 rules, 1.2, 1.3
- Next message: [Pkg-nagios-changes] nagios/misc - New directory,NONE,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Pkg-nagios-changes
mailing list