Changeset 481

Timestamp:

Aug 3, 2010, 1:08:18 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: fixes ticket 141

Location:

trunk/server

Files:

• lib/util/util.c (modified) (1 diff)
• source3/dynconfig.c (modified) (1 diff)
• source3/include/version.h (modified) (1 diff)
• source3/lib/charcnv.c (modified) (1 diff)

trunk/server/lib/util/util.c

@@ -223 +223 @@
         lock.l_pid = 0;
 
-/* @todo eventually insert lock code from 3.3 */
         ret = fcntl(fd,op,&lock);
 

trunk/server/source3/dynconfig.c

@@ -347 +347 @@
 }
 
-/* @todo define NCALRPCDIR and SHLIBDIR eventually different */
-
 /* Directory holding the shared libs (same as libdir) */
 const char *get_dyn_SHLIBEXT(void)

trunk/server/source3/include/version.h

@@ -5 +5 @@
 #define SAMBA_VERSION_OFFICIAL_STRING "3.5.4"
 #define SAMBA_VERSION_VENDOR_SUFFIX "eCS 1.2.0"
-#define SAMBA_VERSION_VENDOR_PATCH 479
-#define SAMBA_VERSION_VENDOR_PATCH_STRING "479"
+#define SAMBA_VERSION_VENDOR_PATCH 480
+#define SAMBA_VERSION_VENDOR_PATCH_STRING "480"
 #ifdef SAMBA_VERSION_VENDOR_FUNCTION
 #  define SAMBA_VERSION_STRING SAMBA_VERSION_VENDOR_FUNCTION

trunk/server/source3/lib/charcnv.c

@@ -1803 +1803 @@
   Return INVALID_CODEPOINT if the next character cannot be converted.
 */
-
-/* @todo eventually port old code, but probably not necessary */
 codepoint_t next_codepoint(const char *str, size_t *size)
 {