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

Timestamp:

Nov 26, 2007, 9:24:27 AM (18 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.27a

Location:

branches/samba-3.0/source/lib

Files:

• charcnv.c (modified) (2 diffs)
• replace/replace.h (modified) (1 diff)
• replace/system/wait.h (modified) (1 diff)
• util.c (modified) (1 diff)
• util_tdb.c (modified) (2 diffs)
• version.c (modified) (1 diff)

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

@@ -870 +870 @@
 size_t push_ascii(void *dest, const char *src, size_t dest_len, int flags)
 {
-    size_t src_len = strlen(src);
-    pstring tmpbuf;
+        size_t src_len = strlen(src);
+        pstring tmpbuf;
+        size_t ret;
 
         /* No longer allow a length of -1 */
@@ -886 +887 @@
         src_len++;
 
-    return convert_string(CH_UNIX, CH_DOS, src, src_len, dest, dest_len, True);
+        ret =convert_string(CH_UNIX, CH_DOS, src, src_len, dest, dest_len, True);
+        if (ret == (size_t)-1 &&
+                        (flags & (STR_TERMINATE | STR_TERMINATE_ASCII))
+                        && dest_len > 0) {
+                ((char *)dest)[0] = '\0';
+        }
+        return ret;
+
 }
 

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

@@ -78 +78 @@
 #include <stdlib.h>
 #include <stddef.h>
+#endif
+
+#if !defined(HAVE_VOLATILE)
+#define volatile
 #endif
 

branches/samba-3.0/source/lib/replace/system/wait.h

@@ -45 +45 @@
 #endif
 
+#if !defined(HAVE_SIG_ATOMIC_T_TYPE)
+typedef int sig_atomic_t;
 #endif
+
+#endif

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

@@ -1242 +1242 @@
                 p++;
                 fstrcpy(my_domname, p);
+                return True;
         }
 

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

@@ -69 +69 @@
         if (timeout) {
                 CatchSignal(SIGALRM, SIGNAL_CAST gotalarm_sig);
+                tdb_setalarm_sigptr(tdb, &gotalarm);
                 alarm(timeout);
         }
@@ -79 +80 @@
         if (timeout) {
                 alarm(0);
+                tdb_setalarm_sigptr(tdb, NULL);
                 CatchSignal(SIGALRM, SIGNAL_CAST SIG_IGN);
                 if (gotalarm) {

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

@@ -28 +28 @@
 #else
         static fstring samba_version;
+        static BOOL init_samba_version;
+#ifdef SAMBA_VENDOR_PATCH
         fstring tmp_version;
-        static BOOL init_samba_version;
         size_t remaining;
+#endif
 
         if (init_samba_version)