diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-03-17 14:19:25 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-03-17 14:19:25 +1100 |
| commit | 467cc6927f57e36ce9b97131e72b79ef6e39a668 (patch) | |
| tree | 7ba399896c9c4a7bcb81543bce30d06b0ffb1a1d /nsswitch/pam_winbind.h | |
| parent | a1ebb850209289734b12ea966b01d295d8fc436d (diff) | |
| parent | 382d8069adcc49e351eef63d86036ae553b119a2 (diff) | |
| download | samba-467cc6927f57e36ce9b97131e72b79ef6e39a668.tar.gz samba-467cc6927f57e36ce9b97131e72b79ef6e39a668.tar.bz2 samba-467cc6927f57e36ce9b97131e72b79ef6e39a668.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'nsswitch/pam_winbind.h')
| -rw-r--r-- | nsswitch/pam_winbind.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nsswitch/pam_winbind.h b/nsswitch/pam_winbind.h index 0395a1fd5b..25d673e231 100644 --- a/nsswitch/pam_winbind.h +++ b/nsswitch/pam_winbind.h @@ -171,6 +171,8 @@ struct pwb_context { uint32_t ctrl; }; +#ifndef TALLOC_FREE #define TALLOC_FREE(ctx) do { talloc_free(ctx); ctx=NULL; } while(0) +#endif #define TALLOC_ZERO_P(ctx, type) (type *)_talloc_zero(ctx, sizeof(type), #type) #define TALLOC_P(ctx, type) (type *)talloc_named_const(ctx, sizeof(type), #type) |