From: Jim McDonough <jmcd@samba.org>
Date: Wed, 19 Feb 2003 00:27:38 +0000 (+0000)
Subject: base64_decode() with heimdal libs, so I've renamed it base64_decode_inplace().
X-Git-Tag: samba-4.0.0alpha6~801^2~11793^2~1973
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=a0913929ef6f1e34ff2654e8773c8bf45c6230af;hp=0ff05c7f66a6321bac3bb699e30a7c49ddbefdfd

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 8fe04f0f582..cc4b6fe5c59 100644
--- 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 46f33789bfc..8abc2f0bd5c 100644
--- 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