Changeset 140 for branches/samba-3.0/source/lib

Timestamp:

Jul 11, 2008, 1:13:42 AM (17 years ago)

Author:

Paul Smedley

Message:

Update branch to 3.0.31 release

Location:

branches/samba-3.0/source/lib

Files:

• replace/replace.c (modified) (1 diff)
• system.c (modified) (1 diff)
• time.c (modified) (1 diff)
• util_str.c (modified) (1 diff)

branches/samba-3.0/source/lib/replace/replace.c

@@ -85 +85 @@
 
         if (len1+len2 >= bufsize) {
+                if (bufsize < (len1+1)) {
+                        return ret;
+                }
                 len2 = bufsize - (len1+1);
         }

branches/samba-3.0/source/lib/system.c

@@ -825 +825 @@
                         /* Linux has CAP_MKNOD for DMAPI access. */
                         cap_vals[num_cap_vals++] = CAP_MKNOD;
+#endif
+                        break;
+                case LEASE_CAPABILITY:
+#ifdef CAP_LEASE
+                        cap_vals[num_cap_vals++] = CAP_LEASE;
 #endif
                         break;

branches/samba-3.0/source/lib/time.c

@@ -1213 +1213 @@
         /* d is now in 100ns units, since jan 1st 1601".
            Save off the ns fraction. */
-        
-        ret.tv_nsec = (long) ((d % 100) * 100);
+
+        /*
+         * Take the last seven decimal digits and multiply by 100.
+         * to convert from 100ns units to 1ns units.
+         */
+        ret.tv_nsec = (long) ((d % (1000 * 1000 * 10)) * 100);
 
         /* Convert to seconds */

branches/samba-3.0/source/lib/util_str.c

@@ -2309 +2309 @@
         out_cnt = 0;
         len = data.length;
-        output_len = data.length * 2;
+        output_len = data.length * 2 + 4; /* Account for closing bytes. 4 is
+                                           * random but should be enough for
+                                           * the = and \0 */
         result = (char *)SMB_MALLOC(output_len); /* get us plenty of space */