The branch, v3-6-test has been updated
via 8d40163 s3-libads: Print a message if no realm has been specified.
via c472ffa s3-libads: Fail create_local_private_krb5_conf_for_domain()
if parameters missing.
from 64732d3 s3-winbind: Do not delete an existing valid credential
cache.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 8d40163e7a25091bcdbe90d5c91bcec088b097d5
Author: Andreas Schneider <[email protected]>
Date: Mon Aug 5 09:25:11 2013 +0200
s3-libads: Print a message if no realm has been specified.
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
Autobuild-User(master): Andreas Schneider <[email protected]>
Autobuild-Date(master): Mon Aug 5 12:24:44 CEST 2013 on sn-devel-104
(cherry picked from commit 6659f0164c6b8d7ad522bcd6c2c6748c3d9bca81)
The last 2 patches address bug #10073 - net ads join - segmentation fault in
create_local_private_krb5_conf_for_domain.
commit c472ffab2854537b9e5d6238e68c04bfe2bd5e69
Author: Günther Deschner <[email protected]>
Date: Fri May 17 15:14:35 2013 +0200
s3-libads: Fail create_local_private_krb5_conf_for_domain() if parameters
missing.
Guenther
Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
(cherry picked from commit 6dc7c63efa95d0c04b542667d9b6a6621c8139bf)
-----------------------------------------------------------------------
Summary of changes:
source3/libads/kerberos.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index 6b8f247..1153ccb 100644
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -856,6 +856,16 @@ bool create_local_private_krb5_conf_for_domain(const char
*realm,
return false;
}
+ if (realm == NULL) {
+ DEBUG(0, ("No realm has been specified! Do you really want to "
+ "join an Active Directory server?\n"));
+ return false;
+ }
+
+ if (domain == NULL || pss == NULL || kdc_name == NULL) {
+ return false;
+ }
+
dname = lock_path("smb_krb5");
if (!dname) {
return false;
--
Samba Shared Repository
