Changeset 581 for vendor/current/source3

Timestamp:

Jun 28, 2011, 9:27:20 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.5

Location:

vendor/current/source3

Files:

• VERSION (modified) (1 diff)
• include/version.h (modified) (1 diff)
• lib/util_sid.c (modified) (1 diff)
• libads/ldap.c (modified) (1 diff)
• libsmb/cliquota.c (modified) (1 diff)
• smbd/nttrans.c (modified) (3 diffs)

vendor/current/source3/VERSION

@@ -26 +26 @@
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=5
-SAMBA_VERSION_RELEASE=4
+SAMBA_VERSION_RELEASE=5
 
 ########################################################

vendor/current/source3/include/version.h

@@ -2 +2 @@
 #define SAMBA_VERSION_MAJOR 3
 #define SAMBA_VERSION_MINOR 5
-#define SAMBA_VERSION_RELEASE 4
-#define SAMBA_VERSION_OFFICIAL_STRING "3.5.4"
+#define SAMBA_VERSION_RELEASE 5
+#define SAMBA_VERSION_OFFICIAL_STRING "3.5.5"
 #ifdef SAMBA_VERSION_VENDOR_FUNCTION
 #  define SAMBA_VERSION_STRING SAMBA_VERSION_VENDOR_FUNCTION

vendor/current/source3/lib/util_sid.c

@@ -409 +409 @@
         sid->sid_rev_num = CVAL(inbuf, 0);
         sid->num_auths = CVAL(inbuf, 1);
+        if (sid->num_auths > MAXSUBAUTHS) {
+                return false;
+        }
         memcpy(sid->id_auth, inbuf+2, 6);
         if (len < 8 + sid->num_auths*4)

vendor/current/source3/libads/ldap.c

@@ -2142 +2142 @@
                 DOM_SID sid;
                 fstring tmp;
-                sid_parse(values[i]->bv_val, values[i]->bv_len, &sid);
+                if (!sid_parse(values[i]->bv_val, values[i]->bv_len, &sid)) {
+                        continue;
+                }
                 printf("%s: %s\n", field, sid_to_fstring(tmp, &sid));
         }

vendor/current/source3/libsmb/cliquota.c

@@ -112 +112 @@
 #endif /* LARGE_SMB_OFF_T */
 
-        sid_parse(rdata+40,sid_len,&qt.sid);
+        if (!sid_parse(rdata+40,sid_len,&qt.sid)) {
+                return false;
+        }
 
         qt.qtype = SMB_USER_QUOTA_TYPE;

vendor/current/source3/smbd/nttrans.c

@@ -2162 +2162 @@
                 /*unknown = IVAL(pdata,0);*/
 
-                sid_parse(pdata+4,sid_len,&sid);
+                if (!sid_parse(pdata+4,sid_len,&sid)) {
+                        reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                        return;
+                }
+
                 DEBUGADD(10, ("for SID: %s\n", sid_string_dbg(&sid)));
 
@@ -2418 +2422 @@
                         }
 
-                        sid_parse(pdata+8,sid_len,&sid);
+                        if (!sid_parse(pdata+8,sid_len,&sid)) {
+                                reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                                return;
+                        }
 
                         if (vfs_get_ntquota(fsp, SMB_USER_QUOTA_TYPE, &sid, &qt)!=0) {
@@ -2599 +2606 @@
 #endif /* LARGE_SMB_OFF_T */
 
-        sid_parse(pdata+40,sid_len,&sid);
+        if (!sid_parse(pdata+40,sid_len,&sid)) {
+                reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                return;
+        }
+
         DEBUGADD(8,("SID: %s\n", sid_string_dbg(&sid)));