Changeset 39 for trunk/samba/source/libsmb/libsmbclient.c

Timestamp:

May 27, 2007, 12:26:26 AM (18 years ago)

Author:

Paul Smedley

Message:

Upgrade source to 3.0.25a

File:

• trunk/samba/source/libsmb/libsmbclient.c (modified) (6 diffs)

trunk/samba/source/libsmb/libsmbclient.c

@@ -501 +501 @@
                   SMBCSRV * server) 
 {
-        size_t size;
+        socklen_t size;
         struct sockaddr addr;
 
@@ -4557 +4557 @@
                                         }
                                         n = strlen(p);
-                                } else {
+                                } else if (sidstr[0] != '\0') {
                                         n = snprintf(buf, bufsize,
                                                      ",OWNER:%s", sidstr);
@@ -4602 +4602 @@
                                         }
                                         n = strlen(p);
-                                } else {
+                                } else if (sidstr[0] != '\0') {
                                         n = snprintf(buf, bufsize,
                                                      ",GROUP:%s", sidstr);
@@ -4710 +4710 @@
                                         }
                                 }
-                                if (n > bufsize) {
+                                if (!determine_size && n > bufsize) {
                                         errno = ERANGE;
                                         return -1;
@@ -5328 +5328 @@
                                            workgroup, user, password,
                                            &pol);
-                srv->no_nt_session = True;
+                if (! ipc_srv) {
+                        srv->no_nt_session = True;
+                }
         } else {
                 ipc_srv = NULL;
@@ -5753 +5755 @@
                                            workgroup, user, password,
                                            &pol);
-                srv->no_nt_session = True;
+                if (! ipc_srv) {
+                        srv->no_nt_session = True;
+                }
         } else {
                 ipc_srv = NULL;