s3: getgrent_state has been replaced by grent_state
[ira/wip.git] / source3 / winbindd / winbindd.c
index 34eaeb2d79b32f39603288f991b32b1a05645e6f..3f7a44e9dc97c1afd71379a23d864484b4533a53 100644 (file)
@@ -425,32 +425,6 @@ static struct winbindd_dispatch_table {
        const char *winbindd_cmd_name;
 } dispatch_table[] = {
 
-       /* User functions */
-
-       { WINBINDD_GETPWNAM, winbindd_getpwnam, "GETPWNAM" },
-       { WINBINDD_GETPWUID, winbindd_getpwuid, "GETPWUID" },
-       { WINBINDD_GETPWSID, winbindd_getpwsid, "GETPWSID" },
-
-       { WINBINDD_SETPWENT, winbindd_setpwent, "SETPWENT" },
-       { WINBINDD_ENDPWENT, winbindd_endpwent, "ENDPWENT" },
-       { WINBINDD_GETPWENT, winbindd_getpwent, "GETPWENT" },
-
-       { WINBINDD_GETGROUPS, winbindd_getgroups, "GETGROUPS" },
-       { WINBINDD_GETUSERSIDS, winbindd_getusersids, "GETUSERSIDS" },
-       { WINBINDD_GETUSERDOMGROUPS, winbindd_getuserdomgroups,
-         "GETUSERDOMGROUPS" },
-       { WINBINDD_GETSIDALIASES, winbindd_getsidaliases,
-          "LOOKUPUSERALIASES" },
-
-       /* Group functions */
-
-       { WINBINDD_GETGRNAM, winbindd_getgrnam, "GETGRNAM" },
-       { WINBINDD_GETGRGID, winbindd_getgrgid, "GETGRGID" },
-       { WINBINDD_SETGRENT, winbindd_setgrent, "SETGRENT" },
-       { WINBINDD_ENDGRENT, winbindd_endgrent, "ENDGRENT" },
-       { WINBINDD_GETGRENT, winbindd_getgrent, "GETGRENT" },
-       { WINBINDD_GETGRLST, winbindd_getgrent, "GETGRLST" },
-
        /* PAM auth functions */
 
        { WINBINDD_PAM_AUTH, winbindd_pam_auth, "PAM_AUTH" },
@@ -461,34 +435,11 @@ static struct winbindd_dispatch_table {
 
        /* Enumeration functions */
 
-       { WINBINDD_LIST_USERS, winbindd_list_users, "LIST_USERS" },
-       { WINBINDD_LIST_GROUPS, winbindd_list_groups, "LIST_GROUPS" },
        { WINBINDD_LIST_TRUSTDOM, winbindd_list_trusted_domains,
          "LIST_TRUSTDOM" },
-       { WINBINDD_SHOW_SEQUENCE, winbindd_show_sequence, "SHOW_SEQUENCE" },
-
-       /* SID related functions */
-
-       { WINBINDD_LOOKUPSID, winbindd_lookupsid, "LOOKUPSID" },
-       { WINBINDD_LOOKUPNAME, winbindd_lookupname, "LOOKUPNAME" },
-       { WINBINDD_LOOKUPRIDS, winbindd_lookuprids, "LOOKUPRIDS" },
-
-       /* Lookup related functions */
-
-       { WINBINDD_SID_TO_UID, winbindd_sid_to_uid, "SID_TO_UID" },
-       { WINBINDD_SID_TO_GID, winbindd_sid_to_gid, "SID_TO_GID" },
-       { WINBINDD_UID_TO_SID, winbindd_uid_to_sid, "UID_TO_SID" },
-       { WINBINDD_GID_TO_SID, winbindd_gid_to_sid, "GID_TO_SID" },
-       { WINBINDD_ALLOCATE_UID, winbindd_allocate_uid, "ALLOCATE_UID" },
-       { WINBINDD_ALLOCATE_GID, winbindd_allocate_gid, "ALLOCATE_GID" },
-       { WINBINDD_SET_MAPPING, winbindd_set_mapping, "SET_MAPPING" },
-       { WINBINDD_REMOVE_MAPPING, winbindd_remove_mapping, "REMOVE_MAPPING" },
-       { WINBINDD_SET_HWM, winbindd_set_hwm, "SET_HWMS" },
 
        /* Miscellaneous */
 
-       { WINBINDD_CHECK_MACHACC, winbindd_check_machine_acct, "CHECK_MACHACC" },
-       { WINBINDD_PING, winbindd_ping, "PING" },
        { WINBINDD_INFO, winbindd_info, "INFO" },
        { WINBINDD_INTERFACE_VERSION, winbindd_interface_version,
          "INTERFACE_VERSION" },
@@ -497,8 +448,6 @@ static struct winbindd_dispatch_table {
        { WINBINDD_NETBIOS_NAME, winbindd_netbios_name, "NETBIOS_NAME" },
        { WINBINDD_PRIV_PIPE_DIR, winbindd_priv_pipe_dir,
          "WINBINDD_PRIV_PIPE_DIR" },
-       { WINBINDD_GETDCNAME, winbindd_getdcname, "GETDCNAME" },
-       { WINBINDD_DSGETDCNAME, winbindd_dsgetdcname, "DSGETDCNAME" },
 
        /* Credential cache access */
        { WINBINDD_CCACHE_NTLMAUTH, winbindd_ccache_ntlm_auth, "NTLMAUTH" },
@@ -518,14 +467,90 @@ struct winbindd_async_dispatch_table {
        const char *cmd_name;
        struct tevent_req *(*send_req)(TALLOC_CTX *mem_ctx,
                                       struct tevent_context *ev,
+                                      struct winbindd_cli_state *cli,
                                       struct winbindd_request *request);
-       NTSTATUS (*recv_req)(struct tevent_req *req, TALLOC_CTX *mem_ctx,
-                            struct winbindd_response **presp);
+       NTSTATUS (*recv_req)(struct tevent_req *req,
+                            struct winbindd_response *presp);
 };
 
 static struct winbindd_async_dispatch_table async_nonpriv_table[] = {
        { WINBINDD_PING, "PING",
          wb_ping_send, wb_ping_recv },
+       { WINBINDD_LOOKUPSID, "LOOKUPSID",
+         winbindd_lookupsid_send, winbindd_lookupsid_recv },
+       { WINBINDD_LOOKUPNAME, "LOOKUPNAME",
+         winbindd_lookupname_send, winbindd_lookupname_recv },
+       { WINBINDD_SID_TO_UID, "SID_TO_UID",
+         winbindd_sid_to_uid_send, winbindd_sid_to_uid_recv },
+       { WINBINDD_SID_TO_GID, "SID_TO_GID",
+         winbindd_sid_to_gid_send, winbindd_sid_to_gid_recv },
+       { WINBINDD_UID_TO_SID, "UID_TO_SID",
+         winbindd_uid_to_sid_send, winbindd_uid_to_sid_recv },
+       { WINBINDD_GID_TO_SID, "GID_TO_SID",
+         winbindd_gid_to_sid_send, winbindd_gid_to_sid_recv },
+       { WINBINDD_GETPWSID, "GETPWSID",
+         winbindd_getpwsid_send, winbindd_getpwsid_recv },
+       { WINBINDD_GETPWNAM, "GETPWNAM",
+         winbindd_getpwnam_send, winbindd_getpwnam_recv },
+       { WINBINDD_GETPWUID, "GETPWUID",
+         winbindd_getpwuid_send, winbindd_getpwuid_recv },
+       { WINBINDD_GETSIDALIASES, "GETSIDALIASES",
+         winbindd_getsidaliases_send, winbindd_getsidaliases_recv },
+       { WINBINDD_GETUSERDOMGROUPS, "GETUSERDOMGROUPS",
+         winbindd_getuserdomgroups_send, winbindd_getuserdomgroups_recv },
+       { WINBINDD_GETGROUPS, "GETGROUPS",
+         winbindd_getgroups_send, winbindd_getgroups_recv },
+       { WINBINDD_SHOW_SEQUENCE, "SHOW_SEQUENCE",
+         winbindd_show_sequence_send, winbindd_show_sequence_recv },
+       { WINBINDD_GETGRGID, "GETGRGID",
+         winbindd_getgrgid_send, winbindd_getgrgid_recv },
+       { WINBINDD_GETGRNAM, "GETGRNAM",
+         winbindd_getgrnam_send, winbindd_getgrnam_recv },
+       { WINBINDD_GETUSERSIDS, "GETUSERSIDS",
+         winbindd_getusersids_send, winbindd_getusersids_recv },
+       { WINBINDD_LOOKUPRIDS, "LOOKUPRIDS",
+         winbindd_lookuprids_send, winbindd_lookuprids_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 },
+       { WINBINDD_DSGETDCNAME, "DSGETDCNAME",
+         winbindd_dsgetdcname_send, winbindd_dsgetdcname_recv },
+       { WINBINDD_GETDCNAME, "GETDCNAME",
+         winbindd_getdcname_send, winbindd_getdcname_recv },
+       { WINBINDD_SETGRENT, "SETGRENT",
+         winbindd_setgrent_send, winbindd_setgrent_recv },
+       { WINBINDD_GETGRENT, "GETGRENT",
+         winbindd_getgrent_send, winbindd_getgrent_recv },
+       { WINBINDD_ENDGRENT, "ENDGRENT",
+         winbindd_endgrent_send, winbindd_endgrent_recv },
+       { WINBINDD_LIST_USERS, "LIST_USERS",
+         winbindd_list_users_send, winbindd_list_users_recv },
+       { WINBINDD_LIST_GROUPS, "LIST_GROUPS",
+         winbindd_list_groups_send, winbindd_list_groups_recv },
+       { WINBINDD_CHECK_MACHACC, "CHECK_MACHACC",
+         winbindd_check_machine_acct_send, winbindd_check_machine_acct_recv },
+       { WINBINDD_PING_DC, "PING_DC",
+         winbindd_ping_dc_send, winbindd_ping_dc_recv },
+
+       { 0, NULL, NULL, NULL }
+};
+
+static struct winbindd_async_dispatch_table async_priv_table[] = {
+       { WINBINDD_ALLOCATE_UID, "ALLOCATE_UID",
+         winbindd_allocate_uid_send, winbindd_allocate_uid_recv },
+       { WINBINDD_ALLOCATE_GID, "ALLOCATE_GID",
+         winbindd_allocate_gid_send, winbindd_allocate_gid_recv },
+       { WINBINDD_SET_MAPPING, "SET_MAPPING",
+         winbindd_set_mapping_send, winbindd_set_mapping_recv },
+       { WINBINDD_REMOVE_MAPPING, "SET_MAPPING",
+         winbindd_remove_mapping_send, winbindd_remove_mapping_recv },
+       { WINBINDD_SET_HWM, "SET_HWM",
+         winbindd_set_hwm_send, winbindd_set_hwm_recv },
+       { WINBINDD_CHANGE_MACHACC, "CHANGE_MACHACC",
+         winbindd_change_machine_acct_send, winbindd_change_machine_acct_recv },
 
        { 0, NULL, NULL, NULL }
 };
@@ -552,6 +577,15 @@ static void process_request(struct winbindd_cli_state *state)
                }
        }
 
+       if ((atable->send_req == NULL) && state->privileged) {
+               for (atable = async_priv_table; atable->send_req;
+                    atable += 1) {
+                       if (state->request->cmd == atable->cmd) {
+                               break;
+                       }
+               }
+       }
+
        if (atable->send_req != NULL) {
                struct tevent_req *req;
 
@@ -559,7 +593,7 @@ static void process_request(struct winbindd_cli_state *state)
                           atable->cmd_name));
 
                req = atable->send_req(state->mem_ctx, winbind_event_context(),
-                                      state->request);
+                                      state, state->request);
                if (req == NULL) {
                        DEBUG(0, ("process_request: atable->send failed for "
                                  "%s\n", atable->cmd_name));
@@ -602,17 +636,22 @@ static void wb_request_done(struct tevent_req *req)
        struct winbindd_cli_state *state = tevent_req_callback_data(
                req, struct winbindd_cli_state);
        NTSTATUS status;
-       struct winbindd_response *response;
 
-       status = state->recv_fn(req, state->mem_ctx, &response);
+       state->response = talloc_zero(state, struct winbindd_response);
+       if (state->response == NULL) {
+               remove_client(state);
+               return;
+       }
+       state->response->result = WINBINDD_PENDING;
+       state->response->length = sizeof(struct winbindd_response);
+
+       status = state->recv_fn(req, state->response);
        TALLOC_FREE(req);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(10, ("returning %s\n", nt_errstr(status)));
                request_error(state);
+               return;
        }
