tests.patch

   1 commit a744f282947907c794bd23838775b9124c90b11d
   2 Author: Aki Tuomi <aki.tuomi@open-xchange.com>
   3 Date:   Thu Aug 13 19:13:04 2020 +0300
   4
   5     auth: test-mech - Fix APOP challenge format
   6
   7 diff --git a/src/auth/test-mech.c b/src/auth/test-mech.c
   8 index cf0537003..0a030a2be 100644
   9 --- a/src/auth/test-mech.c
  10 +++ b/src/auth/test-mech.c
  11 @@ -196,8 +196,8 @@ test_mech_construct_apop_challenge(unsigned int connect_uid, unsigned long *len_
  12  {
  13         string_t *apop_challenge = t_str_new(128);
  14
  15 -       str_printfa(apop_challenge,"<%lx.%u.%"PRIdTIME_T"", (unsigned long) getpid(),
  16 -                   connect_uid, process_start_time+10);
  17 +       str_printfa(apop_challenge,"<%lx.%lx.%"PRIxTIME_T".", (unsigned long)getpid(),
  18 +                   (unsigned long)connect_uid, process_start_time+10);
  19         str_append_data(apop_challenge, "\0testuser\0responseoflen16-", 26);
  20         *len_r = apop_challenge->used;
  21         return apop_challenge->data;
  22 commit 68817df1ef029913e9fab9f4da75ba8150c65eb6
  23 Author: Aki Tuomi <aki.tuomi@open-xchange.com>
  24 Date:   Thu Aug 13 19:13:49 2020 +0300
  25
  26     auth: test-mech - Fix type mismatch
  27
  28 diff --git a/src/auth/test-mech.c b/src/auth/test-mech.c
  29 index 0a030a2be..0a22ff46d 100644
  30 --- a/src/auth/test-mech.c
  31 +++ b/src/auth/test-mech.c
  32 @@ -192,7 +192,7 @@ static void test_mech_handle_challenge(struct auth_request *request,
  33  }
  34
  35  static inline const unsigned char *
  36 -test_mech_construct_apop_challenge(unsigned int connect_uid, unsigned long *len_r)
  37 +test_mech_construct_apop_challenge(unsigned int connect_uid, size_t *len_r)
  38  {
  39         string_t *apop_challenge = t_str_new(128);
  40
  41 @@ -323,7 +323,7 @@ static void test_mechs(void)
  42                 struct test_case *test_case = &tests[running_test];
  43                 const struct mech_module *mech = test_case->mech;
  44                 struct auth_request *request;
  45 -               const char *testname = t_strdup_printf("auth mech %s %d/%lu",
  46 +               const char *testname = t_strdup_printf("auth mech %s %d/%zu",
  47                                                        mech->mech_name,
  48                                                        running_test+1,
  49                                                        N_ELEMENTS(tests));