Changeset 773 for branches/samba-3.5.x/source3/lib

Timestamp:

Jul 2, 2013, 7:27:06 PM (12 years ago)

Author:

Herwig Bauernfeind

Message:

Samba Server 3.5: Update branch to 3.5.20

Location:

branches/samba-3.5.x/source3/lib

Files:

• dummysmbd.c (modified) (1 diff)
• os2helper.c (modified) (1 diff)
• util_str.c (modified) (2 diffs)
• util_unistr.c (modified) (3 diffs)

branches/samba-3.5.x/source3/lib/dummysmbd.c

@@ -29 +29 @@
 }
 
-int find_service(fstring service)
+int find_service(const char *service_in, fstring service)
 {
         return -1;

branches/samba-3.5.x/source3/lib/os2helper.c

@@ -491 +491 @@
         PFEA2LIST   pfea2list = NULL;
         char * p;
-        
+        DEBUG(4,("unisetxattr : (%s:%d) %s %d\n", path ? path : "null", file, name, size));
         if ((!path && !file) || !name || (!value && size))
         {

branches/samba-3.5.x/source3/lib/util_str.c

@@ -513 +513 @@
                         "called from [%s][%d]\n", fn, line));
                 return NULL;
+        }
+
+        if (src == dest) {
+                return dest;
         }
 
@@ -2302 +2306 @@
         int i;
 
+        if (!name) {
+                return false;
+        }
+
         for ( i=0; i<max_len && name[i]; i++ ) {
                 /* fail if strchr_m() finds one of the invalid characters */

branches/samba-3.5.x/source3/lib/util_unistr.c

@@ -46 +46 @@
                 else
                         SAFE_FREE(upcase_table);
+                upcase_table = NULL;
         }
 
@@ -53 +54 @@
                 else
                         SAFE_FREE(lowcase_table);
+                lowcase_table = NULL;
         }
 
@@ -60 +62 @@
                 else
                         SAFE_FREE(valid_table);
+                valid_table = NULL;
         }
         initialized = false;