Changeset 874 for trunk/server/source3/lib

Timestamp:

Feb 18, 2015, 10:18:05 AM (11 years ago)

Author:

Silvan Scherrer

Message:

samba server 3.6: update trunk to 3.6.24

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/lib/charcnv.c (modified) (3 diffs)
• source3/lib/system.c (modified) (2 diffs)

trunk/server/source3/lib/charcnv.c

@@ -823 +823 @@
 size_t push_ascii(void *dest, const char *src, size_t dest_len, int flags)
 {
-        size_t src_len = strlen(src);
+        size_t src_len = 0;
         char *tmpbuf = NULL;
         size_t ret;
@@ -841 +841 @@
         }
 
+        src_len = strlen(src);
         if (flags & (STR_TERMINATE | STR_TERMINATE_ASCII)) {
                 src_len++;
@@ -846 +847 @@
 
         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';
-        }
+
         SAFE_FREE(tmpbuf);
+        if (ret == (size_t)-1) {
+                if ((flags & (STR_TERMINATE | STR_TERMINATE_ASCII))
+                                && dest_len > 0) {
+                        ((char *)dest)[0] = '\0';
+                }
+                return 0;
+        }
         return ret;
 }

trunk/server/source3/lib/system.c

@@ -282 +282 @@
 /*******************************************************************
 A recvfrom wrapper that will deal with EINTR.
+NB. As used with non-blocking sockets, return on EAGAIN/EWOULDBLOCK
 ********************************************************************/
 
@@ -290 +291 @@
         do {
                 ret = recvfrom(s, buf, len, flags, from, fromlen);
-#if defined(EWOULDBLOCK)
-        } while (ret == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
-#else
-        } while (ret == -1 && (errno == EINTR || errno == EAGAIN));
-#endif
+        } while (ret == -1 && (errno == EINTR));
         return ret;
 }