nbd/nbd-server-daemonize-0.diff

28 lines
803 B
Diff

diff -uNrp nbd-2.9.5.orig/nbd-server.c nbd-2.9.5/nbd-server.c
--- nbd-2.9.5.orig/nbd-server.c 2007-07-08 11:58:44.000000000 +0200
+++ nbd-2.9.5/nbd-server.c 2007-07-30 16:48:09.400856000 +0200
@@ -1323,17 +1323,17 @@ void destroy_pid_t(gpointer data) {
void daemonize(SERVER* serve) {
FILE*pidf;
- if(!(serve->port)) {
- return;
- }
- if(daemon(0,0)<0) {
+ //if (!serve) {
+ // return;
+ //}
+ if(daemon(0,0) < 0) {
err("daemon");
}
if(!*pidftemplate) {
if(serve) {
- strncpy(pidftemplate, "/var/run/server.%d.pid", 255);
+ strncpy(pidftemplate, "/var/run/nbd-server.%d.pid", 255);
} else {
- strncpy(pidftemplate, "/var/run/server.pid", 255);
+ strncpy(pidftemplate, "/var/run/nbd-server.pid", 255);
}
}
snprintf(pidfname, 255, pidftemplate, serve ? serve->port : 0);