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

Timestamp:

May 23, 2008, 6:56:41 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.29

Location:

branches/samba-3.0/source/lib

Files:

• smbldap.c (modified) (2 diffs)
• util_str.c (modified) (1 diff)
• util_tdb.c (modified) (1 diff)
• xfile.c (modified) (5 diffs)

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

@@ -995 +995 @@
         }
 
-        DEBUG(3, ("ldap_connect_system: succesful connection to the LDAP server\n"));
+        DEBUG(3, ("ldap_connect_system: successful connection to the LDAP server\n"));
         DEBUGADD(10, ("ldap_connect_system: LDAP server %s support paged results\n", 
                 ldap_state->paged_results ? "does" : "does not"));
@@ -1063 +1063 @@
         ldap_state->last_ping = time(NULL);
         ldap_state->pid = sys_getpid();
-        DEBUG(4,("The LDAP server is succesfully connected\n"));
+        DEBUG(4,("The LDAP server is successfully connected\n"));
 
         return LDAP_SUCCESS;

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

@@ -2143 +2143 @@
  * @param ip_list pointer to array of ip addresses which is
  *        allocated by this function and must be freed by caller
- * @return number of succesfully parsed addresses
+ * @return number of successfully parsed addresses
  **/
  

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

@@ -848 +848 @@
         switch (level) {
         case TDB_DEBUG_FATAL:
-                debug_level = 0;
+                debuglevel = 0;
                 break;
         case TDB_DEBUG_ERROR:

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

@@ -49 +49 @@
 int x_setvbuf(XFILE *f, char *buf, int mode, size_t size)
 {
-        x_fflush(f);
+        if (x_fflush(f) != 0) return -1;
         if (f->bufused) return -1;
 
@@ -152 +152 @@
 
         /* make sure we flush any buffered data */
-        x_fflush(f);
+        (void)x_fflush(f);
 
         ret = close(f->fd);
@@ -191 +191 @@
                 if (n == 0) {
                         /* it's full, flush it */
-                        x_fflush(f);
+                        if (x_fflush(f) != 0) {
+                                return -1;
+                        }
                         continue;
                 }
@@ -206 +208 @@
                 for (i=(size*nmemb)-1; i>=0; i--) {
                         if (*(i+(const char *)p) == '\n') {
-                                x_fflush(f);
+                                if (x_fflush(f) != 0) {
+                                        return -1;
+                                }
                                 break;
                         }
@@ -255 +259 @@
         if (f->flags & X_FLAG_ERROR) return -1;
 
+        if (f->bufused == 0 || !f->buf) return 0;
+
         if ((f->open_flags & O_ACCMODE) != O_WRONLY) {
                 errno = EINVAL;
                 return -1;
         }
-
-        if (f->bufused == 0 || !f->buf) return 0;
 
         ret = write(f->fd, f->buf, f->bufused);