Changeset 745 for trunk/server/source3/libsmb/namequery_dc.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/libsmb/namequery_dc.c (modified) (5 diffs)

trunk/server/source3/libsmb/namequery_dc.c

@@ -7 +7 @@
    Copyright (C) Andrew Bartlett 2002
    Copyright (C) Gerald Carter 2003
-   
+
    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
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -24 +24 @@
 
 #include "includes.h"
+#include "libads/sitename_cache.h"
+#include "ads.h"
+#include "../librpc/gen_ndr/nbt.h"
 
 /**********************************************************************
@@ -46 +49 @@
  Find the name and IP address for a server in the realm/domain
  *************************************************************************/
- 
+
 static bool ads_dc_name(const char *domain,
                         const char *realm,
@@ -99 +102 @@
                 }
 
-#ifdef HAVE_KRB5
+#ifdef HAVE_ADS
                 if (is_our_primary_domain(domain) && (ads->config.flags & NBT_SERVER_KDC)) {
                         if (ads_closest_dc(ads)) {
@@ -174 +177 @@
 
         for (i = 0; i < count; i++) {
-                if (is_zero_addr((struct sockaddr *)&ip_list[i].ss))
+                if (is_zero_addr(&ip_list[i].ss))
                         continue;