Merge branch 'master' of ssh://git.samba.org/data/git/samba

1 files changed, 79 insertions, 8 deletions

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index e6eed8289e..05679570d4 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -34,6 +34,8 @@ bool global_in_nmbd = False;
 ****************************************************************************/
 #define SAFKEY_FMT	"SAF/DOMAIN/%s"
 #define SAF_TTL		900
+#define SAFJOINKEY_FMT	"SAFJOIN/DOMAIN/%s"
+#define SAFJOIN_TTL	3600
 
 static char *saf_key(const char *domain)
 {
@@ -44,6 +46,15 @@ static char *saf_key(const char *domain)
 	return keystr;
 }
 
+static char *saf_join_key(const char *domain)
+{
+	char *keystr;
+
+	asprintf_strupper_m(&keystr, SAFJOINKEY_FMT, domain);
+
+	return keystr;
+}
+
 /****************************************************************************
 ****************************************************************************/
 
@@ -69,7 +80,7 @@ bool saf_store( const char *domain, const char *servername )
 		return False;
 
 	key = saf_key( domain );
-	expire = time( NULL ) + SAF_TTL;
+	expire = time( NULL ) + lp_parm_int(-1, "saf","ttl", SAF_TTL);
 
 	DEBUG(10,("saf_store: domain = [%s], server = [%s], expire = [%u]\n",
 		domain, servername, (unsigned int)expire ));
@@ -81,6 +92,38 @@ bool saf_store( const char *domain, const char *servername )
 	return ret;
 }
 
+bool saf_join_store( const char *domain, const char *servername )
+{
+	char *key;
+	time_t expire;
+	bool ret = False;
+
+	if ( !domain || !servername ) {
+		DEBUG(2,("saf_join_store: Refusing to store empty domain or servername!\n"));
+		return False;
+	}
+
+	if ( (strlen(domain) == 0) || (strlen(servername) == 0) ) {
+		DEBUG(0,("saf_join_store: refusing to store 0 length domain or servername!\n"));
+		return False;
+	}
+
+	if ( !gencache_init() )
+		return False;
+
+	key = saf_join_key( domain );
+	expire = time( NULL ) + lp_parm_int(-1, "saf","join ttl", SAFJOIN_TTL);
+
+	DEBUG(10,("saf_join_store: domain = [%s], server = [%s], expire = [%u]\n",
+		domain, servername, (unsigned int)expire ));
+
+	ret = gencache_set( key, servername, expire );
+
+	SAFE_FREE( key );
+
+	return ret;
+}
+
 bool saf_delete( const char *domain )
 {
 	char *key;
@@ -94,15 +137,22 @@ bool saf_delete( const char *domain )
 	if ( !gencache_init() )
 		return False;
 
+	key = saf_join_key(domain);
+	ret = gencache_del(key);
+	SAFE_FREE(key);
+
+	if (ret) {
+		DEBUG(10,("saf_delete[join]: domain = [%s]\n", domain ));
+	}
+
 	key = saf_key(domain);
 	ret = gencache_del(key);
+	SAFE_FREE(key);
 
 	if (ret) {
 		DEBUG(10,("saf_delete: domain = [%s]\n", domain ));
 	}
 
-	SAFE_FREE( key );
-
 	return ret;
 }
 
@@ -124,6 +174,18 @@ char *saf_fetch( const char *domain )
 	if ( !gencache_init() )
 		return False;
 
+	key = saf_join_key( domain );
+
+	ret = gencache_get( key, &server, &timeout );
+
+	SAFE_FREE( key );
+
+	if ( ret ) {
+		DEBUG(5,("saf_fetch[join]: Returning \"%s\" for \"%s\" domain\n",
+			server, domain ));
+		return server;
+	}
+
 	key = saf_key( domain );
 
 	ret = gencache_get( key, &server, &timeout );
@@ -331,7 +393,7 @@ bool name_status_find(const char *q_name,
 
 	if (!interpret_string_addr(&ss, lp_socket_address(),
 				AI_NUMERICHOST|AI_PASSIVE)) {
-		zero_addr(&ss);
+		zero_sockaddr(&ss);
 	}
 
 	sock = open_socket_in(SOCK_DGRAM, 0, 3, &ss, True);
@@ -526,9 +588,9 @@ static int remove_duplicate_addrs2(struct ip_service *iplist, int count )
 		}
 
 		for ( j=i+1; j<count; j++ ) {
-			if (addr_equal((struct sockaddr *)&iplist[i].ss, (struct sockaddr *)&iplist[j].ss) &&
+			if (sockaddr_equal((struct sockaddr *)&iplist[i].ss, (struct sockaddr *)&iplist[j].ss) &&
 					iplist[i].port == iplist[j].port) {
-				zero_addr(&iplist[j].ss);
+				zero_sockaddr(&iplist[j].ss);
 			}
 		}
 	}
@@ -954,7 +1016,7 @@ NTSTATUS name_resolve_bcast(const char *name,
 
 	if (!interpret_string_addr(&ss, lp_socket_address(),
 				AI_NUMERICHOST|AI_PASSIVE)) {
-		zero_addr(&ss);
+		zero_sockaddr(&ss);
 	}
 
 	sock = open_socket_in( SOCK_DGRAM, 0, 3, &ss, true );
@@ -1042,7 +1104,7 @@ NTSTATUS resolve_wins(const char *name,
 	/* the address we will be sending from */
 	if (!interpret_string_addr(&src_ss, lp_socket_address(),
 				AI_NUMERICHOST|AI_PASSIVE)) {
-		zero_addr(&src_ss);
+		zero_sockaddr(&src_ss);
 	}
 
 	if (src_ss.ss_family != AF_INET) {
@@ -2098,6 +2160,15 @@ NTSTATUS get_sorted_dc_list( const char *domain,
 
 	status = get_dc_list(domain, sitename, ip_list,
 			count, lookup_type, &ordered);
+	if (NT_STATUS_EQUAL(status, NT_STATUS_NO_LOGON_SERVERS)
+	    && sitename) {
+		DEBUG(3,("get_sorted_dc_list: no server for name %s available"
+			 " in site %s, fallback to all servers\n",
+			 domain, sitename));
+		status = get_dc_list(domain, NULL, ip_list,
+				     count, lookup_type, &ordered);
+	}
+
 	if (!NT_STATUS_IS_OK(status)) {
 		SAFE_FREE(*ip_list);
 		*count = 0;