]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blob - src/patches/samba/samba-3.6.18-fix_net_ads_join_segfault.patch
Merge branch 'core110'
[people/pmueller/ipfire-2.x.git] / src / patches / samba / samba-3.6.18-fix_net_ads_join_segfault.patch
1 From 814b2c730b2f38767712a005bf328a4a04478f63 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
3 Date: Fri, 17 May 2013 15:14:35 +0200
4 Subject: [PATCH 1/2] s3-libads: Fail
5 create_local_private_krb5_conf_for_domain() if parameters missing.
6 MIME-Version: 1.0
7 Content-Type: text/plain; charset=UTF-8
8 Content-Transfer-Encoding: 8bit
9
10 Guenther
11
12 Signed-off-by: Günther Deschner <gd@samba.org>
13 Reviewed-by: Stefan Metzmacher <metze@samba.org>
14 Reviewed-by: Andreas Schneider <asn@samba.org>
15 (cherry picked from commit 6dc7c63efa95d0c04b542667d9b6a6621c8139bf)
16 ---
17 source3/libads/kerberos.c | 4 ++++
18 1 file changed, 4 insertions(+)
19
20 Index: samba-3.6.22/source3/libads/kerberos.c
21 ===================================================================
22 --- samba-3.6.22.orig/source3/libads/kerberos.c
23 +++ samba-3.6.22/source3/libads/kerberos.c
24 @@ -866,6 +866,16 @@ bool create_local_private_krb5_conf_for_
25 return false;
26 }
27
28 + if (realm == NULL) {
29 + DEBUG(0, ("No realm has been specified! Do you really want to "
30 + "join an Active Directory server?\n"));
31 + return false;
32 + }
33 +
34 + if (domain == NULL || pss == NULL || kdc_name == NULL) {
35 + return false;
36 + }
37 +
38 dname = lock_path("smb_krb5");
39 if (!dname) {
40 return false;