Changeset 222 for branches/samba-3.3.x/source/libsmb

Timestamp:

May 24, 2009, 7:45:16 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.2

Location:

branches/samba-3.3.x/source/libsmb

Files:

• dsgetdcname.c (modified) (1 diff)
• libsmb_context.c (modified) (2 diffs)
• smb_signing.c (modified) (2 diffs)

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

@@ -201 +201 @@
         /* FIXME */
         r->sockaddr_size = 0x10; /* the w32 winsock addr size */
-        r->sockaddr.sa_family = 2; /* AF_INET */
+        r->sockaddr.sockaddr_family = 2; /* AF_INET */
         r->sockaddr.pdc_ip = talloc_strdup(mem_ctx, addr);
 

branches/samba-3.3.x/source/libsmb/libsmb_context.c

@@ -631 +631 @@
  */
 void
-smbc_set_credentials(char *workgroup,
-                     char *user,
-                     char *password,
+smbc_set_credentials(const char *workgroup,
+                     const char *user,
+                     const char *password,
                      smbc_bool use_kerberos,
-                     char *signing_state)
+                     const char *signing_state)
 {
         
@@ -676 +676 @@
         }
 
-        /* Using CONST_DISCARD here is ugly, but
-         * we know that smbc_set_credentials() doesn't
-         * actually modify the strings, and should have
-         * been const from the start. We're constrained
-         * by the ABI here.
-         */
-
-        smbc_set_credentials(CONST_DISCARD(char *,workgroup),
-                             CONST_DISCARD(char *,user),
-                             CONST_DISCARD(char *,password),
-                             use_kerberos,
-                             CONST_DISCARD(char *,signing_state));
+        smbc_set_credentials(workgroup, user, password,
+                             use_kerberos, signing_state);
 
         if (smbc_getOptionFallbackAfterKerberos(context)) {

branches/samba-3.3.x/source/libsmb/smb_signing.c

@@ -866 +866 @@
 ************************************************************/
 
-void srv_cancel_sign_response(uint16 mid)
+void srv_cancel_sign_response(uint16 mid, bool cancel)
 {
         struct smb_basic_signing_context *data;
@@ -885 +885 @@
 
         /* cancel doesn't send a reply so doesn't burn a sequence number. */
-        data->send_seq_num -= 1;
+        if (cancel) {
+                data->send_seq_num -= 1;
+        }
 }