components/proftpd/patches/disable_mod_ctrls_for_inetd_3819.patch
branchs11-update
changeset 2724 90c18e89db60
equal deleted inserted replaced
2723:138732f62341 2724:90c18e89db60
       
     1 --- a/modules/mod_ctrls.c
       
     2 +++ b/modules/mod_ctrls.c
       
     3 @@ -1157,7 +1157,8 @@ static void ctrls_shutdown_ev(const void *event_data, void *user_data) {
       
     4  }
       
     5  
       
     6  static void ctrls_postparse_ev(const void *event_data, void *user_data) {
       
     7 -  if (!ctrls_engine) {
       
     8 +  if (ctrls_engine == FALSE ||
       
     9 +      ServerType == SERVER_INETD) {
       
    10      return;
       
    11    }
       
    12  
       
    13 diff --git a/src/ctrls.c b/src/ctrls.c
       
    14 index 232bb7d..1f47c73 100644
       
    15 --- a/src/ctrls.c
       
    16 +++ b/src/ctrls.c
       
    17 @@ -1975,7 +1975,7 @@ void init_ctrls(void) {
       
    18  
       
    19    sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
       
    20    if (sockfd < 0) {
       
    21 -    pr_log_pri(PR_LOG_DEBUG, "unable to create Unix domain socket: %s",
       
    22 +    pr_log_debug(DEBUG10, "unable to create Unix domain socket: %s",
       
    23        strerror(errno));
       
    24      return;
       
    25    }
       
    26 @@ -1986,7 +1986,7 @@ void init_ctrls(void) {
       
    27    socklen = sizeof(struct sockaddr_un);
       
    28  
       
    29    if (bind(sockfd, (struct sockaddr *) &sockun, socklen) < 0) {
       
    30 -    pr_log_pri(PR_LOG_DEBUG,
       
    31 +    pr_log_debug(DEBUG10,
       
    32        "unable to bind to Unix domain socket at '%s': %s",
       
    33        sockpath, strerror(errno));
       
    34      (void) close(sockfd);
       
    35 @@ -1995,7 +1995,7 @@ void init_ctrls(void) {
       
    36    }
       
    37  
       
    38    if (fstat(sockfd, &st) < 0) {
       
    39 -    pr_log_pri(PR_LOG_DEBUG,
       
    40 +    pr_log_debug(DEBUG10,
       
    41        "unable to stat Unix domain socket at '%s': %s",
       
    42        sockpath, strerror(errno));
       
    43      (void) close(sockfd);
       
    44