diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-02-24 11:40:28 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-02-24 11:40:28 +1100 |
| commit | 3a1b4c00eb96634229fb730e9b38e8df5180756a (patch) | |
| tree | 2642c03cc4f0f8e52d4718b93facfe411a52d9ab /source3/libsmb | |
| parent | b9860043dc092df25d4a39074e106d7367ebbe8f (diff) | |
| parent | faa1100d229aef56da5d48f5c19ec901e520f8ef (diff) | |
| download | samba-3a1b4c00eb96634229fb730e9b38e8df5180756a.tar.gz samba-3a1b4c00eb96634229fb730e9b38e8df5180756a.tar.bz2 samba-3a1b4c00eb96634229fb730e9b38e8df5180756a.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/libsmb_context.c | 22 | ||||
| -rw-r--r-- | source3/libsmb/libsmb_dir.c | 2 |
2 files changed, 7 insertions, 17 deletions
diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c index c7c9903b76..4c12d18ab7 100644 --- a/source3/libsmb/libsmb_context.c +++ b/source3/libsmb/libsmb_context.c @@ -630,11 +630,11 @@ smbc_version(void) * Set the credentials so DFS will work when following referrals. */ void -smbc_set_credentials(char *workgroup, - char *user, - char *password, +smbc_set_credentials(const char *workgroup, + const char *user, + const char *password, smbc_bool use_kerberos, - char *signing_state) + const char *signing_state) { struct user_auth_info *auth_info; @@ -681,18 +681,8 @@ void smbc_set_credentials_with_fallback(SMBCCTX *context, signing_state = "force"; } - /* 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, - CONST_DISCARD(char *,signing_state)); + smbc_set_credentials(workgroup, user, password, + use_kerberos, signing_state); if (smbc_getOptionFallbackAfterKerberos(context)) { cli_cm_set_fallback_after_kerberos(); diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c index 1843fe262f..56661af70b 100644 --- a/source3/libsmb/libsmb_dir.c +++ b/source3/libsmb/libsmb_dir.c @@ -1519,7 +1519,7 @@ SMBC_chmod_ctx(SMBCCTX *context, return -1; } - DEBUG(4, ("smbc_chmod(%s, 0%3o)\n", fname, newmode)); + DEBUG(4, ("smbc_chmod(%s, 0%3o)\n", fname, (unsigned int)newmode)); if (SMBC_parse_path(frame, context, |