-       state->response = response;
-       state->response->result = WINBINDD_PENDING;
-       state->response->length = sizeof(struct winbindd_response);
        request_ok(state);
 }
 
@@ -657,6 +696,8 @@ static void winbind_client_response_written(struct tevent_req *req)
        ret = wb_resp_write_recv(req, &err);
        TALLOC_FREE(req);
        if (ret == -1) {
+               close(state->sock);
+               state->sock = -1;
                DEBUG(2, ("Could not write response to client: %s\n",
                          strerror(err)));
                remove_client(state);
@@ -664,6 +705,7 @@ static void winbind_client_response_written(struct tevent_req *req)
        }
 
        TALLOC_FREE(state->mem_ctx);
+       state->response = NULL;
 
        req = wb_req_read_send(state, winbind_event_context(), state->sock,
                               WINBINDD_MAX_EXTRA_DATA);
@@ -754,7 +796,10 @@ static void winbind_client_request_read(struct tevent_req *req)
        int err;
 
        ret = wb_req_read_recv(req, state, &state->request, &err);
+       TALLOC_FREE(req);
        if (ret == -1) {
+               close(state->sock);
+               state->sock = -1;
                DEBUG(2, ("Could not read client request: %s\n",
                          strerror(err)));
                remove_client(state);
@@ -776,26 +821,22 @@ static void remove_client(struct winbindd_cli_state *state)
                return;
        }
 
