Changeset 594 for vendor/current/source3/rpc_server

Timestamp:

Jul 1, 2011, 4:02:23 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.8

Location:

vendor/current/source3/rpc_server

Files:

• srv_dfs_nt.c (modified) (3 diffs)
• srv_spoolss_nt.c (modified) (4 diffs)

vendor/current/source3/rpc_server/srv_dfs_nt.c

@@ -71 +71 @@
 
         /* The following call can change the cwd. */
-        status = get_referred_path(ctx, r->in.path, jn,
+        status = get_referred_path(ctx, p->server_info, r->in.path, jn,
                         &consumedcnt, &self_ref);
         if(!NT_STATUS_IS_OK(status)) {
@@ -137 +137 @@
         }
 
-        if(!NT_STATUS_IS_OK(get_referred_path(ctx, r->in.dfs_entry_path, jn,
-                                &consumedcnt, &self_ref))) {
+        if(!NT_STATUS_IS_OK(get_referred_path(ctx, p->server_info,
+                                              r->in.dfs_entry_path, jn,
+                                              &consumedcnt, &self_ref))) {
                 return WERR_DFS_NO_SUCH_VOL;
         }
@@ -359 +360 @@
 
         /* The following call can change the cwd. */
-        if(!NT_STATUS_IS_OK(get_referred_path(ctx, r->in.dfs_entry_path,
-                                        jn, &consumedcnt, &self_ref)) ||
+        if(!NT_STATUS_IS_OK(get_referred_path(ctx, p->server_info,
+                                              r->in.dfs_entry_path,
+                                              jn, &consumedcnt, &self_ref)) ||
                         consumedcnt < strlen(r->in.dfs_entry_path)) {
                 return WERR_DFS_NO_SUCH_VOL;

vendor/current/source3/rpc_server/srv_spoolss_nt.c

@@ -141 +141 @@
 }
 
+static void prune_printername_cache(void);
+
 /***************************************************************************
  Disconnect from the client
@@ -329 +331 @@
 {
         Printer_entry *Printer = find_printer_index_by_hnd(p, hnd);
+        WERROR result;
 
         if (!Printer) {
@@ -356 +359 @@
         }
 
-        return delete_printer_hook(p->mem_ctx, p->server_info->ptok,
-                                   Printer->sharename );
+        result = delete_printer_hook(p->mem_ctx, p->server_info->ptok,
+                                     Printer->sharename);
+        if (!W_ERROR_IS_OK(result)) {
+                return result;
+        }
+        prune_printername_cache();
+        return WERR_OK;
 }
 
@@ -413 +421 @@
 
         return true;
+}
+
+static void prune_printername_cache_fn(const char *key, const char *value,
+                                       time_t timeout, void *private_data)
+{
+        gencache_del(key);
+}
+
+static void prune_printername_cache(void)
+{
+        gencache_iterate(prune_printername_cache_fn, NULL, "PRINTERNAME/*");
 }