debian/patches/0003-Catch-up-to-roken-s-rename-of-base64-symbols.patch

   1 From: Benjamin Kaduk <kaduk@mit.edu>
   2 Date: Sun, 11 Dec 2016 18:06:03 -0500
   3 Subject: Catch up to roken's rename of base64 symbols
   4
   5 Upstream roken (i.e., heimdal) renamed their base64 encode/decode
   6 routines to have a rk_ prefix in 2014, but upstream OpenAFS hasn't
   7 pulled in an update to their bundled heimdal files since then.
   8 So, upstream is still using the old name, whereas we are trying
   9 to link against a more modern libroken, and must use the new names.
  10 ---
  11  src/auth/userok.c | 4 ++--
  12  1 file changed, 2 insertions(+), 2 deletions(-)
  13
  14 diff --git a/src/auth/userok.c b/src/auth/userok.c
  15 index 8a7d4a4..b54d106 100644
  16 --- a/src/auth/userok.c
  17 +++ b/src/auth/userok.c
  18 @@ -470,7 +470,7 @@ ParseLine(char *buffer, struct rx_identity *user)
  19         if (decodedName == NULL)
  20             return ENOMEM;
  21
  22 -       len = base64_decode(ename, decodedName);
  23 +       len = rk_base64_decode(ename, decodedName);
  24         if (len<0) {
  25             free(decodedName);
  26             return EINVAL;
  27 @@ -571,7 +571,7 @@ afsconf_AddIdentity(struct afsconf_dir *adir, struct rx_identity *user)
  28      if (user->kind == RX_ID_KRB4) {
  29         fprintf(tf, "%s\n", user->displayName);
  30      } else {
  31 -       base64_encode(user->exportedName.val, user->exportedName.len,
  32 +       rk_base64_encode(user->exportedName.val, user->exportedName.len,
  33                       &ename);
  34         fprintf(tf, " %d %s %s\n", user->kind, ename, user->displayName);
  35         free(ename);