Changeset 165 for branches/samba-3.0/source/libsmb/namequery.c

Timestamp:

Mar 11, 2009, 9:14:55 AM (16 years ago)

Author:

Paul Smedley

Message:

Add 'missing' 3.0.34 diffs

File:

• branches/samba-3.0/source/libsmb/namequery.c (modified) (7 diffs)

branches/samba-3.0/source/libsmb/namequery.c

@@ -35 +35 @@
 #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)
@@ -41 +43 @@
         
         asprintf( &keystr, SAFKEY_FMT, strupper_static(domain) );
+
+        return keystr;
+}
+
+static char *saf_join_key(const char *domain)
+{
+        char *keystr;
+
+        asprintf( &keystr, SAFJOINKEY_FMT, strupper_static(domain) );
 
         return keystr;
@@ -68 +79 @@
         
         key = saf_key( domain );
-        expire = time( NULL ) + SAF_TTL;
+        expire = time( NULL ) + lp_parm_int(-1, "saf","ttl", SAF_TTL);
         
         
@@ -81 +92 @@
 }
 
+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 )
 {
@@ -94 +137 @@
                 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;
@@ -123 +173 @@
         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 );
         
@@ -1649 +1711 @@
 
         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)) {
                 return status;