-       /* tell client, we are closing ... */
-       nwritten = write(state->sock, &c, sizeof(c));
-       if (nwritten == -1) {
-               /* 
-                * ignore EPIPE error here, because the other end might
-                * have already closed the socket.
-                */
-               if (errno != EPIPE) {
+       if (state->sock != -1) {
+               /* tell client, we are closing ... */
+               nwritten = write(state->sock, &c, sizeof(c));
+               if (nwritten == -1) {
                        DEBUG(2, ("final write to client failed: %s\n",
-                               strerror(errno)));
+                               strerror(errno)));
                }
-       }
 
-       /* Close socket */
+               /* Close socket */
 
-       close(state->sock);
+               close(state->sock);
+               state->sock = -1;
+       }
 
        /* Free any getent state */
 
-       free_getent_state(state->getpwent_state);
        free_getent_state(state->getgrent_state);
 
        TALLOC_FREE(state->mem_ctx);
@@ -815,8 +856,8 @@ static bool remove_idle_client(void)
        int nidle = 0;
 
        for (state = winbindd_client_list(); state; state = state->next) {
-               if (state->response->result != WINBINDD_PENDING &&
-                   !state->getpwent_state && !state->getgrent_state) {
+               if (state->response == NULL &&
+                   !state->pwent_state && !state->grent_state) {
                        nidle++;
                        if (!last_access || state->last_access < last_access) {
                                last_access = state->last_access;