Changeset 234 for branches/samba-3.2.x/source

Timestamp:

May 27, 2009, 11:59:40 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.10

Location:

branches/samba-3.2.x/source

Files:

• VERSION (modified) (1 diff)
• include/version.h (modified) (1 diff)
• lib/charcnv.c (modified) (5 diffs)
• passdb/pdb_tdb.c (modified) (3 diffs)

branches/samba-3.2.x/source/VERSION

@@ -26 +26 @@
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=2
-SAMBA_VERSION_RELEASE=9
+SAMBA_VERSION_RELEASE=10
 
 ########################################################

branches/samba-3.2.x/source/include/version.h

@@ -2 +2 @@
 #define SAMBA_VERSION_MAJOR 3
 #define SAMBA_VERSION_MINOR 2
-#define SAMBA_VERSION_RELEASE 9
-#define SAMBA_VERSION_OFFICIAL_STRING "3.2.9"
+#define SAMBA_VERSION_RELEASE 10
+#define SAMBA_VERSION_OFFICIAL_STRING "3.2.10"
 #define SAMBA_VERSION_STRING samba_version_string()

branches/samba-3.2.x/source/lib/charcnv.c

@@ -243 +243 @@
                                 if (allow_bad_conv)
                                         goto use_as_is;
-                                break;
+                                return (size_t)-1;
                         case E2BIG:
                                 reason="No more room"; 
@@ -264 +264 @@
                                 if (allow_bad_conv)
                                         goto use_as_is;
-                                break;
+                                
+                                return (size_t)-1;
                         default:
                                 if (!conv_silent)
                                         DEBUG(0,("convert_string_internal: Conversion error: %s(%s)\n",reason,inbuf));
-                                break;
+                                return (size_t)-1;
                 }
                 /* smb_panic(reason); */
@@ -413 +414 @@
                                 goto general_case;
 #else
-                                return retval + convert_string_internal(from, to, p, slen, q, dlen, allow_bad_conv);
+                                size_t ret = convert_string_internal(from, to, p, slen, q, dlen, allow_bad_conv);
+                                if (ret == (size_t)-1) {
+                                        return ret;
+                                }
+                                return retval + ret;
 #endif
                         }
@@ -449 +454 @@
                                 goto general_case;
 #else
-                                return retval + convert_string_internal(from, to, p, slen, q, dlen, allow_bad_conv);
+                                size_t ret = convert_string_internal(from, to, p, slen, q, dlen, allow_bad_conv);
+                                if (ret == (size_t)-1) {
+                                        return ret;
+                                }
+                                return retval + ret;
 #endif
                         }
@@ -485 +494 @@
                                 goto general_case;
 #else
-                                return retval + convert_string_internal(from, to, p, slen, q, dlen, allow_bad_conv);
+                                size_t ret = convert_string_internal(from, to, p, slen, q, dlen, allow_bad_conv);
+                                if (ret == (size_t)-1) {
+                                        return ret;
+                                }
+                                return retval + ret;
 #endif
                         }

branches/samba-3.2.x/source/passdb/pdb_tdb.c

@@ -881 +881 @@
         }
 
+        /* be sure to close the DBs _before_ renaming the file */
+
+        TALLOC_FREE(orig_db);
+        TALLOC_FREE(tmp_db);
+
         /* This is safe from other users as we know we're
          * under a mutex here. */
@@ -893 +898 @@
 
         TALLOC_FREE(frame);
-        TALLOC_FREE(orig_db);
+
+        /* re-open the converted TDB */
+
+        orig_db = db_open_trans(NULL, dbname, 0,
+                                TDB_DEFAULT, O_CREAT|O_RDWR, 0600);
+        if (orig_db == NULL) {
+                DEBUG(0, ("tdbsam_convert_backup: Failed to re-open "
+                          "converted passdb TDB [%s]\n", dbname));
+                return false;
+        }
 
         DEBUG(1, ("tdbsam_convert_backup: updated %s file.\n",
@@ -899 +913 @@
 
         /* Replace the global db pointer. */
-        *pp_db = tmp_db;
+        *pp_db = orig_db;
         return true;