The branch, master has been updated
via e2c0fd3 blackbox: Add test for 'net ads changetrustpw'
via b81ca4f s3:libads: Fix changing passwords with Kerberos
via 4791c15 s4:rpc_server:backupkey: Move variable into scope
from abd74c3 heimdal: Fix printing a short int into a string
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e2c0fd36ba54d984b554248aecffd3e4e7f43e1f
Author: Andreas Schneider <[email protected]>
Date: Wed Aug 9 12:14:34 2017 +0200
blackbox: Add test for 'net ads changetrustpw'
BUG: BUG: https://bugzilla.samba.org/show_bug.cgi?id=12956
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Richard Sharpe <[email protected]>
Autobuild-User(master): Andreas Schneider <[email protected]>
Autobuild-Date(master): Fri Aug 11 22:09:27 CEST 2017 on sn-devel-144
commit b81ca4f9dcbb378a95fb3ac31bfd9a1cbe505d7d
Author: Andreas Schneider <[email protected]>
Date: Wed Aug 9 18:14:23 2017 +0200
s3:libads: Fix changing passwords with Kerberos
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12956
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Richard Sharpe <[email protected]>
commit 4791c152b02a47a59fe33870741b2f4c80351e55
Author: Andreas Schneider <[email protected]>
Date: Tue Jul 18 12:49:05 2017 +0200
s4:rpc_server:backupkey: Move variable into scope
CID: #1415510
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12959
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/libads/krb5_setpw.c | 2 +-
source4/rpc_server/backupkey/dcesrv_backupkey.c | 4 ++--
testprogs/blackbox/test_net_ads.sh | 4 ++++
3 files changed, 7 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libads/krb5_setpw.c b/source3/libads/krb5_setpw.c
index 630c2e4..bc96ac6 100644
--- a/source3/libads/krb5_setpw.c
+++ b/source3/libads/krb5_setpw.c
@@ -251,7 +251,7 @@ static ADS_STATUS ads_krb5_chg_password(const char
*kdc_host,
ret = krb5_set_password(context,
&creds,
discard_const_p(char, newpw),
- princ,
+ NULL,
&result_code,
&result_code_string,
&result_string);
diff --git a/source4/rpc_server/backupkey/dcesrv_backupkey.c
b/source4/rpc_server/backupkey/dcesrv_backupkey.c
index 444910b..cf9af1f 100644
--- a/source4/rpc_server/backupkey/dcesrv_backupkey.c
+++ b/source4/rpc_server/backupkey/dcesrv_backupkey.c
@@ -360,6 +360,8 @@ static WERROR get_and_verify_access_check(TALLOC_CTX
*sub_ctx,
uint32_t access_check_len,
struct auth_session_info
*session_info)
{
+ struct bkrp_access_check_v2 uncrypted_accesscheckv2;
+ struct bkrp_access_check_v3 uncrypted_accesscheckv3;
gnutls_cipher_hd_t cipher_handle = { 0 };
gnutls_cipher_algorithm_t cipher_algo;
DATA_BLOB blob_us;
@@ -422,7 +424,6 @@ static WERROR get_and_verify_access_check(TALLOC_CTX
*sub_ctx,
uint32_t hash_size = 20;
uint8_t hash[hash_size];
gnutls_hash_hd_t dig_ctx;
- struct bkrp_access_check_v2 uncrypted_accesscheckv2;
ndr_err = ndr_pull_struct_blob(&blob_us, sub_ctx,
&uncrypted_accesscheckv2,
(ndr_pull_flags_fn_t)ndr_pull_bkrp_access_check_v2);
@@ -457,7 +458,6 @@ static WERROR get_and_verify_access_check(TALLOC_CTX
*sub_ctx,
uint32_t hash_size = 64;
uint8_t hash[hash_size];
gnutls_hash_hd_t dig_ctx;
- struct bkrp_access_check_v3 uncrypted_accesscheckv3;
ndr_err = ndr_pull_struct_blob(&blob_us, sub_ctx,
&uncrypted_accesscheckv3,
(ndr_pull_flags_fn_t)ndr_pull_bkrp_access_check_v3);
diff --git a/testprogs/blackbox/test_net_ads.sh
b/testprogs/blackbox/test_net_ads.sh
index 99b886f..bbd99b6 100755
--- a/testprogs/blackbox/test_net_ads.sh
+++ b/testprogs/blackbox/test_net_ads.sh
@@ -33,6 +33,8 @@ testit "join" $VALGRIND $net_tool ads join
-U$DC_USERNAME%$DC_PASSWORD || failed
testit "testjoin" $VALGRIND $net_tool ads testjoin -kP || failed=`expr $failed
+ 1`
+testit "changetrustpw" $VALGRIND $net_tool ads changetrustpw || failed=`expr
$failed + 1`
+
testit "leave" $VALGRIND $net_tool ads leave -U$DC_USERNAME%$DC_PASSWORD ||
failed=`expr $failed + 1`
# Test with kerberos method = secrets and keytab
@@ -41,6 +43,8 @@ testit "join (decicated keytab)" $VALGRIND $net_tool ads join
-U$DC_USERNAME%$DC
testit "testjoin (dedicated keytab)" $VALGRIND $net_tool ads testjoin -kP ||
failed=`expr $failed + 1`
+testit "changetrustpw (dedicated keytab)" $VALGRIND $net_tool ads
changetrustpw || failed=`expr $failed + 1`
+
testit "leave (dedicated keytab)" $VALGRIND $net_tool ads leave
-U$DC_USERNAME%$DC_PASSWORD || failed=`expr $failed + 1`
rm -f $dedicated_keytab_file
--
Samba Shared Repository
