components/network/proftpd/patches/035.30612377.patch

   1 # change makes proftpd to comply with RFC 640/RFC 959.
   2 #
   3 # RFC 640 defines format of multi-line responses. All the foundation
   4 # to produce proper multi-line error codes exists already in proftpd
   5 # code. The change allows proftpd to do the right thing.
   6 #
   7 # Patch has been submitted to upstream
   8 #       https://github.com/proftpd/proftpd/pull/874
   9 #
  10
  11 --- a/modules/mod_facts.c
  12 +++ b/modules/mod_facts.c
  13 @@ -1464,7 +1464,7 @@ MODRET facts_mlsd(cmd_rec *cmd) {
  14
  15      pr_fsio_closedir(dirh);
  16
  17 -    pr_response_add_err(R_550, "%s: %s", (char *) cmd->argv[0],
  18 +    pr_response_add_err(R_425, "%s: %s", (char *) cmd->argv[0],
  19        strerror(xerrno));
  20
  21      pr_cmd_set_errno(cmd, xerrno);
  22 --- a/modules/mod_ls.c
  23 +++ b/modules/mod_ls.c
  24 @@ -1960,7 +1960,7 @@ static int dolist(cmd_rec *cmd, const char *opt, const char *resp_code,
  25        if (pr_data_open(NULL, "file list", PR_NETIO_IO_WR, 0) < 0) {
  26          int xerrno = errno;
  27
  28 -        pr_response_add_err(R_450, "%s: %s", (char *) cmd->argv[0],
  29 +        pr_response_add_err(R_425, "%s: %s", (char *) cmd->argv[0],
  30            strerror(xerrno));
  31
  32          pr_cmd_set_errno(cmd, xerrno);
  33 @@ -2205,7 +2205,7 @@ static int dolist(cmd_rec *cmd, const char *opt, const char *resp_code,
  34        if (pr_data_open(NULL, "file list", PR_NETIO_IO_WR, 0) < 0) {
  35          int xerrno = errno;
  36
  37 -        pr_response_add_err(R_450, "%s: %s", (char *) cmd->argv[0],
  38 +        pr_response_add_err(R_425, "%s: %s", (char *) cmd->argv[0],
  39            strerror(xerrno));
  40
  41          pr_cmd_set_errno(cmd, xerrno);
  42 @@ -3106,7 +3106,7 @@ MODRET ls_nlst(cmd_rec *cmd) {
  43              if (pr_data_open(NULL, "file list", PR_NETIO_IO_WR, 0) < 0) {
  44                int xerrno = errno;
  45
  46 -              pr_response_add_err(R_450, "%s: %s", (char *) cmd->argv[0],
  47 +              pr_response_add_err(R_425, "%s: %s", (char *) cmd->argv[0],
  48                  strerror(xerrno));
  49
  50                pr_cmd_set_errno(cmd, xerrno);
  51 @@ -3133,7 +3133,7 @@ MODRET ls_nlst(cmd_rec *cmd) {
  52            if (pr_data_open(NULL, "file list", PR_NETIO_IO_WR, 0) < 0) {
  53              int xerrno = errno;
  54
  55 -            pr_response_add_err(R_450, "%s: %s", (char *) cmd->argv[0],
  56 +            pr_response_add_err(R_425, "%s: %s", (char *) cmd->argv[0],
  57                strerror(xerrno));
  58
  59              pr_cmd_set_errno(cmd, xerrno);
  60 @@ -3162,7 +3162,7 @@ MODRET ls_nlst(cmd_rec *cmd) {
  61      if (pr_data_open(NULL, "file list", PR_NETIO_IO_WR, 0) < 0) {
  62        int xerrno = errno;
  63
  64 -      pr_response_add_err(R_450, "%s: %s", (char *) cmd->argv[0],
  65 +      pr_response_add_err(R_425, "%s: %s", (char *) cmd->argv[0],
  66          strerror(xerrno));
  67
  68        pr_cmd_set_errno(cmd, xerrno);
  69 @@ -3255,7 +3255,7 @@ MODRET ls_nlst(cmd_rec *cmd) {
  70          if (pr_data_open(NULL, "file list", PR_NETIO_IO_WR, 0) < 0) {
  71            xerrno = errno;
  72
  73 -          pr_response_add_err(R_450, "%s: %s", (char *) cmd->argv[0],
  74 +          pr_response_add_err(R_425, "%s: %s", (char *) cmd->argv[0],
  75              strerror(xerrno));
  76
  77            pr_cmd_set_errno(cmd, xerrno);
  78 @@ -3292,7 +3292,7 @@ MODRET ls_nlst(cmd_rec *cmd) {
  79              if (pr_data_open(NULL, "file list", PR_NETIO_IO_WR, 0) < 0) {
  80                xerrno = errno;
  81
  82 -              pr_response_add_err(R_450, "%s: %s", (char *) cmd->argv[0],
  83 +              pr_response_add_err(R_425, "%s: %s", (char *) cmd->argv[0],
  84                  strerror(xerrno));
  85
  86                pr_cmd_set_errno(cmd, xerrno);
  87 @@ -3333,7 +3333,7 @@ MODRET ls_nlst(cmd_rec *cmd) {
  88          if (pr_data_open(NULL, "file list", PR_NETIO_IO_WR, 0) < 0) {
  89            xerrno = errno;
  90
  91 -          pr_response_add_err(R_450, "%s: %s", (char *) cmd->argv[0],
  92 +          pr_response_add_err(R_425, "%s: %s", (char *) cmd->argv[0],
  93              strerror(xerrno));
  94
  95            pr_cmd_set_errno(cmd, xerrno);
  96 @@ -3358,7 +3358,7 @@ MODRET ls_nlst(cmd_rec *cmd) {
  97        if (pr_data_open(NULL, "file list", PR_NETIO_IO_WR, 0) < 0) {
  98          int xerrno = errno;
  99
 100 -        pr_response_add_err(R_450, "%s: %s", (char *) cmd->argv[0],
 101 +        pr_response_add_err(R_425, "%s: %s", (char *) cmd->argv[0],
 102            strerror(xerrno));
 103
 104          pr_cmd_set_errno(cmd, xerrno);
 105 @@ -3373,6 +3373,9 @@ MODRET ls_nlst(cmd_rec *cmd) {
 106        if (pr_data_open(NULL, "file list", PR_NETIO_IO_WR, 0) < 0) {
 107          int xerrno = errno;
 108
 109 +        pr_response_add_err(R_425, "%s: %s", (char *) cmd->argv[0],
 110 +          strerror(xerrno));
 111 +
 112          pr_cmd_set_errno(cmd, xerrno);
 113          errno = xerrno;
 114          return PR_ERROR(cmd);