author | Tomas Klacko <tomas.klacko@oracle.com> |
Mon, 12 Aug 2013 02:14:11 -0700 | |
branch | s11-update |
changeset 2724 | 90c18e89db60 |
permissions | -rw-r--r-- |
2724
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
1 |
--- a/modules/mod_ctrls.c |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
2 |
+++ b/modules/mod_ctrls.c |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
3 |
@@ -1157,7 +1157,8 @@ static void ctrls_shutdown_ev(const void *event_data, void *user_data) { |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
4 |
} |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
5 |
|
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
6 |
static void ctrls_postparse_ev(const void *event_data, void *user_data) { |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
7 |
- if (!ctrls_engine) { |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
8 |
+ if (ctrls_engine == FALSE || |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
9 |
+ ServerType == SERVER_INETD) { |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
10 |
return; |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
11 |
} |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
12 |
|
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
13 |
diff --git a/src/ctrls.c b/src/ctrls.c |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
14 |
index 232bb7d..1f47c73 100644 |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
15 |
--- a/src/ctrls.c |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
16 |
+++ b/src/ctrls.c |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
17 |
@@ -1975,7 +1975,7 @@ void init_ctrls(void) { |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
18 |
|
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
19 |
sockfd = socket(AF_UNIX, SOCK_STREAM, 0); |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
20 |
if (sockfd < 0) { |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
21 |
- pr_log_pri(PR_LOG_DEBUG, "unable to create Unix domain socket: %s", |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
22 |
+ pr_log_debug(DEBUG10, "unable to create Unix domain socket: %s", |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
23 |
strerror(errno)); |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
24 |
return; |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
25 |
} |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
26 |
@@ -1986,7 +1986,7 @@ void init_ctrls(void) { |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
27 |
socklen = sizeof(struct sockaddr_un); |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
28 |
|
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
29 |
if (bind(sockfd, (struct sockaddr *) &sockun, socklen) < 0) { |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
30 |
- pr_log_pri(PR_LOG_DEBUG, |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
31 |
+ pr_log_debug(DEBUG10, |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
32 |
"unable to bind to Unix domain socket at '%s': %s", |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
33 |
sockpath, strerror(errno)); |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
34 |
(void) close(sockfd); |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
35 |
@@ -1995,7 +1995,7 @@ void init_ctrls(void) { |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
36 |
} |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
37 |
|
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
38 |
if (fstat(sockfd, &st) < 0) { |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
39 |
- pr_log_pri(PR_LOG_DEBUG, |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
40 |
+ pr_log_debug(DEBUG10, |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
41 |
"unable to stat Unix domain socket at '%s': %s", |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
42 |
sockpath, strerror(errno)); |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
43 |
(void) close(sockfd); |
90c18e89db60
16191277 problem in SERVICE/FTP-SERVER
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
44 |