idmap_gid_to_sid: Fix a cut-a-npaste error.

[kai/samba.git] / source3 / winbindd / winbindd.c

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 55ab58f7ebb23e22d122923749f9ec0d5ff0852c..f75af64f8f7000562c3e8a2ca914540155c48cb9 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -340,9 +340,6 @@ static struct winbindd_dispatch_table {
        { 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" },
-#if 0   /* DISABLED until we fix the interface in Samba 3.0.26 --jerry */
-       { WINBINDD_SIDS_TO_XIDS, winbindd_sids_to_unixids, "SIDS_TO_XIDS" },
-#endif  /* end DISABLED */
        { WINBINDD_ALLOCATE_UID, winbindd_allocate_uid, "ALLOCATE_UID" },
        { WINBINDD_ALLOCATE_GID, winbindd_allocate_gid, "ALLOCATE_GID" },
        { WINBINDD_SET_MAPPING, winbindd_set_mapping, "SET_MAPPING" },
@@ -537,7 +534,6 @@ static void request_len_recv(void *private_data, bool success);
 static void request_recv(void *private_data, bool success);
 static void request_main_recv(void *private_data, bool success);
 static void request_finished(struct winbindd_cli_state *state);
-void request_finished_cont(void *private_data, bool success);
 static void response_main_sent(void *private_data, bool success);
 static void response_extra_sent(void *private_data, bool success);
 
@@ -546,10 +542,7 @@ static void response_extra_sent(void *private_data, bool success)
        struct winbindd_cli_state *state =
                talloc_get_type_abort(private_data, struct winbindd_cli_state);
 
-       if (state->mem_ctx != NULL) {
-               talloc_destroy(state->mem_ctx);
-               state->mem_ctx = NULL;
-       }
+       TALLOC_FREE(state->mem_ctx);
 
        if (!success) {
                state->finished = True;
@@ -574,10 +567,7 @@ static void response_main_sent(void *private_data, bool success)
        }
 
        if (state->response.length == sizeof(state->response)) {
-               if (state->mem_ctx != NULL) {
-                       talloc_destroy(state->mem_ctx);
-                       state->mem_ctx = NULL;
-               }
+               TALLOC_FREE(state->mem_ctx);
 
                setup_async_read(&state->fd_event, &state->request,
                                 sizeof(uint32), request_len_recv, state);
@@ -609,17 +599,6 @@ void request_ok(struct winbindd_cli_state *state)
        request_finished(state);
 }
 
-void request_finished_cont(void *private_data, bool success)
-{
-       struct winbindd_cli_state *state =
-               talloc_get_type_abort(private_data, struct winbindd_cli_state);
-
-       if (success)
-               request_ok(state);
-       else
-               request_error(state);
-}
-
 static void request_len_recv(void *private_data, bool success)
 {
        struct winbindd_cli_state *state =
@@ -767,10 +746,7 @@ static void remove_client(struct winbindd_cli_state *state)
 
        SAFE_FREE(state->response.extra_data.data);
 
-       if (state->mem_ctx != NULL) {
-               talloc_destroy(state->mem_ctx);
-               state->mem_ctx = NULL;
-       }
+       TALLOC_FREE(state->mem_ctx);
 
        remove_fd_event(&state->fd_event);
                
@@ -1048,8 +1024,6 @@ int main(int argc, char **argv, char **envp)
 
        load_case_tables();
 
-       db_tdb2_setup_messaging(NULL, false);
-
        /* Initialise for running in non-root mode */
 
        sec_init();
@@ -1140,8 +1114,6 @@ int main(int argc, char **argv, char **envp)
                exit(1);
        }
 
-       db_tdb2_setup_messaging(winbind_messaging_context(), true);
-
        if (!reload_services_file(NULL)) {
                DEBUG(0, ("error opening config file\n"));
                exit(1);
@@ -1168,12 +1140,6 @@ int main(int argc, char **argv, char **envp)
 
        namecache_enable();
 
-       /* Winbind daemon initialisation */
-
-       if ( ! NT_STATUS_IS_OK(idmap_init_cache()) ) {
-               DEBUG(1, ("Could not init idmap cache!\n"));            
-       }
-
        /* Unblock all signals we are interested in as they may have been
           blocked by the parent process. */