s3: Add winbindd_lookupsids

[ira/wip.git] / source3 / winbindd / winbindd.c

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index a9ff410f5245086f877fe81b6d2af4973f114757..330f9008317d81e1cbfcd8efd2e301ceb922b07d 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -27,13 +27,14 @@
 #include "winbindd.h"
 #include "nsswitch/winbind_client.h"
 #include "nsswitch/wb_reqtrans.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "../librpc/gen_ndr/srv_lsa.h"
 #include "../librpc/gen_ndr/srv_samr.h"
 #include "secrets.h"
 #include "idmap.h"
 #include "lib/addrchange.h"
 #include "serverid.h"
+#include "auth.h"
+#include "messages.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
@@ -86,15 +87,6 @@ static bool reload_services_file(const char *lfile)
 }
 
 
-/**************************************************************************** **
- Handle a fault..
- **************************************************************************** */
-
-static void fault_quit(void)
-{
-       dump_core();
-}
-
 static void winbindd_status(void)
 {
        struct winbindd_cli_state *tmp;
@@ -479,6 +471,8 @@ static struct winbindd_async_dispatch_table async_nonpriv_table[] = {
          wb_ping_send, wb_ping_recv },
        { WINBINDD_LOOKUPSID, "LOOKUPSID",
          winbindd_lookupsid_send, winbindd_lookupsid_recv },
+       { WINBINDD_LOOKUPSIDS, "LOOKUPSIDS",
+         winbindd_lookupsids_send, winbindd_lookupsids_recv },
        { WINBINDD_LOOKUPNAME, "LOOKUPNAME",
          winbindd_lookupname_send, winbindd_lookupname_recv },
        { WINBINDD_SID_TO_UID, "SID_TO_UID",
@@ -769,13 +763,15 @@ static void new_connection(int listen_sock, bool privileged)
 
        len = sizeof(sunaddr);
 
-       do {
-               sock = accept(listen_sock, (struct sockaddr *)(void *)&sunaddr,
-                             &len);
-       } while (sock == -1 && errno == EINTR);
+       sock = accept(listen_sock, (struct sockaddr *)(void *)&sunaddr, &len);
 
-       if (sock == -1)
+       if (sock == -1) {
+               if (errno != EINTR) {
+                       DEBUG(0, ("Faild to accept socket - %s\n",
+                                 strerror(errno)));
+               }
                return;
+       }
 
        DEBUG(6,("accepted socket %d\n", sock));
 
@@ -1019,7 +1015,6 @@ bool winbindd_use_cache(void)
 
 void winbindd_register_handlers(void)
 {
-       struct tevent_timer *te;
        /* Setup signal handlers */
 
        if (!winbindd_setup_sig_term_handler(true))
@@ -1101,11 +1096,12 @@ void winbindd_register_handlers(void)
        smb_nscd_flush_user_cache();
        smb_nscd_flush_group_cache();
 
-       te = tevent_add_timer(winbind_event_context(), NULL, timeval_zero(),
-                             rescan_trusted_domains, NULL);
-       if (te == NULL) {
-               DEBUG(0, ("Could not trigger rescan_trusted_domains()\n"));
-               exit(1);
+       if (lp_allow_trusted_domains()) {
+               if (tevent_add_timer(winbind_event_context(), NULL, timeval_zero(),
+                             rescan_trusted_domains, NULL) == NULL) {
+                       DEBUG(0, ("Could not trigger rescan_trusted_domains()\n"));
+                       exit(1);
+               }
        }
 
 }
@@ -1236,8 +1232,8 @@ int main(int argc, char **argv, char **envp)
        CatchSignal(SIGUSR1, SIG_IGN);
        CatchSignal(SIGUSR2, SIG_IGN);
 
-       fault_setup((void (*)(void *))fault_quit );
-       dump_core_setup("winbindd");
+       fault_setup();
+       dump_core_setup("winbindd", lp_logfile());
 
        load_case_tables();
 
@@ -1325,7 +1321,7 @@ int main(int argc, char **argv, char **envp)
        DEBUGADD(0,("%s\n", COPYRIGHT_STARTUP_MESSAGE));
 
        if (!lp_load_initial_only(get_dyn_CONFIGFILE())) {
-               DEBUG(0, ("error opening config file\n"));
+               DEBUG(0, ("error opening config file '%s'\n", get_dyn_CONFIGFILE()));
                exit(1);
        }