diff options
| author | Jeremy Allison <jra@samba.org> | 2007-12-17 17:03:07 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-12-17 17:03:07 -0800 |
| commit | 289d793629592b8aff24d3583fc052ac3c30247a (patch) | |
| tree | 9827aa270ff5a4200cbce5776871e6f411aabc2d /source3/passdb | |
| parent | 2b0a570c77b5e4afba44e670f1ebf0016f96d30a (diff) | |
| parent | a62cc944435fb9964c765cb9495f18308823ac8f (diff) | |
| download | samba-289d793629592b8aff24d3583fc052ac3c30247a.tar.gz samba-289d793629592b8aff24d3583fc052ac3c30247a.tar.bz2 samba-289d793629592b8aff24d3583fc052ac3c30247a.zip | |
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 8223624fea7c1b61e9231168cb4d82771576cbc5)
Diffstat (limited to 'source3/passdb')
| -rw-r--r-- | source3/passdb/passdb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index 9311b8a74e..4228f6c32f 100644 --- a/source3/passdb/passdb.c +++ b/source3/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(); |