diff options
author | Andrew Tridgell <tridge@samba.org> | 2009-09-18 14:12:02 -0700 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2009-09-18 14:12:02 -0700 |
commit | 716ddc2a897eacd08aed7ff4bee165e418ff63cc (patch) | |
tree | 9f400d977baa55edc70fa39e1346fb2dda975a27 /source3/smbd/trans2.c | |
parent | c6d58efa4b1ad5ff4a9e0f224b8a9789d8f82faf (diff) | |
parent | c2139e8e5646a8558d70c1ca4ce2d755497de8e1 (diff) | |
download | samba-716ddc2a897eacd08aed7ff4bee165e418ff63cc.tar.gz samba-716ddc2a897eacd08aed7ff4bee165e418ff63cc.tar.xz samba-716ddc2a897eacd08aed7ff4bee165e418ff63cc.zip |
Merge branch 'master' of /home/tridge/samba/git/combined
Diffstat (limited to 'source3/smbd/trans2.c')
-rw-r--r-- | source3/smbd/trans2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 85eb73749a..ce458126d3 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -156,7 +156,9 @@ NTSTATUS get_ea_names_from_file(TALLOC_CTX *mem_ctx, connection_struct *conn, ssize_t sizeret = -1; if (!lp_ea_support(SNUM(conn))) { - *pnames = NULL; + if (pnames) { + *pnames = NULL; + } *pnum_names = 0; return NT_STATUS_OK; } |