Changeset 228 for branches/samba-3.2.x/source/libsmb

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

Location:

branches/samba-3.2.x/source/libsmb

Files:

• cliconnect.c (modified) (1 diff)
• clidfs.c (modified) (2 diffs)
• clifile.c (modified) (1 diff)
• clilist.c (modified) (1 diff)
• clirap2.c (modified) (2 diffs)
• dsgetdcname.c (modified) (1 diff)
• libsmb_file.c (modified) (3 diffs)
• libsmb_server.c (modified) (3 diffs)
• namequery.c (modified) (4 diffs)
• namequery_dc.c (modified) (2 diffs)
• smb_seal.c (modified) (1 diff)

branches/samba-3.2.x/source/libsmb/cliconnect.c

@@ -1625 +1625 @@
                 ss = *dest_ss;
         } else {
-                zero_addr(&ss);
+                zero_sockaddr(&ss);
         }
 

branches/samba-3.2.x/source/libsmb/clidfs.c

@@ -145 +145 @@
         server_n = server;
 
-        zero_addr(&ss);
+        zero_sockaddr(&ss);
 
         make_nmb_name(&calling, global_myname(), 0x0);
@@ -151 +151 @@
 
  again:
-        zero_addr(&ss);
+        zero_sockaddr(&ss);
         if (have_ip)
                 ss = dest_ss;

branches/samba-3.2.x/source/libsmb/clifile.c

@@ -67 +67 @@
                         &setup, 1, 0,                   /* setup, length, max */
                         param, param_len, 2,            /* param, length, max */
-                        (char *)&data,  data_len, cli->max_xmit /* data, length, max */
+                        data,  data_len, cli->max_xmit  /* data, length, max */
                         )) {
                 SAFE_FREE(data);

branches/samba-3.2.x/source/libsmb/clilist.c

@@ -418 +418 @@
 
                 SAFE_FREE(mask);
-                if (ff_searchcount > 0) {
+                if (ff_searchcount > 0 && ff_eos == 0 && finfo.name) {
                         mask = SMB_STRDUP(finfo.name);
                 } else {

branches/samba-3.2.x/source/libsmb/clirap2.c

@@ -1857 +1857 @@
         char upperbuf[MAX(RAP_USERNAME_LEN,RAP_MACHNAME_LEN)];
         int res = -1;
+        char *tmp = NULL;
 
         memset(param, 0, sizeof(param));
@@ -1867 +1868 @@
         strlcpy(upperbuf, user, sizeof(upperbuf));
         strupper_m(upperbuf);
-        PUTSTRINGF(p, upperbuf, RAP_USERNAME_LEN);
+        tmp = upperbuf;
+        PUTSTRINGF(p, tmp, RAP_USERNAME_LEN);
         p++; /* strange format, but ok */
         strlcpy(upperbuf, workstation, sizeof(upperbuf));
         strupper_m(upperbuf);
-        PUTSTRINGF(p, upperbuf, RAP_MACHNAME_LEN);
+        tmp = upperbuf;
+        PUTSTRINGF(p, tmp, RAP_MACHNAME_LEN);
         PUTWORD(p, CLI_BUFFER_SIZE);
         PUTWORD(p, CLI_BUFFER_SIZE);

branches/samba-3.2.x/source/libsmb/dsgetdcname.c

@@ -357 +357 @@
         }
 
+        status = NT_STATUS_OK;
+
  done:
         data_blob_free(&blob);

branches/samba-3.2.x/source/libsmb/libsmb_file.c

@@ -519 +519 @@
                 errno = EINVAL;
                 TALLOC_FREE(frame);
-                return -1;
+                return false;
         }
         
@@ -528 +528 @@
                         errno = ENOMEM;
                         TALLOC_FREE(frame);
-                        return -1;
+                        return false;
                 }
         } else {
@@ -535 +535 @@
                         errno = ENOMEM;
                         TALLOC_FREE(frame);
-                        return -1;
+                        return false;
                 }
                 trim_string(fixedpath, NULL, "\\..");

branches/samba-3.2.x/source/libsmb/libsmb_server.c

@@ -249 +249 @@
         NTSTATUS status;
         
-        zero_addr(&ss);
+        zero_sockaddr(&ss);
         ZERO_STRUCT(c);
         
@@ -349 +349 @@
 again:
         
-        zero_addr(&ss);
+        zero_sockaddr(&ss);
         
         /* have to open a new connection */
@@ -596 +596 @@
                 }
                 
-                zero_addr(&ss);
+                zero_sockaddr(&ss);
                 nt_status = cli_full_connection(&ipc_cli,
                                                 global_myname(), server,

branches/samba-3.2.x/source/libsmb/namequery.c

@@ -332 +332 @@
         if (!interpret_string_addr(&ss, lp_socket_address(),
                                 AI_NUMERICHOST|AI_PASSIVE)) {
-                zero_addr(&ss);
+                zero_sockaddr(&ss);
         }
 
@@ -527 +527 @@
 
                 for ( j=i+1; j<count; j++ ) {
-                        if (addr_equal(&iplist[i].ss, &iplist[j].ss) &&
+                        if (sockaddr_equal(&iplist[i].ss, &iplist[j].ss) &&
                                         iplist[i].port == iplist[j].port) {
-                                zero_addr(&iplist[j].ss);
+                                zero_sockaddr(&iplist[j].ss);
                         }
                 }
@@ -955 +955 @@
         if (!interpret_string_addr(&ss, lp_socket_address(),
                                 AI_NUMERICHOST|AI_PASSIVE)) {
-                zero_addr(&ss);
+                zero_sockaddr(&ss);
         }
 
@@ -1043 +1043 @@
         if (!interpret_string_addr(&src_ss, lp_socket_address(),
                                 AI_NUMERICHOST|AI_PASSIVE)) {
-                zero_addr(&src_ss);
+                zero_sockaddr(&src_ss);
         }
 

branches/samba-3.2.x/source/libsmb/namequery_dc.c

@@ -135 +135 @@
         *dc_ss = ads->ldap.ss;
 #else
-        zero_addr(dc_ss);
+        zero_sockaddr(dc_ss);
 #endif
         ads_destroy(&ads);
@@ -218 +218 @@
         bool our_domain = False;
 
-        zero_addr(&dc_ss);
+        zero_sockaddr(&dc_ss);
 
         ret = False;

branches/samba-3.2.x/source/libsmb/smb_seal.c

@@ -389 +389 @@
 void common_free_enc_buffer(struct smb_trans_enc_state *es, char *buf)
 {
+        uint16_t enc_ctx_num;
+
         if (!common_encryption_on(es)) {
+                return;
+        }
+
+        if (!NT_STATUS_IS_OK(get_enc_ctx_num((const uint8_t *)buf,
+                        &enc_ctx_num))) {
                 return;
         }