[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  0b5a556 s4-kerberos Don't segfault if the password isn't specified in keytab generation
      from  c680a42 upgradeprovision: fix a typo

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0b5a556b76f0d05457c1c370b0f81fba124190a3
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sun Sep 26 12:34:58 2010 +1000

    s4-kerberos Don't segfault if the password isn't specified in keytab generation
    
    Andrew Bartlett
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Sun Sep 26 03:29:34 UTC 2010 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source4/auth/kerberos/kerberos_util.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/auth/kerberos/kerberos_util.c b/source4/auth/kerberos/kerberos_util.c
index 37a5ae6..76edf0d 100644
--- a/source4/auth/kerberos/kerberos_util.c
+++ b/source4/auth/kerberos/kerberos_util.c
@@ -597,6 +597,13 @@ static krb5_error_code create_keytab(TALLOC_CTX *parent_ctx,
 
 	/* Finally, do the dance to get the password to put in the entry */
 	password_s =  ldb_msg_find_attr_as_string(msg, "secret", NULL);
+
+	if (!password_s) {
+		/* There is no password here, so nothing to do */
+		talloc_free(mem_ctx);
+		return 0;
+	}
+
 	if (add_old && kvno != 0) {
 		old_secret = ldb_msg_find_attr_as_string(msg, "priorSecret", NULL);
 	} else {


-- 
Samba Shared Repository