From a0e9814c0d50ee822188e2bd6be8c4879aaebacc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Dieter=20Walln=C3=B6fer?= Date: Thu, 14 Oct 2010 09:41:42 +0200 Subject: s4:dsdb - remove "samdb_result_uint", "samdb_result_int64", "samdb_result_uint64" and "samdb_result_string" We have ldb_msg_find_attr_as_* calls which do exactly the same. Therefore this reduces only code redundancies. Signed-off-by: Andrew Bartlett --- source4/dsdb/schema/schema_init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/dsdb/schema/schema_init.c') diff --git a/source4/dsdb/schema/schema_init.c b/source4/dsdb/schema/schema_init.c index ba12f523e8c..54fc6b840b0 100644 --- a/source4/dsdb/schema/schema_init.c +++ b/source4/dsdb/schema/schema_init.c @@ -493,7 +493,7 @@ static int dsdb_schema_setup_ldb_schema_attribute(struct ldb_context *ldb, #define GET_BOOL_LDB(msg, attr, p, elem, strict) do { \ const char *str; \ - str = samdb_result_string(msg, attr, NULL);\ + str = ldb_msg_find_attr_as_string(msg, attr, NULL);\ if (str == NULL) { \ if (strict) { \ d_printf("%s: %s == NULL\n", __location__, attr); \ @@ -512,11 +512,11 @@ static int dsdb_schema_setup_ldb_schema_attribute(struct ldb_context *ldb, } while (0) #define GET_UINT32_LDB(msg, attr, p, elem) do { \ - (p)->elem = samdb_result_uint(msg, attr, 0);\ + (p)->elem = ldb_msg_find_attr_as_uint(msg, attr, 0);\ } while (0) #define GET_UINT32_PTR_LDB(msg, attr, mem_ctx, p, elem) do { \ - uint64_t _v = samdb_result_uint64(msg, attr, UINT64_MAX);\ + uint64_t _v = ldb_msg_find_attr_as_uint64(msg, attr, UINT64_MAX);\ if (_v == UINT64_MAX) { \ (p)->elem = NULL; \ } else if (_v > UINT32_MAX) { \ -- cgit v1.2.1