diff options
author | Nadezhda Ivanova <nadezhda.ivanova@postpath.com> | 2010-01-04 11:24:10 +0200 |
---|---|---|
committer | Nadezhda Ivanova <nadezhda.ivanova@postpath.com> | 2010-01-04 11:24:10 +0200 |
commit | fb5383c69ee52fb5e6d066a43451dc8c806cc795 (patch) | |
tree | 45b72e03f68ab6d212755c524f8e8a60a3b4373a /source3/lib/util_sid.c | |
parent | 60d8ab3b7b0bd2c9b633f0380d1fdf5bcf5e2621 (diff) | |
parent | a06e5cdb99ddf7abf16486d3837105ec4e0da9ee (diff) | |
download | samba-fb5383c69ee52fb5e6d066a43451dc8c806cc795.tar.gz samba-fb5383c69ee52fb5e6d066a43451dc8c806cc795.tar.bz2 samba-fb5383c69ee52fb5e6d066a43451dc8c806cc795.zip |
Merge branch 'master' of git://git.samba.org/samba
Diffstat (limited to 'source3/lib/util_sid.c')
-rw-r--r-- | source3/lib/util_sid.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c index 639269cac2..1f47bf35f0 100644 --- a/source3/lib/util_sid.c +++ b/source3/lib/util_sid.c @@ -557,17 +557,18 @@ char *sid_binstring_hex(const DOM_SID *sid) Tallocs a duplicate SID. ********************************************************************/ -DOM_SID *sid_dup_talloc(TALLOC_CTX *ctx, const DOM_SID *src) +struct dom_sid *sid_dup_talloc(TALLOC_CTX *ctx, const struct dom_sid *src) { - DOM_SID *dst; - - if(!src) + struct dom_sid *dst; + + if (src == NULL) { return NULL; - - if((dst = TALLOC_ZERO_P(ctx, DOM_SID)) != NULL) { - sid_copy( dst, src); } - + dst = talloc_zero(ctx, struct dom_sid); + if (dst == NULL) { + return NULL; + } + sid_copy(dst, src); return dst; } |