summaryrefslogtreecommitdiff
path: root/source3/winbindd/winbindd.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-08-17 23:13:48 +0200
committerVolker Lendecke <vl@samba.org>2009-08-29 19:42:26 +0200
commit9c30a8dc6fffd592592a108f3d9d93769ba74417 (patch)
tree2dcf9b86aef2e3c57b334f67133448e5524e2dbc /source3/winbindd/winbindd.c
parent6e2bf7e23480cb467288adac145ec2853aeaa11d (diff)
downloadsamba-9c30a8dc6fffd592592a108f3d9d93769ba74417.tar.gz
samba-9c30a8dc6fffd592592a108f3d9d93769ba74417.tar.bz2
samba-9c30a8dc6fffd592592a108f3d9d93769ba74417.zip
s3:winbind: Convert the GETPWENT routines to the new API
Diffstat (limited to 'source3/winbindd/winbindd.c')
-rw-r--r--source3/winbindd/winbindd.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 5c2ed961ef..85203fbed0 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -425,12 +425,6 @@ static struct winbindd_dispatch_table {
const char *winbindd_cmd_name;
} dispatch_table[] = {
- /* User functions */
-
- { WINBINDD_SETPWENT, winbindd_setpwent, "SETPWENT" },
- { WINBINDD_ENDPWENT, winbindd_endpwent, "ENDPWENT" },
- { WINBINDD_GETPWENT, winbindd_getpwent, "GETPWENT" },
-
/* Group functions */
{ WINBINDD_SETGRENT, winbindd_setgrent, "SETGRENT" },
@@ -538,6 +532,12 @@ static struct winbindd_async_dispatch_table async_nonpriv_table[] = {
winbindd_getgrnam_send, winbindd_getgrnam_recv },
{ WINBINDD_GETUSERSIDS, "GETUSERSIDS",
winbindd_getusersids_send, winbindd_getusersids_recv },
+ { WINBINDD_SETPWENT, "SETPWENT",
+ winbindd_setpwent_send, winbindd_setpwent_recv },
+ { WINBINDD_GETPWENT, "GETPWENT",
+ winbindd_getpwent_send, winbindd_getpwent_recv },
+ { WINBINDD_ENDPWENT, "ENDPWENT",
+ winbindd_endpwent_send, winbindd_endpwent_recv },
{ 0, NULL, NULL, NULL }
};
@@ -814,7 +814,6 @@ static void remove_client(struct winbindd_cli_state *state)
/* Free any getent state */
- free_getent_state(state->getpwent_state);
free_getent_state(state->getgrent_state);
TALLOC_FREE(state->mem_ctx);
@@ -835,7 +834,7 @@ static bool remove_idle_client(void)
for (state = winbindd_client_list(); state; state = state->next) {
if (state->response == NULL &&
- !state->getpwent_state && !state->getgrent_state) {
+ !state->pwent_state && !state->getgrent_state) {
nidle++;
if (!last_access || state->last_access < last_access) {
last_access = state->last_access;