Changeset 587 for vendor/current/source3/rpc_server

Timestamp:

Jun 29, 2011, 7:36:41 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.6

Location:

vendor/current/source3/rpc_server

Files:

• srv_pipe.c (modified) (1 diff)
• srv_spoolss_nt.c (modified) (9 diffs)
• srv_winreg_nt.c (modified) (1 diff)

vendor/current/source3/rpc_server/srv_pipe.c

@@ -1185 +1185 @@
 
         /* parse out the OIDs and the first sec blob */
-        if (!parse_negTokenTarg(blob, OIDs, &secblob)) {
+        if (!parse_negTokenTarg(blob, OIDs, &secblob) ||
+                        OIDs[0] == NULL) {
                 DEBUG(0,("pipe_spnego_auth_bind_negotiate: Failed to parse the security blob.\n"));
                 goto err;

vendor/current/source3/rpc_server/srv_spoolss_nt.c

@@ -433 +433 @@
         WERROR result;
 
+        /*
+         * Hopefully nobody names his printers like this. Maybe \ or ,
+         * are illegal in printer names even?
+         */
+        const char printer_not_found[] = "Printer \\, !@#$%^&*( not found";
+        char *cache_key;
+        char *tmp;
+
         DEBUG(4,("Setting printer name=%s (len=%lu)\n", handlename,
                 (unsigned long)strlen(handlename)));
@@ -475 +483 @@
         }
 
+        /*
+         * With hundreds of printers, the "for" loop iterating all
+         * shares can be quite expensive, as it is done on every
+         * OpenPrinter. The loop maps "aprinter" to "sname", the
+         * result of which we cache in gencache.
+         */
+
+        cache_key = talloc_asprintf(talloc_tos(), "PRINTERNAME/%s",
+                                    aprinter);
+        if ((cache_key != NULL) && gencache_get(cache_key, &tmp, NULL)) {
+
+                found = (strcmp(tmp, printer_not_found) != 0);
+                if (!found) {
+                        DEBUG(4, ("Printer %s not found\n", aprinter));
+                        SAFE_FREE(tmp);
+                        return false;
+                }
+                fstrcpy(sname, tmp);
+                SAFE_FREE(tmp);
+        }
+
         /* Search all sharenames first as this is easier than pulling
            the printer_info_2 off of disk. Don't use find_service() since
@@ -540 +569 @@
 
         if ( !found ) {
+                if (cache_key != NULL) {
+                        gencache_set(cache_key, printer_not_found,
+                                     time(NULL)+300);
+                        TALLOC_FREE(cache_key);
+                }
                 DEBUGADD(4,("Printer not found\n"));
                 return false;
+        }
+
+        if (cache_key != NULL) {
+                gencache_set(cache_key, sname, time(NULL)+300);
+                TALLOC_FREE(cache_key);
         }
 
@@ -1646 +1685 @@
                             !token_contains_name_in_list(
                                     uidtoname(p->server_info->utok.uid),
-                                    NULL, NULL,
+                                    pdb_get_domain(p->server_info->sam_account),
+                                    NULL,
                                     p->server_info->ptok,
                                     lp_printer_admin(snum))) {
@@ -1942 +1982 @@
                 && !user_has_privileges(p->server_info->ptok, &se_printop )
                 && !token_contains_name_in_list(
-                        uidtoname(p->server_info->utok.uid), NULL,
-                        NULL, p->server_info->ptok,
+                        uidtoname(p->server_info->utok.uid),
+                        pdb_get_domain(p->server_info->sam_account),
+                        NULL,
+                        p->server_info->ptok,
                         lp_printer_admin(-1)) )
         {
@@ -2041 +2083 @@
                 && !user_has_privileges(p->server_info->ptok, &se_printop )
                 && !token_contains_name_in_list(
-                        uidtoname(p->server_info->utok.uid), NULL, NULL,
+                        uidtoname(p->server_info->utok.uid),
+                        pdb_get_domain(p->server_info->sam_account),
+                        NULL,
                         p->server_info->ptok, lp_printer_admin(-1)) )
         {
@@ -7846 +7890 @@
              !user_has_privileges(p->server_info->ptok, &se_printop) &&
              !token_contains_name_in_list(uidtoname(p->server_info->utok.uid),
-                                          NULL, NULL,
+                                          pdb_get_domain(p->server_info->sam_account),
+                                          NULL,
                                           p->server_info->ptok,
                                           lp_printer_admin(snum))) {
@@ -7927 +7972 @@
              !user_has_privileges(p->server_info->ptok, &se_printop) &&
              !token_contains_name_in_list(uidtoname(p->server_info->utok.uid),
-                                          NULL, NULL,
+                                          pdb_get_domain(p->server_info->sam_account),
+                                          NULL,
                                           p->server_info->ptok,
                                           lp_printer_admin(snum))) {
@@ -8010 +8056 @@
              !user_has_privileges(p->server_info->ptok, &se_printop) &&
              !token_contains_name_in_list(uidtoname(p->server_info->utok.uid),
-                                          NULL, NULL,
+                                          pdb_get_domain(p->server_info->sam_account),
+                                          NULL,
                                           p->server_info->ptok,
                                           lp_printer_admin(snum))) {

vendor/current/source3/rpc_server/srv_winreg_nt.c

@@ -221 +221 @@
         prs_struct    prs_hkpd;
 
-        uint8_t *outbuf;
-        uint32_t outbuf_size;
+        uint8_t *outbuf = NULL;
+        uint32_t outbuf_size = 0;
 
         DATA_BLOB val_blob;