[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Mon Nov 23 17:21:02 UTC 2015
The branch, master has been updated
via e6f88c1 libads: Fix picky const warning with krb5_set_password_using_ccache
via 0733ce3 gensec: Fix picky unused variable errors
via ab0cbf9 auth: Fix picky const warnings in gssapi_pac
via e0504a8 s4-auth: Fix picky unused variable warning
via e9e306b krb5_wrap: Fix picky const compiler warnings
via bf10446 selftest: Fix Samba::bindir_path() with a valid directory.
from 8aab442 dbwrap_tdb: Fix a typo
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e6f88c1451f8843fca9ca361cd2dbdf3e77ff47c
Author: Andreas Schneider <asn at samba.org>
Date: Tue Oct 6 14:05:15 2015 +0200
libads: Fix picky const warning with krb5_set_password_using_ccache
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Guenther Deschner <gd at samba.org>
Autobuild-User(master): Günther Deschner <gd at samba.org>
Autobuild-Date(master): Mon Nov 23 18:20:31 CET 2015 on sn-devel-104
commit 0733ce3c6ed1e8d97690c9ec80c2768a05690dfd
Author: Andreas Schneider <asn at samba.org>
Date: Tue Oct 6 13:25:49 2015 +0200
gensec: Fix picky unused variable errors
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Guenther Deschner <gd at samba.org>
commit ab0cbf9bbac6c7a9450f26e2eeb4f8e794db8d89
Author: Andreas Schneider <asn at samba.org>
Date: Tue Oct 6 13:24:41 2015 +0200
auth: Fix picky const warnings in gssapi_pac
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Guenther Deschner <gd at samba.org>
commit e0504a80dcf70ec9da0e8fa9f2d5bd7f042468f6
Author: Andreas Schneider <asn at samba.org>
Date: Tue Oct 6 13:03:41 2015 +0200
s4-auth: Fix picky unused variable warning
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Guenther Deschner <gd at samba.org>
commit e9e306b1d57e9d9c40cd37d3fbb981606ca87223
Author: Andreas Schneider <asn at samba.org>
Date: Tue Oct 6 13:03:19 2015 +0200
krb5_wrap: Fix picky const compiler warnings
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Guenther Deschner <gd at samba.org>
commit bf10446a69b0f328441ab334a8e35ad14c3d47e8
Author: Andreas Schneider <asn at samba.org>
Date: Mon May 12 16:45:55 2014 +0200
selftest: Fix Samba::bindir_path() with a valid directory.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Guenther Deschner <gd at samba.org>
-----------------------------------------------------------------------
Summary of changes:
auth/kerberos/gssapi_pac.c | 12 ++++++++++--
lib/krb5_wrap/krb5_samba.c | 5 +++--
selftest/target/Samba.pm | 2 +-
source3/libads/krb5_setpw.c | 13 ++++++++++---
source4/auth/gensec/gensec_gssapi.c | 4 +++-
source4/auth/kerberos/kerberos_util.c | 4 ++++
6 files changed, 31 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/auth/kerberos/gssapi_pac.c b/auth/kerberos/gssapi_pac.c
index c6fa909..685d0ec 100644
--- a/auth/kerberos/gssapi_pac.c
+++ b/auth/kerberos/gssapi_pac.c
@@ -113,7 +113,11 @@ NTSTATUS gssapi_obtain_pac_blob(TALLOC_CTX *mem_ctx,
if (gss_maj != 0) {
DEBUG(0, ("obtaining PAC via GSSAPI gss_get_name_attribute failed: %s\n",
- gssapi_error_string(mem_ctx, gss_maj, gss_min, gss_mech_krb5)));
+ gssapi_error_string(mem_ctx,
+ gss_maj,
+ gss_min,
+ discard_const_p(struct gss_OID_desc_struct,
+ gss_mech_krb5))));
return NT_STATUS_ACCESS_DENIED;
} else if (authenticated && complete) {
/* The PAC blob is returned directly */
@@ -199,7 +203,11 @@ NTSTATUS gssapi_get_session_key(TALLOC_CTX *mem_ctx,
&gse_sesskey_inq_oid, &set);
if (gss_maj) {
DEBUG(0, ("gss_inquire_sec_context_by_oid failed [%s]\n",
- gssapi_error_string(mem_ctx, gss_maj, gss_min, gss_mech_krb5)));
+ gssapi_error_string(mem_ctx,
+ gss_maj,
+ gss_min,
+ discard_const_p(struct gss_OID_desc_struct,
+ gss_mech_krb5))));
return NT_STATUS_NO_USER_SESSION_KEY;
}
diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 8c70273..13984e9 100644
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -2143,7 +2143,7 @@ krb5_error_code smb_krb5_make_principal(krb5_context context,
va_list ap;
if (_realm) {
- realm = _realm;
+ realm = discard_const_p(char, _realm);
free_realm = false;
} else {
code = krb5_get_default_realm(context, &realm);
@@ -2324,7 +2324,8 @@ char *smb_krb5_principal_get_realm(krb5_context context,
return strdup(discard_const_p(char, krb5_principal_get_realm(context, principal)));
#elif defined(krb5_princ_realm) /* MIT */
krb5_data *realm;
- realm = krb5_princ_realm(context, principal);
+ realm = discard_const_p(krb5_data,
+ krb5_princ_realm(context, principal));
return strndup(realm->data, realm->length);
#else
#error UNKNOWN_GET_PRINC_REALM_FUNCTIONS
diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index 9f3e6ec..f1c4055 100644
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -57,7 +57,7 @@ sub bindir_path($$) {
my $valpath = "$object->{bindir}/$path";
- return $valpath if (-f $valpath);
+ return $valpath if (-f $valpath or -d $valpath);
return $path;
}
diff --git a/source3/libads/krb5_setpw.c b/source3/libads/krb5_setpw.c
index 5b33e2e..c633495 100644
--- a/source3/libads/krb5_setpw.c
+++ b/source3/libads/krb5_setpw.c
@@ -98,7 +98,10 @@ ADS_STATUS ads_krb5_set_password(const char *kdc_host, const char *principal,
return ADS_ERROR_KRB5(ret);
}
- ret = krb5_set_password_using_ccache(context, ccache, newpw, princ,
+ ret = krb5_set_password_using_ccache(context,
+ ccache,
+ discard_const_p(char, newpw),
+ princ,
&result_code,
&result_code_string,
&result_string);
@@ -236,8 +239,12 @@ static ADS_STATUS ads_krb5_chg_password(const char *kdc_host,
return ADS_ERROR_KRB5(ret);
}
- ret = krb5_change_password(context, &creds, newpw, &result_code,
- &result_code_string, &result_string);
+ ret = krb5_change_password(context,
+ &creds,
+ discard_const_p(char, newpw),
+ &result_code,
+ &result_code_string,
+ &result_string);
if (ret) {
DEBUG(1, ("krb5_change_password failed (%s)\n", error_message(ret)));
aret = ADS_ERROR_KRB5(ret);
diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c
index ed6d08a..e0b2bf2 100644
--- a/source4/auth/gensec/gensec_gssapi.c
+++ b/source4/auth/gensec/gensec_gssapi.c
@@ -87,7 +87,9 @@ static NTSTATUS gensec_gssapi_start(struct gensec_security *gensec_security)
{
struct gensec_gssapi_state *gensec_gssapi_state;
krb5_error_code ret;
+#ifdef SAMBA4_USES_HEIMDAL
const char *realm;
+#endif
gensec_gssapi_state = talloc_zero(gensec_security, struct gensec_gssapi_state);
if (!gensec_gssapi_state) {
@@ -417,8 +419,8 @@ static NTSTATUS gensec_gssapi_update(struct gensec_security *gensec_security,
{
#ifdef SAMBA4_USES_HEIMDAL
struct gsskrb5_send_to_kdc send_to_kdc;
-#endif
krb5_error_code ret;
+#endif
nt_status = gensec_gssapi_client_creds(gensec_security, ev);
if (!NT_STATUS_IS_OK(nt_status)) {
diff --git a/source4/auth/kerberos/kerberos_util.c b/source4/auth/kerberos/kerberos_util.c
index 2026af3..653e3d2 100644
--- a/source4/auth/kerberos/kerberos_util.c
+++ b/source4/auth/kerberos/kerberos_util.c
@@ -235,7 +235,9 @@ done:
{
krb5_error_code ret;
const char *password;
+#ifdef SAMBA4_USES_HEIMDAL
const char *self_service;
+#endif
const char *target_service;
time_t kdc_time = 0;
krb5_principal princ;
@@ -267,7 +269,9 @@ done:
return ret;
}
+#ifdef SAMBA4_USES_HEIMDAL
self_service = cli_credentials_get_self_service(credentials);
+#endif
target_service = cli_credentials_get_target_service(credentials);
password = cli_credentials_get_password(credentials);
--
Samba Shared Repository
More information about the samba-cvs
mailing list