Changeset 597 for vendor/current/source3/utils

Timestamp:

Jul 2, 2011, 4:01:14 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.9

Location:

vendor/current/source3/utils

Files:

• net_rpc_printer.c (modified) (1 diff)
• ntlm_auth.c (modified) (1 diff)
• smbget.c (modified) (1 diff)

vendor/current/source3/utils/net_rpc_printer.c

@@ -1092 +1092 @@
                 return false;
 
+        *info_p = talloc_zero(mem_ctx, union spoolss_PrinterInfo);
+        if (*info_p == NULL) {
+                return false;
+        }
+
         if (!net_spoolss_getprinter(pipe_hnd, mem_ctx, &hnd, level, *info_p)) {
                 rpccli_spoolss_ClosePrinter(pipe_hnd, mem_ctx, &hnd, NULL);

vendor/current/source3/utils/ntlm_auth.c

@@ -737 +737 @@
         ctrl = get_pam_winbind_config();
 
-        if (ctrl | WINBIND_KRB5_AUTH) {
+        if (ctrl & WINBIND_KRB5_AUTH) {
                 wb_request.flags |= WBFLAG_PAM_CONTACT_TRUSTDOM;
         }

vendor/current/source3/utils/smbget.c

@@ -75 +75 @@
 static void human_readable(off_t s, char *buffer, int l)
 {
-        if(s > 1024 * 1024 * 1024) snprintf(buffer, l, "%.2fGb", 1.0 * s / (1024 * 1024 * 1024));
-        else if(s > 1024 * 1024) snprintf(buffer, l, "%.2fMb", 1.0 * s / (1024 * 1024));
-        else if(s > 1024) snprintf(buffer, l, "%.2fkb", 1.0 * s / 1024);
+        if(s > 1024 * 1024 * 1024) snprintf(buffer, l, "%.2fGB",
+                                            1.0 * s / (1024 * 1024 * 1024));
+        else if(s > 1024 * 1024) snprintf(buffer, l, "%.2fMB",
+                                          1.0 * s / (1024 * 1024));
+        else if(s > 1024) snprintf(buffer, l, "%.2fkB", 1.0 * s / 1024);
         else snprintf(buffer, l, OFF_T_FORMAT"b", (OFF_T_FORMAT_CAST)s);
 }