Changeset 745 for trunk/server/source3/libsmb/libsmb_cache.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/libsmb_cache.c (modified) (20 diffs)

trunk/server/source3/libsmb/libsmb_cache.c

@@ -6 +6 @@
    Copyright (C) John Terpstra 2000
    Copyright (C) Tom Jansen (Ninja ISD) 2002 
-   
+
    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/>.
@@ -22 +22 @@
 
 #include "includes.h"
+#include "libsmb/libsmb.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
@@ -35 +36 @@
         char *username;
         SMBCSRV *server;
-        
+
         struct smbc_server_cache *next, *prev;
 };
@@ -54 +55 @@
 {
         struct smbc_server_cache * srvcache = NULL;
-        
+
         if (!(srvcache = SMB_MALLOC_P(struct smbc_server_cache))) {
                 errno = ENOMEM;
@@ -60 +61 @@
                 return 1;
         }
-        
+
         ZERO_STRUCTP(srvcache);
-        
+
         srvcache->server = newsrv;
-        
+
         srvcache->server_name = SMB_STRDUP(server);
         if (!srvcache->server_name) {
@@ -70 +71 @@
                 goto failed;
         }
-        
+
         srvcache->share_name = SMB_STRDUP(share);
         if (!srvcache->share_name) {
@@ -76 +77 @@
                 goto failed;
         }
-        
+
         srvcache->workgroup = SMB_STRDUP(workgroup);
         if (!srvcache->workgroup) {
@@ -82 +83 @@
                 goto failed;
         }
-        
+
         srvcache->username = SMB_STRDUP(username);
         if (!srvcache->username) {
@@ -88 +89 @@
                 goto failed;
         }
-        
+
         DLIST_ADD(context->internal->server_cache, srvcache);
         return 0;
-        
+
 failed:
         SAFE_FREE(srvcache->server_name);
@@ -98 +99 @@
         SAFE_FREE(srvcache->username);
         SAFE_FREE(srvcache);
-        
+
         return 1;
 }
@@ -117 +118 @@
 {
         struct smbc_server_cache * srv = NULL;
-        
+
         /* Search the cache lines */
         for (srv = context->internal->server_cache; srv; srv = srv->next) {
-                
+
                 if (strcmp(server,srv->server_name)  == 0 &&
                     strcmp(workgroup,srv->workgroup) == 0 &&
                     strcmp(user, srv->username)  == 0) {
-                        
+
                         /* If the share name matches, we're cool */
                         if (strcmp(share, srv->share_name) == 0) {
                                 return srv->server;
                         }
-                        
+
                         /*
                          * We only return an empty share name or the attribute
@@ -137 +138 @@
                         if (*share == '\0' || strcmp(share, "*IPC$") == 0)
                                 continue;
-                        
+
                         /*
                          * Never return an empty share name or the attribute
@@ -145 +146 @@
                             strcmp(srv->share_name, "*IPC$") == 0)
                                 continue;
-                        
+
                         /*
                          * If we're only allowing one share per server, then
@@ -152 +153 @@
                          */
                         if (smbc_getOptionOneSharePerServer(context)) {
+                                NTSTATUS status;
                                 /*
                                  * The currently connected share name
@@ -157 +159 @@
                                  * disconnect from the current share.
                                  */
-                                if (! cli_tdis(srv->server->cli)) {
+                                status = cli_tdis(srv->server->cli);
+                                if (!NT_STATUS_IS_OK(status)) {
                                         /* Sigh. Couldn't disconnect. */
                                         cli_shutdown(srv->server->cli);
@@ -164 +167 @@
                                         continue;
                                 }
-                                
+
                                 /*
                                  * Save the new share name.  We've
@@ -179 +182 @@
                                         continue;
                                 }
-                                
-                                
+
                                 return srv->server;
                         }
                 }
         }
-        
+
         return NULL;
 }
@@ -200 +202 @@
 {
         struct smbc_server_cache * srv = NULL;
-        
+
         for (srv = context->internal->server_cache; srv; srv = srv->next) {
                 if (server == srv->server) { 
-                        
+
                         /* remove this sucker */
                         DLIST_REMOVE(context->internal->server_cache, srv);
@@ -229 +231 @@
         struct smbc_server_cache * next;
         int could_not_purge_all = 0;
-        
+
         for (srv = context->internal->server_cache,
                      next = (srv ? srv->next :NULL);
@@ -235 +237 @@
              srv = next,
                      next = (srv ? srv->next : NULL)) {
-                
+
                 if (SMBC_remove_unused_server(context, srv->server)) {
                         /* could not be removed */