|
 |
a3a04f |
From 646b3c4b920f4ae4d1289eeb10018cd9d069382a Mon Sep 17 00:00:00 2001
|
|
|
a3a04f |
From: Andreas Schneider <asn@samba.org>
|
|
|
a3a04f |
Date: Wed, 9 Aug 2017 18:14:23 +0200
|
|
|
a3a04f |
Subject: [PATCH 1/2] s3:libads: Fix changing passwords with Kerberos
|
|
|
a3a04f |
|
|
|
a3a04f |
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12956
|
|
|
a3a04f |
|
|
|
a3a04f |
Signed-off-by: Andreas Schneider <asn@samba.org>
|
|
|
a3a04f |
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
|
|
|
a3a04f |
(cherry picked from commit b81ca4f9dcbb378a95fb3ac31bfd9a1cbe505d7d)
|
|
|
a3a04f |
---
|
|
|
a3a04f |
source3/libads/krb5_setpw.c | 2 +-
|
|
|
a3a04f |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
a3a04f |
|
|
|
a3a04f |
diff --git a/source3/libads/krb5_setpw.c b/source3/libads/krb5_setpw.c
|
|
|
a3a04f |
index 630c2e46631..bc96ac603b1 100644
|
|
|
a3a04f |
--- a/source3/libads/krb5_setpw.c
|
|
|
a3a04f |
+++ b/source3/libads/krb5_setpw.c
|
|
|
a3a04f |
@@ -251,7 +251,7 @@ static ADS_STATUS ads_krb5_chg_password(const char *kdc_host,
|
|
|
a3a04f |
ret = krb5_set_password(context,
|
|
|
a3a04f |
&creds,
|
|
|
a3a04f |
discard_const_p(char, newpw),
|
|
|
a3a04f |
- princ,
|
|
|
a3a04f |
+ NULL,
|
|
|
a3a04f |
&result_code,
|
|
|
a3a04f |
&result_code_string,
|
|
|
a3a04f |
&result_string);
|
|
|
a3a04f |
--
|
|
|
a3a04f |
2.14.0
|
|
|
a3a04f |
|
|
|
a3a04f |
|
|
|
a3a04f |
From be45f32ffb1504f36b860195b480b661699de049 Mon Sep 17 00:00:00 2001
|
|
|
a3a04f |
From: Andreas Schneider <asn@samba.org>
|
|
|
a3a04f |
Date: Wed, 9 Aug 2017 12:14:34 +0200
|
|
|
a3a04f |
Subject: [PATCH 2/2] blackbox: Add test for 'net ads changetrustpw'
|
|
|
a3a04f |
|
|
|
a3a04f |
BUG: BUG: https://bugzilla.samba.org/show_bug.cgi?id=12956
|
|
|
a3a04f |
|
|
|
a3a04f |
Signed-off-by: Andreas Schneider <asn@samba.org>
|
|
|
a3a04f |
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
|
|
|
a3a04f |
|
|
|
a3a04f |
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
|
|
|
a3a04f |
Autobuild-Date(master): Fri Aug 11 22:09:27 CEST 2017 on sn-devel-144
|
|
|
a3a04f |
|
|
|
a3a04f |
(cherry picked from commit e2c0fd36ba54d984b554248aecffd3e4e7f43e1f)
|
|
|
a3a04f |
---
|
|
|
a3a04f |
testprogs/blackbox/test_net_ads.sh | 4 ++++
|
|
|
a3a04f |
1 file changed, 4 insertions(+)
|
|
|
a3a04f |
|
|
|
a3a04f |
diff --git a/testprogs/blackbox/test_net_ads.sh b/testprogs/blackbox/test_net_ads.sh
|
|
|
a3a04f |
index 99b886f53eb..bbd99b676bd 100755
|
|
|
a3a04f |
--- a/testprogs/blackbox/test_net_ads.sh
|
|
|
a3a04f |
+++ b/testprogs/blackbox/test_net_ads.sh
|
|
|
a3a04f |
@@ -33,6 +33,8 @@ testit "join" $VALGRIND $net_tool ads join -U$DC_USERNAME%$DC_PASSWORD || failed
|
|
|
a3a04f |
|
|
|
a3a04f |
testit "testjoin" $VALGRIND $net_tool ads testjoin -kP || failed=`expr $failed + 1`
|
|
|
a3a04f |
|
|
|
a3a04f |
+testit "changetrustpw" $VALGRIND $net_tool ads changetrustpw || failed=`expr $failed + 1`
|
|
|
a3a04f |
+
|
|
|
a3a04f |
testit "leave" $VALGRIND $net_tool ads leave -U$DC_USERNAME%$DC_PASSWORD || failed=`expr $failed + 1`
|
|
|
a3a04f |
|
|
|
a3a04f |
# Test with kerberos method = secrets and keytab
|
|
|
a3a04f |
@@ -41,6 +43,8 @@ testit "join (decicated keytab)" $VALGRIND $net_tool ads join -U$DC_USERNAME%$DC
|
|
|
a3a04f |
|
|
|
a3a04f |
testit "testjoin (dedicated keytab)" $VALGRIND $net_tool ads testjoin -kP || failed=`expr $failed + 1`
|
|
|
a3a04f |
|
|
|
a3a04f |
+testit "changetrustpw (dedicated keytab)" $VALGRIND $net_tool ads changetrustpw || failed=`expr $failed + 1`
|
|
|
a3a04f |
+
|
|
|
a3a04f |
testit "leave (dedicated keytab)" $VALGRIND $net_tool ads leave -U$DC_USERNAME%$DC_PASSWORD || failed=`expr $failed + 1`
|
|
|
a3a04f |
rm -f $dedicated_keytab_file
|
|
|
a3a04f |
|
|
|
a3a04f |
--
|
|
|
a3a04f |
2.14.0
|
|
|
a3a04f |
|