[SCM] Samba Shared Repository - branch v4-0-test updated

[Karolin Seeger]

The branch, v4-0-test has been updated
       via  1a61c56 s3-libads: Print a message if no realm has been specified.
       via  dea6282 s3-libads: Fail create_local_private_krb5_conf_for_domain() if parameters missing.
      from  9439729 Ensure gpfs kernel leases are wrapped in a become_root()/unbecome_root() pair.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 1a61c5632c1a444eb916290342241660cbb59988
Author: Andreas Schneider <asn at samba.org>
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 <asn at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    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.
    
    Autobuild-User(v4-0-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-0-test): Tue Aug 13 12:16:48 CEST 2013 on sn-devel-104

commit dea6282d3b7bda6389c2f101c14159274472b780
Author: Günther Deschner <gd at samba.org>
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 <gd at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    (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 50a409c..cac3474 100644
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -838,6 +838,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