projects
/
nbd.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
39d7f62
)
r261: Fix inetd mode
author
yoe <yoe>
Mon, 25 Jun 2007 13:30:57 +0000
(13:30 +0000)
committer
yoe <yoe>
Mon, 25 Jun 2007 13:30:57 +0000
(13:30 +0000)
nbd-server.c
patch
|
blob
|
history
diff --git
a/nbd-server.c
b/nbd-server.c
index
85a1e06
..
93b1971
100644
(file)
--- a/
nbd-server.c
+++ b/
nbd-server.c
@@
-1323,6
+1323,9
@@
void destroy_pid_t(gpointer data) {
void daemonize(SERVER* serve) {
FILE*pidf;
void daemonize(SERVER* serve) {
FILE*pidf;
+ if(!(serve->port)) {
+ return;
+ }
if(daemon(0,0)<0) {
err("daemon");
}
if(daemon(0,0)<0) {
err("daemon");
}
@@
-1546,8
+1549,6
@@
int main(int argc, char *argv[]) {
g_array_append_val(servers, *serve);
}
g_array_append_val(servers, *serve);
}
-/* We don't support this at this time */
-#if 0
if (!(serve->port)) {
CLIENT *client;
#ifndef ISSERVER
if (!(serve->port)) {
CLIENT *client;
#ifndef ISSERVER
@@
-1568,7
+1569,6
@@
int main(int argc, char *argv[]) {
serveconnection(client);
return 0;
}
serveconnection(client);
return 0;
}
-#endif
if((!serve) && (!servers||!servers->len)) {
g_message("Nothing to do! Bye!");
exit(EXIT_FAILURE);
if((!serve) && (!servers||!servers->len)) {
g_message("Nothing to do! Bye!");
exit(EXIT_FAILURE);