Replace ldb_search() with ldb_search_exp_fmt(), like in Samba 4.

2 files changed, 5 insertions, 58 deletions

diff --git a/source3/lib/ldb/nssldb/ldb-grp.c b/source3/lib/ldb/nssldb/ldb-grp.c
index 842a668d2f..82598e1e95 100644
--- a/source3/lib/ldb/nssldb/ldb-grp.c
+++ b/source3/lib/ldb/nssldb/ldb-grp.c
@@ -151,7 +151,6 @@ NSS_STATUS _nss_ldb_getgrent_r(struct group *result_buf, char *buffer, size_t bu
 NSS_STATUS _nss_ldb_getgrnam_r(const char *name, struct group *result_buf, char *buffer, size_t buflen, int *errnop)
 {
 	int ret;
-	char *filter;
 	TALLOC_CTX *ctx;
 	struct ldb_result *gr_res;
 	struct ldb_result *mem_res;
@@ -167,21 +166,12 @@ NSS_STATUS _nss_ldb_getgrnam_r(const char *name, struct group *result_buf, char
 		return NSS_STATUS_UNAVAIL;
 	}
 
-	/* build the filter for this uid */
-	filter = talloc_asprintf(ctx, _LDB_NSS_GRNAM_FILTER, name);
-	if (filter == NULL) {
-		/* this is a fatal error */
-		*errnop = errno = ENOMEM;
-		ret = NSS_STATUS_UNAVAIL;
-		goto done;
-	}
-
 	/* search the entry */
 	ret = ldb_search(_ldb_nss_ctx->ldb, _ldb_nss_ctx->ldb, &gr_res,
 			 _ldb_nss_ctx->base,
 			 LDB_SCOPE_SUBTREE,
 			 _ldb_nss_gr_attrs,
-			 filter);
+			 _LDB_NSS_GRNAM_FILTER, name);
 	if (ret != LDB_SUCCESS) {
 		/* this is a fatal error */
 		*errnop = errno = ENOENT;
@@ -242,7 +232,6 @@ done:
 NSS_STATUS _nss_ldb_getgrgid_r(gid_t gid, struct group *result_buf, char *buffer, size_t buflen, int *errnop)
 {
 	int ret;
-	char *filter;
 	TALLOC_CTX *ctx;
 	struct ldb_result *gr_res;
 	struct ldb_result *mem_res;
@@ -263,21 +252,12 @@ NSS_STATUS _nss_ldb_getgrgid_r(gid_t gid, struct group *result_buf, char *buffer
 		return NSS_STATUS_UNAVAIL;
 	}
 
-	/* build the filter for this uid */
-	filter = talloc_asprintf(ctx, _LDB_NSS_GRGID_FILTER, gid);
-	if (filter == NULL) {
-		/* this is a fatal error */
-		*errnop = errno = ENOMEM;
-		ret = NSS_STATUS_UNAVAIL;
-		goto done;
-	}
-
 	/* search the entry */
 	ret = ldb_search(_ldb_nss_ctx->ldb, _ldb_nss_ctx->ldb, &gr_res,
 			 _ldb_nss_ctx->base,
 			 LDB_SCOPE_SUBTREE,
 			 _ldb_nss_gr_attrs,
-			 filter);
+			 _LDB_NSS_GRGID_FILTER, gid);
 	if (ret != LDB_SUCCESS) {
 		/* this is a fatal error */
 		*errnop = errno = ENOENT;
@@ -338,7 +318,6 @@ done:
 NSS_STATUS _nss_ldb_initgroups_dyn(const char *user, gid_t group, long int *start, long int *size, gid_t **groups, long int limit, int *errnop)
 {
 	int ret;
-	char *filter;
 	const char * attrs[] = { "uidNumber", "gidNumber", NULL };
 	struct ldb_result *uid_res;
 	struct ldb_result *mem_res;
@@ -354,21 +333,12 @@ NSS_STATUS _nss_ldb_initgroups_dyn(const char *user, gid_t group, long int *star
 		return NSS_STATUS_UNAVAIL;
 	}
 
-	/* build the filter for this name */
-	filter = talloc_asprintf(mem_res, _LDB_NSS_PWNAM_FILTER, user);
-	if (filter == NULL) {
-		/* this is a fatal error */
-		*errnop = errno = ENOENT;
-		ret = NSS_STATUS_UNAVAIL;
-		goto done;
-	}
-
 	/* search the entry */
 	ret = ldb_search(_ldb_nss_ctx->ldb, _ldb_nss_ctx->ldb, &uid_res,
 			 _ldb_nss_ctx->base,
 			 LDB_SCOPE_SUBTREE,
 			 attrs,
-			 filter);
+			 _LDB_NSS_PWNAM_FILTER, user);
 	if (ret != LDB_SUCCESS) {
 		/* this is a fatal error */
 		*errnop = errno = ENOENT;
diff --git a/source3/lib/ldb/nssldb/ldb-pwd.c b/source3/lib/ldb/nssldb/ldb-pwd.c
index 0af7af9981..2e7ec456b3 100644
--- a/source3/lib/ldb/nssldb/ldb-pwd.c
+++ b/source3/lib/ldb/nssldb/ldb-pwd.c
@@ -113,7 +113,6 @@ NSS_STATUS _nss_ldb_getpwent_r(struct passwd *result_buf,
 NSS_STATUS _nss_ldb_getpwuid_r(uid_t uid, struct passwd *result_buf, char *buffer, size_t buflen, int *errnop)
 {
 	int ret;
-	char *filter;
 	struct ldb_result *res;
 
 	if (uid == 0) { /* we don't serve root uid by policy */
@@ -126,22 +125,12 @@ NSS_STATUS _nss_ldb_getpwuid_r(uid_t uid, struct passwd *result_buf, char *buffe
 		return ret;
 	}
 
-	/* build the filter for this uid */
-	filter = talloc_asprintf(_ldb_nss_ctx, _LDB_NSS_PWUID_FILTER, uid);
-	if (filter == NULL) {
-		/* this is a fatal error */
-		*errnop = errno = ENOMEM;
-		ret = NSS_STATUS_UNAVAIL;
-		goto done;
-	}
-
 	/* search the entry */
 	ret = ldb_search(_ldb_nss_ctx->ldb, _ldb_nss_ctx->ldb, &res, 
 			 _ldb_nss_ctx->base,
 			 LDB_SCOPE_SUBTREE,
 			 _ldb_nss_pw_attrs,
-			 filter
-			 );
+			 _LDB_NSS_PWUID_FILTER, uid);
 	if (ret != LDB_SUCCESS) {
 		/* this is a fatal error */
 		*errnop = errno = ENOENT;
@@ -171,7 +160,6 @@ NSS_STATUS _nss_ldb_getpwuid_r(uid_t uid, struct passwd *result_buf, char *buffe
 				   res->msgs[0]);
 
 done:
-	talloc_free(filter);
 	talloc_free(res);
 	return ret;
 }
@@ -179,7 +167,6 @@ done:
 NSS_STATUS _nss_ldb_getpwnam_r(const char *name, struct passwd *result_buf, char *buffer, size_t buflen, int *errnop)
 {
 	int ret;
-	char *filter;
 	struct ldb_result *res;
 
 	ret = _ldb_nss_init();
@@ -187,21 +174,12 @@ NSS_STATUS _nss_ldb_getpwnam_r(const char *name, struct passwd *result_buf, char
 		return ret;
 	}
 
-	/* build the filter for this name */
-	filter = talloc_asprintf(_ldb_nss_ctx, _LDB_NSS_PWNAM_FILTER, name);
-	if (filter == NULL) {
-		/* this is a fatal error */
-		*errnop = errno = ENOENT;
-		ret = NSS_STATUS_UNAVAIL;
-		goto done;
-	}
-
 	/* search the entry */
 	ret = ldb_search(_ldb_nss_ctx->ldb, _ldb_nss_ctx->ldb, &res,
 			 _ldb_nss_ctx->base,
 			 LDB_SCOPE_SUBTREE,
 			 _ldb_nss_pw_attrs,
-			 filter);
+			 _LDB_NSS_PWNAM_FILTER, name);
 	if (ret != LDB_SUCCESS) {
 		/* this is a fatal error */
 		*errnop = errno = ENOENT;
@@ -231,7 +209,6 @@ NSS_STATUS _nss_ldb_getpwnam_r(const char *name, struct passwd *result_buf, char
 				   res->msgs[0]);
 
 done:
-	talloc_free(filter);
 	talloc_free(res);
 	return ret;
 }