r20857: Silence gives assent :-). Checking in the fix for
[metze/samba/wip.git] / source3 / nsswitch / winbindd_cm.c
index 3f392c482592e709ee107e1acd7ced4e603a89c1..70ab9b0582503bb5e4543aac0ae1da64369fb6bb 100644 (file)
@@ -7,6 +7,7 @@
    Copyright (C) Andrew Bartlett           2002
    Copyright (C) Gerald (Jerry) Carter     2003-2005.
    Copyright (C) Volker Lendecke           2004-2005
+   Copyright (C) Jeremy Allison                   2006
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
+struct dc_name_ip {
+       fstring name;
+       struct in_addr ip;
+};
+
+extern struct winbindd_methods reconnect_methods;
+extern BOOL override_logfile;
+
+static NTSTATUS init_dc_connection_network(struct winbindd_domain *domain);
 static void set_dc_type_and_flags( struct winbindd_domain *domain );
+static BOOL get_dcs(TALLOC_CTX *mem_ctx, const struct winbindd_domain *domain,
+                   struct dc_name_ip **dcs, int *num_dcs);
+
+/****************************************************************
+ Child failed to find DC's. Reschedule check.
+****************************************************************/
+
+static void msg_failed_to_go_online(int msg_type, struct process_id src, void *buf, size_t len)
+{
+       struct winbindd_domain *domain;
+       const char *domainname = (const char *)buf;
+
+       if (buf == NULL || len == 0) {
+               return;
+       }
+
+       DEBUG(5,("msg_fail_to_go_online: received for domain %s.\n", domainname));
+
+       for (domain = domain_list(); domain; domain = domain->next) {
+               if (domain->internal) {
+                       continue;
+               }
+
+               if (strequal(domain->name, domainname)) {
+                       if (domain->online) {
+                               /* We're already online, ignore. */
+                               DEBUG(5,("msg_fail_to_go_online: domain %s "
+                                       "already online.\n", domainname));
+                               continue;
+                       }
+
+                       /* Reschedule the online check. */
+                       set_domain_offline(domain);
+                       break;
+               }
+       }
+}
+
+/****************************************************************
+ Actually cause a reconnect from a message.
+****************************************************************/
+
+static void msg_try_to_go_online(int msg_type, struct process_id src, void *buf, size_t len)
+{
+       struct winbindd_domain *domain;
+       const char *domainname = (const char *)buf;
+
+       if (buf == NULL || len == 0) {
+               return;
+       }
+
+       DEBUG(5,("msg_try_to_go_online: received for domain %s.\n", domainname));
+
+       for (domain = domain_list(); domain; domain = domain->next) {
+               if (domain->internal) {
+                       continue;
+               }
+
+               if (strequal(domain->name, domainname)) {
+
+                       if (domain->online) {
+                               /* We're already online, ignore. */
+                               DEBUG(5,("msg_try_to_go_online: domain %s "
+                                       "already online.\n", domainname));
+                               continue;
+                       }
+
+                       /* This call takes care of setting the online
+                          flag to true if we connected, or re-adding
+                          the offline handler if false. Bypasses online
+                          check so always does network calls. */
+
+                       init_dc_connection_network(domain);
+                       break;
+               }
+       }
+}
+
+/****************************************************************
+ Fork a child to try and contact a DC. Do this as contacting a
+ DC requires blocking lookups and we don't want to block our
+ parent.
+****************************************************************/
+
+static BOOL fork_child_dc_connect(struct winbindd_domain *domain)
+{
+       struct dc_name_ip *dcs = NULL;
+       int num_dcs = 0;
+       TALLOC_CTX *mem_ctx = NULL;
+       pid_t child_pid;
+       pid_t parent_pid = sys_getpid();
+
+       /* Stop zombies */
+       CatchChild();
+
+       message_block();
+
+       child_pid = sys_fork();
+
+       if (child_pid == -1) {
+               DEBUG(0, ("fork_child_dc_connect: Could not fork: %s\n", strerror(errno)));
+               message_unblock();
+               return False;
+       }
+
+       if (child_pid != 0) {
+               /* Parent */
+               message_register(MSG_WINBIND_TRY_TO_GO_ONLINE,msg_try_to_go_online);
+               message_register(MSG_WINBIND_FAILED_TO_GO_ONLINE,msg_failed_to_go_online);
+               message_unblock();
+               return True;
+       }
+
+       /* Child. */
+
+       /* Leave messages blocked - we will never process one. */
+
+       /* tdb needs special fork handling */
+       if (tdb_reopen_all(1) == -1) {
+               DEBUG(0,("tdb_reopen_all failed.\n"));
+               _exit(0);
+       }
+
+       close_conns_after_fork();
+
+       if (!override_logfile) {
+               reopen_logs();
+       }
+
+       mem_ctx = talloc_init("fork_child_dc_connect");
+       if (!mem_ctx) {
+               DEBUG(0,("talloc_init failed.\n"));
+               _exit(0);
+       }
+
+       if ((!get_dcs(mem_ctx, domain, &dcs, &num_dcs)) || (num_dcs == 0)) {
+               /* Still offline ? Can't find DC's. */
+               message_send_pid(pid_to_procid(parent_pid), MSG_WINBIND_FAILED_TO_GO_ONLINE,
+                               domain->name,
+                               strlen(domain->name)+1, False);
+               _exit(0);
+       }
+
+       /* We got a DC. Send a message to our parent to get it to
+          try and do the same. */
+
+       message_send_pid(pid_to_procid(parent_pid), MSG_WINBIND_TRY_TO_GO_ONLINE,
+                               domain->name,
+                               strlen(domain->name)+1, False);
+       _exit(0);
+}
 
 /****************************************************************
  Handler triggered if we're offline to try and detect a DC.
 ****************************************************************/
 
