From 814b2c730b2f38767712a005bf328a4a04478f63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Fri, 17 May 2013 15:14:35 +0200 Subject: [PATCH 1/2] s3-libads: Fail create_local_private_krb5_conf_for_domain() if parameters missing. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Guenther Signed-off-by: Günther Deschner Reviewed-by: Stefan Metzmacher Reviewed-by: Andreas Schneider (cherry picked from commit 6dc7c63efa95d0c04b542667d9b6a6621c8139bf) --- source3/libads/kerberos.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c index 6b8f247..7d9bd4d 100644 --- a/source3/libads/kerberos.c +++ b/source3/libads/kerberos.c @@ -856,6 +856,10 @@ bool create_local_private_krb5_conf_for_domain(const char *realm, return false; } + if (!realm || !domain || !pss || !kdc_name) { + return false; + } + dname = lock_path("smb_krb5"); if (!dname) { return false; -- 1.8.3.1 From 6e0ad3569c35182ff3461909d3d0568348da8f56 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 5 Aug 2013 09:25:11 +0200 Subject: [PATCH 2/2] s3-libads: Print a message if no realm has been specified. Signed-off-by: Andreas Schneider Reviewed-by: Stefan Metzmacher Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Mon Aug 5 12:24:44 CEST 2013 on sn-devel-104 (cherry picked from commit 6659f0164c6b8d7ad522bcd6c2c6748c3d9bca81) --- source3/libads/kerberos.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c index 7d9bd4d..1153ccb 100644 --- a/source3/libads/kerberos.c +++ b/source3/libads/kerberos.c @@ -856,7 +856,13 @@ bool create_local_private_krb5_conf_for_domain(const char *realm, return false; } - if (!realm || !domain || !pss || !kdc_name) { + 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; } -- 1.8.3.1