diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-21 15:18:05 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-21 15:18:05 +0100 |
| commit | 47951fc5d0085e124666b7667715bba98076820e (patch) | |
| tree | 67216ad0d594eb5a7238327c386ba34594142118 /source3/lib/ldb/nssldb | |
| parent | d3199276eac8caa55c8334458d156fd4badae338 (diff) | |
| download | samba-47951fc5d0085e124666b7667715bba98076820e.tar.gz samba-47951fc5d0085e124666b7667715bba98076820e.tar.bz2 samba-47951fc5d0085e124666b7667715bba98076820e.zip | |
Reorder arguments to ldb_search() to match what is in Samba 4.
Diffstat (limited to 'source3/lib/ldb/nssldb')
| -rw-r--r-- | source3/lib/ldb/nssldb/ldb-grp.c | 23 | ||||
| -rw-r--r-- | source3/lib/ldb/nssldb/ldb-pwd.c | 17 |
2 files changed, 18 insertions, 22 deletions
diff --git a/source3/lib/ldb/nssldb/ldb-grp.c b/source3/lib/ldb/nssldb/ldb-grp.c index 71e27a9161..842a668d2f 100644 --- a/source3/lib/ldb/nssldb/ldb-grp.c +++ b/source3/lib/ldb/nssldb/ldb-grp.c @@ -59,12 +59,12 @@ NSS_STATUS _nss_ldb_setgrent(void) _ldb_nss_ctx->gr_res = NULL; } - ret = ldb_search(_ldb_nss_ctx->ldb, + ret = ldb_search(_ldb_nss_ctx->ldb, _ldb_nss_ctx->ldb, + &_ldb_nss_ctx->gr_res, _ldb_nss_ctx->base, - LDB_SCOPE_SUBTREE, - _LDB_NSS_GRENT_FILTER, + LDB_SCOPE_SUBTREE, _ldb_nss_gr_attrs, - &_ldb_nss_ctx->gr_res); + _LDB_NSS_GRENT_FILTER); if (ret != LDB_SUCCESS) { return NSS_STATUS_UNAVAIL; } @@ -177,12 +177,11 @@ NSS_STATUS _nss_ldb_getgrnam_r(const char *name, struct group *result_buf, char } /* search the entry */ - ret = ldb_search(_ldb_nss_ctx->ldb, + ret = ldb_search(_ldb_nss_ctx->ldb, _ldb_nss_ctx->ldb, &gr_res, _ldb_nss_ctx->base, LDB_SCOPE_SUBTREE, - filter, _ldb_nss_gr_attrs, - &gr_res); + filter); if (ret != LDB_SUCCESS) { /* this is a fatal error */ *errnop = errno = ENOENT; @@ -274,12 +273,11 @@ NSS_STATUS _nss_ldb_getgrgid_r(gid_t gid, struct group *result_buf, char *buffer } /* search the entry */ - ret = ldb_search(_ldb_nss_ctx->ldb, + ret = ldb_search(_ldb_nss_ctx->ldb, _ldb_nss_ctx->ldb, &gr_res, _ldb_nss_ctx->base, LDB_SCOPE_SUBTREE, - filter, _ldb_nss_gr_attrs, - &gr_res); + filter); if (ret != LDB_SUCCESS) { /* this is a fatal error */ *errnop = errno = ENOENT; @@ -366,12 +364,11 @@ NSS_STATUS _nss_ldb_initgroups_dyn(const char *user, gid_t group, long int *star } /* search the entry */ - ret = ldb_search(_ldb_nss_ctx->ldb, + ret = ldb_search(_ldb_nss_ctx->ldb, _ldb_nss_ctx->ldb, &uid_res, _ldb_nss_ctx->base, LDB_SCOPE_SUBTREE, - filter, attrs, - &uid_res); + filter); 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 44b0ab21ee..0af7af9981 100644 --- a/source3/lib/ldb/nssldb/ldb-pwd.c +++ b/source3/lib/ldb/nssldb/ldb-pwd.c @@ -46,12 +46,12 @@ NSS_STATUS _nss_ldb_setpwent(void) _ldb_nss_ctx->pw_res = NULL; } - ret = ldb_search(_ldb_nss_ctx->ldb, + ret = ldb_search(_ldb_nss_ctx->ldb, _ldb_nss_ctx->ldb, + &_ldb_nss_ctx->pw_res, _ldb_nss_ctx->base, LDB_SCOPE_SUBTREE, - _LDB_NSS_PWENT_FILTER, _ldb_nss_pw_attrs, - &_ldb_nss_ctx->pw_res); + _LDB_NSS_PWENT_FILTER); if (ret != LDB_SUCCESS) { return NSS_STATUS_UNAVAIL; } @@ -136,12 +136,12 @@ NSS_STATUS _nss_ldb_getpwuid_r(uid_t uid, struct passwd *result_buf, char *buffe } /* search the entry */ - ret = ldb_search(_ldb_nss_ctx->ldb, + ret = ldb_search(_ldb_nss_ctx->ldb, _ldb_nss_ctx->ldb, &res, _ldb_nss_ctx->base, LDB_SCOPE_SUBTREE, - filter, _ldb_nss_pw_attrs, - &res); + filter + ); if (ret != LDB_SUCCESS) { /* this is a fatal error */ *errnop = errno = ENOENT; @@ -197,12 +197,11 @@ NSS_STATUS _nss_ldb_getpwnam_r(const char *name, struct passwd *result_buf, char } /* search the entry */ - ret = ldb_search(_ldb_nss_ctx->ldb, + ret = ldb_search(_ldb_nss_ctx->ldb, _ldb_nss_ctx->ldb, &res, _ldb_nss_ctx->base, LDB_SCOPE_SUBTREE, - filter, _ldb_nss_pw_attrs, - &res); + filter); if (ret != LDB_SUCCESS) { /* this is a fatal error */ *errnop = errno = ENOENT; |