base64_decode() with heimdal libs, so I've renamed it base64_decode_inplace().

(This used to be commit 8c69212eeb4a0ec144b960d76319fd4940b8c239)

diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 8fe04f0f582bc666ddc15034f1b0f5b254199972..cc4b6fe5c5910676e21c54ca935869c57d41cc6d 100644 (file)
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -1585,7 +1585,7 @@ DATA_BLOB base64_decode_data_blob(const char *s)
 /**
  * Decode a base64 string in-place - wrapper for the above
  **/
-void base64_decode(char *s)
+void base64_decode_inplace(char *s)
 {
        DATA_BLOB decoded = base64_decode_data_blob(s);
        memcpy(s, decoded.data, decoded.length);

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 46f33789bfcc2bdbed19c7a85655ea49ec2b80c3..8abc2f0bd5c6b5ff20b6b1972d92c92eacd6a7fd 100644 (file)
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -306,7 +306,7 @@ static BOOL cgi_handle_authorization(char *line)
        }
        line += 6;
        while (line[0] == ' ') line++;
-       base64_decode(line);
+       base64_decode_inplace(line);
        if (!(p=strchr_m(line,':'))) {
                /*
                 * Always give the same error so a cracker