From b22ffe6e110a645e9181a68fea60b32d3cabc92d Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 5 Aug 2013 09:25:11 +0200 Subject: [PATCH] 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) The last 2 patches address bug #10073 - net ads join - segmentation fault in create_local_private_krb5_conf_for_domain. (cherry picked from commit 8d40163e7a25091bcdbe90d5c91bcec088b097d5) --- 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 7d9bd4d2b18..1153ccb2885 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; } -- 2.11.4.GIT