From: Jeremy Allison <jra@samba.org>
Date: Sat, 21 Feb 2009 00:40:00 +0000 (-0800)
Subject: Change smbc_set_credentials_with_fallback() (unreleased) to use
X-Git-Tag: samba-3.3.1~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45bcc61a38e3dbf75df6decaff9f1cac495420fc;p=thirdparty%2Fsamba.git

Change smbc_set_credentials_with_fallback() (unreleased) to use
const approptiately.
Jeremy.
(cherry picked from commit 07c7085f25718915cda07e38a87a008a72abbf4f)
---

diff --git a/source/include/libsmbclient.h b/source/include/libsmbclient.h
index efc471c85b4..8c642b1794c 100644
--- a/source/include/libsmbclient.h
+++ b/source/include/libsmbclient.h
@@ -2692,9 +2692,9 @@ smbc_set_credentials(char *workgroup,
 
 void
 smbc_set_credentials_with_fallback(SMBCCTX *ctx,
-		                   char *workgroup,
-			     	   char *user,
-			    	   char *password);
+		                   const char *workgroup,
+			     	   const char *user,
+			    	   const char *password);
 
 /**
  * @ingroup structure
diff --git a/source/libsmb/libsmb_context.c b/source/libsmb/libsmb_context.c
index 489cc01c864..90f18ac5370 100644
--- a/source/libsmb/libsmb_context.c
+++ b/source/libsmb/libsmb_context.c
@@ -648,9 +648,9 @@ smbc_set_credentials(char *workgroup,
 }
 
 void smbc_set_credentials_with_fallback(SMBCCTX *context,
-					char *workgroup,
-					char *user,
-					char *password)
+					const char *workgroup,
+					const char *user,
+					const char *password)
 {
 	smbc_bool use_kerberos = false;
 	const char *signing_state = "off";
@@ -675,11 +675,18 @@ void smbc_set_credentials_with_fallback(SMBCCTX *context,
 		signing_state = "force";
 	}
 
-	smbc_set_credentials(workgroup,
-			     user,
-			     password,
+	/* Using CONST_DISCARD here is ugly, but
+	 * we know that smbc_set_credentials() doesn't
+	 * actually modify the strings, and should have
+	 * been const from the start. We're constrained
+	 * by the ABI here.
+	 */
+
+	smbc_set_credentials(CONST_DISCARD(char *,workgroup),
+			     CONST_DISCARD(char *,user),
+			     CONST_DISCARD(char *,password),
 			     use_kerberos,
-			     (char *)signing_state);
+			     CONST_DISCARD(char *,signing_state));
 
 	if (smbc_getOptionFallbackAfterKerberos(context)) {
 		cli_cm_set_fallback_after_kerberos();