[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-702-g0a9874c

[Michael Adam]

The branch, v3-2-test has been updated
       via  0a9874c1c76c0ccc71caba7ee85a0ee1a91808c5 (commit)
      from  194c4640b158457a6d0d5ea91e28d41d619c77de (commit)

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


- Log -----------------------------------------------------------------
commit 0a9874c1c76c0ccc71caba7ee85a0ee1a91808c5
Author: Michael Adam <obnox at samba.org>
Date:   Tue Dec 18 01:30:52 2007 +0100

    Prevent another segfault.
    
    Michael

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

Summary of changes:
 source/passdb/passdb.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/passdb/passdb.c b/source/passdb/passdb.c
index 9311b8a..4228f6c 100644
--- a/source/passdb/passdb.c
+++ b/source/passdb/passdb.c
@@ -1552,7 +1552,9 @@ bool get_trust_pw_clear(const char *domain, char **ret_pwd,
 			return false;
 		}
 
-		*channel = SEC_CHAN_DOMAIN;
+		if (channel != NULL) {
+			*channel = SEC_CHAN_DOMAIN;
+		}
 
 		if (account_name != NULL) {
 			*account_name = lp_workgroup();


-- 
Samba Shared Repository