[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-4999-g07c7085
Jeremy Allison
jra at samba.org
Sat Feb 21 00:41:41 GMT 2009
The branch, v3-3-test has been updated
via 07c7085f25718915cda07e38a87a008a72abbf4f (commit)
from 7df63394aff2a15d96112378a9e3b0acd9edc56a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 07c7085f25718915cda07e38a87a008a72abbf4f
Author: Jeremy Allison <jra at samba.org>
Date: Fri Feb 20 16:40:00 2009 -0800
Change smbc_set_credentials_with_fallback() (unreleased) to use
const approptiately.
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/include/libsmbclient.h | 6 +++---
source/libsmb/libsmb_context.c | 21 ++++++++++++++-------
2 files changed, 17 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/libsmbclient.h b/source/include/libsmbclient.h
index efc471c..8c642b1 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 489cc01..90f18ac 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();
--
Samba Shared Repository
More information about the samba-cvs
mailing list