-static void check_domain_online_handler(struct timed_event *te,
+static void check_domain_online_handler(struct event_context *ctx,
+                                       struct timed_event *te,
                                        const struct timeval *now,
                                        void *private_data)
 {
@@ -102,10 +264,26 @@ static void check_domain_online_handler(struct timed_event *te,
                return;
        }
 
-       /* This call takes care of setting the online
-          flag to true if we connected, or re-adding
-          the offline handler if false. */
-       init_dc_connection(domain);
+       /* Fork a child to test if it can contact a DC. 
+          If it can then send ourselves a message to
+          cause a reconnect. */
+
+       fork_child_dc_connect(domain);
+}
+
+/****************************************************************
+ If we're still offline setup the timeout check.
+****************************************************************/
+
+static void calc_new_online_timeout_check(struct winbindd_domain *domain)
+{
+       int wbc = lp_winbind_cache_time();
+
+       if (domain->startup) {
+               domain->check_online_timeout = 10;
+       } else if (domain->check_online_timeout < wbc) {
+               domain->check_online_timeout = wbc;
+       }
 }
 
 /****************************************************************
@@ -130,6 +308,11 @@ void set_domain_offline(struct winbindd_domain *domain)
 
        domain->online = False;
 
+       /* Offline domains are always initialized. They're
+          re-initialized when they go back online. */
+
+       domain->initialized = True;
+
        /* We only add the timeout handler that checks and
           allows us to go back online when we've not
           been told to remain offline. */
@@ -143,10 +326,10 @@ void set_domain_offline(struct winbindd_domain *domain)
        /* If we're in statup mode, check again in 10 seconds, not in
           lp_winbind_cache_time() seconds (which is 5 mins by default). */
 
-       domain->check_online_event = add_timed_event( NULL,
-                                               domain->startup ?
-                                                       timeval_current_ofs(10,0) : 
-                                                       timeval_current_ofs(lp_winbind_cache_time(), 0),
+       calc_new_online_timeout_check(domain);
+
+       domain->check_online_event = event_add_timed(winbind_event_context(), NULL,
+                                               timeval_current_ofs(domain->check_online_timeout,0),
                                                "check_domain_online_handler",
                                                check_domain_online_handler,
                                                domain);
@@ -166,7 +349,6 @@ void set_domain_offline(struct winbindd_domain *domain)
 
 static void set_domain_online(struct winbindd_domain *domain)
 {
-       extern struct winbindd_methods reconnect_methods;
        struct timeval now;
 
        DEBUG(10,("set_domain_online: called for domain %s\n",
@@ -186,7 +368,8 @@ static void set_domain_online(struct winbindd_domain *domain)
 
        /* If we are waiting to get a krb5 ticket, trigger immediately. */
        GetTimeOfDay(&now);
-       set_event_dispatch_time("krb5_ticket_gain_handler", now);
+       set_event_dispatch_time(winbind_event_context(),
+                               "krb5_ticket_gain_handler", now);
 
        /* Ok, we're out of any startup mode now... */
        domain->startup = False;
@@ -207,6 +390,16 @@ static void set_domain_online(struct winbindd_domain *domain)
                }
        }
 
+       /* Ensure we have no online timeout checks. */
+       domain->check_online_timeout = 0;
+       if (domain->check_online_event) {
+               TALLOC_FREE(domain->check_online_event);
+       }
+
+       /* Ensure we ignore any pending child messages. */
+       message_deregister(MSG_WINBIND_TRY_TO_GO_ONLINE);
+       message_deregister(MSG_WINBIND_FAILED_TO_GO_ONLINE);
+
        domain->online = True;
 }
 
@@ -216,6 +409,8 @@ static void set_domain_online(struct winbindd_domain *domain)
 
 void set_domain_online_request(struct winbindd_domain *domain)
 {
+       struct timeval tev;
+
        DEBUG(10,("set_domain_online_request: called for domain %s\n",
                domain->name ));
 
@@ -231,19 +426,35 @@ void set_domain_online_request(struct winbindd_domain *domain)
           Wait at least 5 seconds. Heuristics suck... */
 
        if (!domain->check_online_event) {
-               DEBUG(5,("set_domain_online_request: no check_domain_online_handler "
-                       "registered. Were we online (%d) ?\n", (int)domain->online ));
-       } else {
-               struct timeval tev;
+               /* If we've come from being globally offline we
+                  don't have a check online event handler set.
+                  We need to add one now we're trying to go
+                  back online. */
 
-               GetTimeOfDay(&tev);
+               DEBUG(10,("set_domain_online_request: domain %s was globally offline.\n",
+                       domain->name ));
+
+       }
+
+       TALLOC_FREE(domain->check_online_event);
+
+       GetTimeOfDay(&tev);
 
-               /* Go into "startup" mode again. */
-               domain->startup_time = tev.tv_sec;
-               domain->startup = True;
+       /* Go into "startup" mode again. */
+       domain->startup_time = tev.tv_sec;
+       domain->startup = True;
 
-               tev.tv_sec += 5;
-               set_event_dispatch_time("check_domain_online_handler", tev);
+       tev.tv_sec += 5;
+
+       domain->check_online_event = event_add_timed(
+               winbind_event_context(), NULL, tev,
+               "check_domain_online_handler",
+               check_domain_online_handler,
+               domain);
+
+       /* The above *has* to succeed for winbindd to work. */
+       if (!domain->check_online_event) {
+               smb_panic("set_domain_online_request: failed to add online handler.\n");
        }
 }
 
@@ -329,6 +540,7 @@ static BOOL get_dc_name_via_netlogon(const struct winbindd_domain *domain,
 
        result = cm_connect_netlogon(our_domain, &netlogon_pipe);
        if (!NT_STATUS_IS_OK(result)) {
+               talloc_destroy(mem_ctx);
                return False;
        }
 
@@ -625,11 +837,6 @@ static NTSTATUS cm_prepare_connection(const struct winbindd_domain *domain,
        return result;
 }
 
-struct dc_name_ip {
-       fstring name;
-       struct in_addr ip;
-};
-
 static BOOL add_one_dc_unique(TALLOC_CTX *mem_ctx, const char *domain_name,
                              const char *dcname, struct in_addr ip,
                              struct dc_name_ip **dcs, int *num)
@@ -656,8 +863,10 @@ static BOOL add_sockaddr_to_array(TALLOC_CTX *mem_ctx,
 {
        *addrs = TALLOC_REALLOC_ARRAY(mem_ctx, *addrs, struct sockaddr_in, (*num)+1);
 
-       if (*addrs == NULL)
+       if (*addrs == NULL) {
+               *num = 0;
                return False;
+       }
 
        (*addrs)[*num].sin_family = PF_INET;
        putip((char *)&((*addrs)[*num].sin_addr), (char *)&ip);
@@ -797,8 +1006,7 @@ static BOOL receive_getdc_response(struct in_addr dc_ip,
  convert an ip to a name
 *******************************************************************/
 
-static BOOL dcip_to_name( const char *domainname, const char *realm, 
-                          const DOM_SID *sid, struct in_addr ip, fstring name )
+static BOOL dcip_to_name(const struct winbindd_domain *domain, struct in_addr ip, fstring name )
 {
        struct ip_service ip_list;
 
@@ -812,7 +1020,7 @@ static BOOL dcip_to_name( const char *domainname, const char *realm,
        if (lp_security() == SEC_ADS) {
                ADS_STRUCT *ads;
 
-               ads = ads_init(realm, domainname, NULL);
+               ads = ads_init(domain->alt_name, domain->name, NULL);
                ads->auth.flags |= ADS_AUTH_NO_BIND;
 
                if (ads_try_connect( ads, inet_ntoa(ip) ) )  {
@@ -822,18 +1030,22 @@ static BOOL dcip_to_name( const char *domainname, const char *realm,
 
                        DEBUG(10,("dcip_to_name: flags = 0x%x\n", (unsigned int)ads->config.flags));
 
-                       if ((ads->config.flags & ADS_KDC) && ads_closest_dc(ads)) {
+                       if (domain->primary && (ads->config.flags & ADS_KDC) && ads_closest_dc(ads)) {
+                               char *sitename = sitename_fetch();
+
                                /* We're going to use this KDC for this realm/domain.
                                   If we are using sites, then force the krb5 libs
                                   to use this KDC. */
 
-                               create_local_private_krb5_conf_for_domain(realm,
-                                                               domainname,
+                               create_local_private_krb5_conf_for_domain(domain->alt_name,
+                                                               domain->name,
+                                                               sitename,
                                                                ip);
 
+                               SAFE_FREE(sitename);
                                /* Ensure we contact this DC also. */
-                               saf_store( domainname, name);
-                               saf_store( realm, name);
+                               saf_store( domain->name, name);
+                               saf_store( domain->alt_name, name);
                        }
 
                        ads_destroy( &ads );
@@ -846,11 +1058,11 @@ static BOOL dcip_to_name( const char *domainname, const char *realm,
 
        /* try GETDC requests next */
        
-       if (send_getdc_request(ip, domainname, sid)) {
+       if (send_getdc_request(ip, domain->name, &domain->sid)) {
                int i;
                smb_msleep(100);
                for (i=0; i<5; i++) {
-                       if (receive_getdc_response(ip, domainname, name)) {
+                       if (receive_getdc_response(ip, domain->name, name)) {
                                namecache_store(name, 0x20, 1, &ip_list);
                                return True;
                        }
@@ -860,7 +1072,7 @@ static BOOL dcip_to_name( const char *domainname, const char *realm,
 
        /* try node status request */
 
-       if ( name_status_find(domainname, 0x1c, 0x20, ip, name) ) {
+       if ( name_status_find(domain->name, 0x1c, 0x20, ip, name) ) {
                namecache_store(name, 0x20, 1, &ip_list);
                return True;
        }
@@ -895,6 +1107,8 @@ static BOOL get_dcs(TALLOC_CTX *mem_ctx, const struct winbindd_domain *domain,
        }
 
        if (sec == SEC_ADS) {
+               char *sitename = NULL;
+
                /* We need to make sure we know the local site before
                   doing any DNS queries, as this will restrict the
                   get_sorted_dc_list() call below to only fetching
@@ -903,16 +1117,37 @@ static BOOL get_dcs(TALLOC_CTX *mem_ctx, const struct winbindd_domain *domain,
                /* Find any DC to get the site record.
                   We deliberately don't care about the
                   return here. */
+
                get_dc_name(domain->name, lp_realm(), dcname, &ip);
 
-               /* Now do the site-specific AD dns lookup. */
-               get_sorted_dc_list(domain->alt_name, &ip_list, &iplist_size, True);
+               sitename = sitename_fetch();
+
+               /* Do the site-specific AD dns lookup first. */
+               get_sorted_dc_list(domain->alt_name, sitename, &ip_list, &iplist_size, True);
+
+               for ( i=0; i<iplist_size; i++ ) {
+                       add_one_dc_unique(mem_ctx, domain->name, inet_ntoa(ip_list[i].ip),
+                                               ip_list[i].ip, dcs, num_dcs);
+               }
+
+               SAFE_FREE(ip_list);
+               SAFE_FREE(sitename);
+               iplist_size = 0;
+
+               /* Now we add DCs from the main AD dns lookup. */
+               get_sorted_dc_list(domain->alt_name, NULL, &ip_list, &iplist_size, True);
+
+               for ( i=0; i<iplist_size; i++ ) {
+                       add_one_dc_unique(mem_ctx, domain->name, inet_ntoa(ip_list[i].ip),
+                                               ip_list[i].ip, dcs, num_dcs);
+               }
         }
 
        /* try standard netbios queries if no ADS */
 
-       if (iplist_size==0) 
-               get_sorted_dc_list(domain->name, &ip_list, &iplist_size, False);
+       if (iplist_size==0) {
+               get_sorted_dc_list(domain->name, NULL, &ip_list, &iplist_size, False);
+       }
 
        /* FIXME!! this is where we should re-insert the GETDC requests --jerry */
 
@@ -951,15 +1186,23 @@ static BOOL find_new_dc(TALLOC_CTX *mem_ctx,
 
        for (i=0; i<num_dcs; i++) {
 
-               add_string_to_array(mem_ctx, dcs[i].name,
-                                   &dcnames, &num_dcnames);
-               add_sockaddr_to_array(mem_ctx, dcs[i].ip, 445,
-                                     &addrs, &num_addrs);
+               if (!add_string_to_array(mem_ctx, dcs[i].name,
+                                   &dcnames, &num_dcnames)) {
+                       return False;
+               }
+               if (!add_sockaddr_to_array(mem_ctx, dcs[i].ip, 445,
+                                     &addrs, &num_addrs)) {
+                       return False;
+               }
 
-               add_string_to_array(mem_ctx, dcs[i].name,
-                                   &dcnames, &num_dcnames);
-               add_sockaddr_to_array(mem_ctx, dcs[i].ip, 139,
-                                     &addrs, &num_addrs);
+               if (!add_string_to_array(mem_ctx, dcs[i].name,
+                                   &dcnames, &num_dcnames)) {
+                       return False;
+               }
+               if (!add_sockaddr_to_array(mem_ctx, dcs[i].ip, 139,
+                                     &addrs, &num_addrs)) {
+                       return False;
+               }
        }
 
        if ((num_dcnames == 0) || (num_dcnames != num_addrs))
@@ -990,8 +1233,7 @@ static BOOL find_new_dc(TALLOC_CTX *mem_ctx,
        }
 
        /* Try to figure out the name */
-       if (dcip_to_name( domain->name, domain->alt_name, &domain->sid,
-                         addr->sin_addr, dcname )) {
+       if (dcip_to_name( domain, addr->sin_addr, dcname )) {
                return True;
        }
 
@@ -1033,8 +1275,7 @@ static NTSTATUS cm_open_connection(struct winbindd_domain *domain,
                        struct in_addr ip;
 
                        ip = *interpret_addr2( saf_servername );
-                       if (dcip_to_name( domain->name, domain->alt_name,
-                                         &domain->sid, ip, saf_name )) {
+                       if (dcip_to_name( domain, ip, saf_name )) {
                                fstrcpy( domain->dcname, saf_name );
                        } else {
                                winbind_add_failed_connection_entry(
@@ -1066,8 +1307,16 @@ static NTSTATUS cm_open_connection(struct winbindd_domain *domain,
                        int num_addrs = 0;
                        int dummy = 0;
 
-                       add_sockaddr_to_array(mem_ctx, domain->dcaddr.sin_addr, 445, &addrs, &num_addrs);
-                       add_sockaddr_to_array(mem_ctx, domain->dcaddr.sin_addr, 139, &addrs, &num_addrs);
+                       if (!add_sockaddr_to_array(mem_ctx, domain->dcaddr.sin_addr, 445, &addrs, &num_addrs)) {
+                               set_domain_offline(domain);
+                               talloc_destroy(mem_ctx);
+                               return NT_STATUS_NO_MEMORY;
+                       }
+                       if (!add_sockaddr_to_array(mem_ctx, domain->dcaddr.sin_addr, 139, &addrs, &num_addrs)) {
+                               set_domain_offline(domain);
+                               talloc_destroy(mem_ctx);
+                               return NT_STATUS_NO_MEMORY;
+                       }
 
                        /* 5 second timeout. */
                        if (!open_any_socket_out(addrs, num_addrs, 5000, &dummy, &fd)) {
@@ -1203,9 +1452,10 @@ static BOOL connection_ok(struct winbindd_domain *domain)
        return True;
 }
 
-/* Initialize a new connection up to the RPC BIND. */
+/* Initialize a new connection up to the RPC BIND.
+   Bypass online status check so always does network calls. */
 
-NTSTATUS init_dc_connection(struct winbindd_domain *domain)
+static NTSTATUS init_dc_connection_network(struct winbindd_domain *domain)
 {
        NTSTATUS result;
 
@@ -1233,6 +1483,16 @@ NTSTATUS init_dc_connection(struct winbindd_domain *domain)
        return result;
 }
 
+NTSTATUS init_dc_connection(struct winbindd_domain *domain)
+{
+       if (domain->initialized && !domain->online) {
+               /* We check for online status elsewhere. */
+               return NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
+       }
+
+       return init_dc_connection_network(domain);
+}
+
 /******************************************************************************
  We can 'sense' certain things about the DC by it's replies to certain
  questions.
@@ -1251,7 +1511,8 @@ static void set_dc_type_and_flags( struct winbindd_domain *domain )
 
        char *domain_name = NULL;
        char *dns_name = NULL;
-       DOM_SID *dom_sid = NULL;
+       char *forest_name = NULL;       
+       DOM_SID *dom_sid = NULL;        
 
        ZERO_STRUCT( ctr );
        
@@ -1316,7 +1577,7 @@ static void set_dc_type_and_flags( struct winbindd_domain *domain )
                   to determine that the DC is active directory */
                result = rpccli_lsa_query_info_policy2(cli, mem_ctx, &pol,
                                                       12, &domain_name,
-                                                      &dns_name, NULL,
+                                                      &dns_name, &forest_name,
                                                       NULL, &dom_sid);
        }
 
@@ -1329,6 +1590,9 @@ static void set_dc_type_and_flags( struct winbindd_domain *domain )
                if (dns_name)
                        fstrcpy(domain->alt_name, dns_name);
 
+               if ( forest_name )
+                       fstrcpy(domain->forest_name, forest_name);              
+
                if (dom_sid) 
                        sid_copy(&domain->sid, dom_sid);
        } else {
@@ -1355,10 +1619,10 @@ static void set_dc_type_and_flags( struct winbindd_domain *domain )
        }
 done:
 
-       DEBUG(5, ("set_dc_type_and_flags: domain %s is %snative mode.\n",
+       DEBUG(5, ("set_dc_type_and_flags: domain %s is %sin native mode.\n",
                  domain->name, domain->native_mode ? "" : "NOT "));
 
-       DEBUG(5,("set_dc_type_and_flags: domain %s is %sactive directory.\n",
+       DEBUG(5,("set_dc_type_and_flags: domain %s is %srunning active directory.\n",
                  domain->name, domain->active_directory ? "" : "NOT "));
 
        cli_rpc_pipe_close(cli);
@@ -1394,7 +1658,7 @@ NTSTATUS cm_connect_sam(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx,
                        struct rpc_pipe_client **cli, POLICY_HND *sam_handle)
 {
        struct winbindd_cm_conn *conn;
-       NTSTATUS result;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        fstring conn_pwd;
        struct dcinfo *p_dcinfo;
 
@@ -1464,8 +1728,9 @@ NTSTATUS cm_connect_sam(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx,
        /* Fall back to schannel if it's a W2K pre-SP1 box. */
 
        if (!cm_get_schannel_dcinfo(domain, &p_dcinfo)) {
+               /* If this call fails - conn->cli can now be NULL ! */
                DEBUG(10, ("cm_connect_sam: Could not get schannel auth info "
-                          "for domain %s, trying anon\n", conn->cli->domain));
+                          "for domain %s, trying anon\n", domain->name));
                goto anonymous;
        }
        conn->samr_pipe = cli_rpc_pipe_open_schannel_with_key
@@ -1537,7 +1802,7 @@ NTSTATUS cm_connect_lsa(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx,
                        struct rpc_pipe_client **cli, POLICY_HND *lsa_policy)
 {
        struct winbindd_cm_conn *conn;
-       NTSTATUS result;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        fstring conn_pwd;
        struct dcinfo *p_dcinfo;
 
@@ -1596,8 +1861,9 @@ NTSTATUS cm_connect_lsa(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx,
        /* Fall back to schannel if it's a W2K pre-SP1 box. */
 
        if (!cm_get_schannel_dcinfo(domain, &p_dcinfo)) {
+               /* If this call fails - conn->cli can now be NULL ! */
                DEBUG(10, ("cm_connect_lsa: Could not get schannel auth info "
-                          "for domain %s, trying anon\n", conn->cli->domain));
+                          "for domain %s, trying anon\n", domain->name));
                goto anonymous;
        }
        conn->lsa_pipe = cli_rpc_pipe_open_schannel_with_key
@@ -1640,7 +1906,7 @@ NTSTATUS cm_connect_lsa(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx,
  done:
        if (!NT_STATUS_IS_OK(result)) {
                invalidate_cm_connection(conn);
-               return NT_STATUS_UNSUCCESSFUL;
+               return result;
        }
 
        *cli = conn->lsa_pipe;