diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-11-06 01:24:59 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-11-06 13:33:09 +1100 |
| commit | ed6330094b47408f33c2d933e9c80b079dd891d6 (patch) | |
| tree | 33391b83f6a110d844e0b12392902df45afd2d59 | |
| parent | ab30a8bf0fb9bd4ee3c907183132f3b9abb67c7a (diff) | |
| download | samba-ed6330094b47408f33c2d933e9c80b079dd891d6.tar.gz samba-ed6330094b47408f33c2d933e9c80b079dd891d6.tar.bz2 samba-ed6330094b47408f33c2d933e9c80b079dd891d6.zip | |
dsdb: Rename _res argument to _result.
Newer versions of heimdal include a macro that is unfortunately named
'_res'. This change prevents the clash.
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source4/dsdb/common/util.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index 086f2a5a1c..632d5bfa20 100644 --- a/source4/dsdb/common/util.c +++ b/source4/dsdb/common/util.c @@ -3845,7 +3845,7 @@ int dsdb_replace(struct ldb_context *ldb, struct ldb_message *msg, uint32_t dsdb */ int dsdb_search_dn(struct ldb_context *ldb, TALLOC_CTX *mem_ctx, - struct ldb_result **_res, + struct ldb_result **_result, struct ldb_dn *basedn, const char * const *attrs, uint32_t dsdb_flags) @@ -3890,7 +3890,7 @@ int dsdb_search_dn(struct ldb_context *ldb, return ret; } - *_res = res; + *_result = res; return LDB_SUCCESS; } @@ -3900,7 +3900,7 @@ int dsdb_search_dn(struct ldb_context *ldb, */ int dsdb_search_by_dn_guid(struct ldb_context *ldb, TALLOC_CTX *mem_ctx, - struct ldb_result **_res, + struct ldb_result **_result, const struct GUID *guid, const char * const *attrs, uint32_t dsdb_flags) @@ -3915,7 +3915,7 @@ int dsdb_search_by_dn_guid(struct ldb_context *ldb, return ldb_oom(ldb); } - ret = dsdb_search_dn(ldb, mem_ctx, _res, dn, attrs, dsdb_flags); + ret = dsdb_search_dn(ldb, mem_ctx, _result, dn, attrs, dsdb_flags); talloc_free(tmp_ctx); return ret; } @@ -3925,7 +3925,7 @@ int dsdb_search_by_dn_guid(struct ldb_context *ldb, */ int dsdb_search(struct ldb_context *ldb, TALLOC_CTX *mem_ctx, - struct ldb_result **_res, + struct ldb_result **_result, struct ldb_dn *basedn, enum ldb_scope scope, const char * const *attrs, @@ -4003,7 +4003,7 @@ int dsdb_search(struct ldb_context *ldb, } } - *_res = talloc_steal(mem_ctx, res); + *_result = talloc_steal(mem_ctx, res); talloc_free(tmp_ctx); return LDB_SUCCESS; |