Changeset 124 for branches/samba-3.0/source/libsmb

Timestamp:

Mar 12, 2008, 9:08:18 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.28a

Location:

branches/samba-3.0/source/libsmb

Files:

• cliconnect.c (modified) (7 diffs)
• clierror.c (modified) (1 diff)
• clikrb5.c (modified) (2 diffs)
• clilist.c (modified) (2 diffs)
• clitrans.c (modified) (6 diffs)
• nmblib.c (modified) (1 diff)
• smb_signing.c (modified) (5 diffs)
• smbencrypt.c (modified) (1 diff)
• trusts_util.c (modified) (1 diff)
• unexpected.c (modified) (3 diffs)

branches/samba-3.0/source/libsmb/cliconnect.c

@@ -41 +41 @@
 };
 
+static const char *star_smbserver_name = "*SMBSERVER";
+
 /**
  * Set the user session key for a connection
@@ -629 +631 @@
                 data_blob_free(&negTokenTarg);
                 data_blob_free(&session_key_krb5);
-                ADS_ERROR_NT(cli_nt_error(cli));
+                return ADS_ERROR_NT(cli_nt_error(cli));
         }
 
@@ -862 +864 @@
                 }
                 
-                rc = cli_session_setup_kerberos(cli, principal, domain);
-                if (ADS_ERR_OK(rc) || !cli->fallback_after_kerberos) {
+                /* If we get a bad principal, try to guess it if
+                   we have a valid host NetBIOS name.
+                 */
+                if (strequal(principal, ADS_IGNORE_PRINCIPAL)) {
                         SAFE_FREE(principal);
-                        return rc;
+                }
+                if (principal == NULL &&
+                        !is_ipaddress(cli->desthost) &&
+                        !strequal(star_smbserver_name,
+                                cli->desthost)) {
+                        char *realm = NULL;
+                        char *machine = NULL;
+                        char *host = NULL;
+                        DEBUG(3,("cli_session_setup_spnego: got a "
+                                "bad server principal, trying to guess ...\n"));
+
+                        host = strchr_m(cli->desthost, '.');
+                        if (host) {
+                                machine = SMB_STRNDUP(cli->desthost,
+                                        host - cli->desthost);
+                        } else {
+                                machine = SMB_STRDUP(cli->desthost);
+                        }
+                        if (machine == NULL) {
+                                return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
+                        }
+
+                        realm = kerberos_get_default_realm_from_ccache();
+                        if (realm && *realm) {
+                                if (asprintf(&principal, "%s$@%s",
+                                                machine, realm) < 0) {
+                                        SAFE_FREE(machine);
+                                        SAFE_FREE(realm);
+                                        return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
+                                }
+                                DEBUG(3,("cli_session_setup_spnego: guessed "
+                                        "server principal=%s\n",
+                                        principal ? principal : "<null>"));
+                        }
+                        SAFE_FREE(machine);
+                        SAFE_FREE(realm);
+                }
+
+                if (principal) {
+                        rc = cli_session_setup_kerberos(cli, principal, domain);
+                        if (ADS_ERR_OK(rc) || !cli->fallback_after_kerberos) {
+                                SAFE_FREE(principal);
+                                return rc;
+                        }
                 }
         }
@@ -1413 +1460 @@
 
         /* reasonable default hostname */
-        if (!host) host = "*SMBSERVER";
+        if (!host) host = star_smbserver_name;
 
         fstrcpy(cli->desthost, host);
@@ -1528 +1575 @@
                         goto again;
                 }
-                if (strcmp(called.name, "*SMBSERVER")) {
-                        make_nmb_name(&called , "*SMBSERVER", 0x20);
+                if (strcmp(called.name, star_smbserver_name)) {
+                        make_nmb_name(&called , star_smbserver_name, 0x20);
                         goto again;
                 }
@@ -1653 +1700 @@
 
         if(is_ipaddress(desthost)) {
-                make_nmb_name(&called, "*SMBSERVER", 0x20);
+                make_nmb_name(&called, star_smbserver_name, 0x20);
         } else {
                 make_nmb_name(&called, desthost, 0x20);
@@ -1662 +1709 @@
                 struct nmb_name smbservername;
 
-                make_nmb_name(&smbservername , "*SMBSERVER", 0x20);
+                make_nmb_name(&smbservername, star_smbserver_name, 0x20);
 
                 /*

branches/samba-3.0/source/libsmb/clierror.c

@@ -470 +470 @@
         SIVAL(cli->inbuf, smb_rcls, NT_STATUS_V(status));
 }
+
+/* Reset an error. */
+
+void cli_reset_error(struct cli_state *cli)
+{
+        if (SVAL(cli->inbuf,smb_flg2) & FLAGS2_32_BIT_ERROR_CODES) {
+                SIVAL(cli->inbuf, smb_rcls, NT_STATUS_V(NT_STATUS_OK));
+        } else {
+                SCVAL(cli->inbuf,smb_rcls,0);
+                SSVAL(cli->inbuf,smb_err,0);
+        }
+}

branches/samba-3.0/source/libsmb/clikrb5.c

@@ -337 +337 @@
                         data_blob_free(&auth_data_wrapped);
                         
-                        if (!got_auth_data_pac) {
-                                continue;
+                        if (got_auth_data_pac) {
+                                return true;
                         }
                 }
@@ -364 +364 @@
                         got_auth_data_pac = unwrap_pac(mem_ctx, &auth_data_wrapped, auth_data);
                         data_blob_free(&auth_data_wrapped);
-                        
-                        if (!got_auth_data_pac) {
-                                continue;
+
+                        if (got_auth_data_pac) {
+                                return true;
                         }
                 }

branches/samba-3.0/source/libsmb/clilist.c

@@ -248 +248 @@
                                        &rdata, &data_len) &&
                     cli_is_dos_error(cli)) {
-                        /* we need to work around a Win95 bug - sometimes
+                        /* We need to work around a Win95 bug - sometimes
                            it gives ERRSRV/ERRerror temprarily */
                         uint8 eclass;
@@ -257 +257 @@
 
                         cli_dos_error(cli, &eclass, &ecode);
+
+                        /*
+                         * OS/2 might return "no more files",
+                         * which just tells us, that searchcount is zero
+                         * in this search.
+                         * Guenter Kukkukk <linux@kukkukk.com>
+                         */
+
+                        if (eclass == ERRDOS && ecode == ERRnofiles) {
+                                ff_searchcount = 0;
+                                cli_reset_error(cli);
+                                break;
+                        }
+
                         if (eclass != ERRSRV || ecode != ERRerror)
                                 break;

branches/samba-3.0/source/libsmb/clitrans.c

@@ -96 +96 @@
         }
 
-        /* Note we're in a trans state. Save the sequence
-         * numbers for replies. */
-        client_set_trans_sign_state_on(cli, mid);
-
         if (this_ldata < ldata || this_lparam < lparam) {
                 /* receive interim response */
                 if (!cli_receive_smb(cli) || cli_is_error(cli)) {
-                        client_set_trans_sign_state_off(cli, mid);
                         return(False);
                 }
@@ -145 +140 @@
                         show_msg(cli->outbuf);
                         if (!cli_send_smb(cli)) {
-                                client_set_trans_sign_state_off(cli, mid);
                                 return False;
                         }
@@ -324 +318 @@
   out:
 
-        client_set_trans_sign_state_off(cli, SVAL(cli->inbuf,smb_mid));
         return ret;
 }
@@ -392 +385 @@
         }       
 
-        /* Note we're in a trans state. Save the sequence
-         * numbers for replies. */
-        client_set_trans_sign_state_on(cli, mid);
-
         if (this_ldata < ldata || this_lparam < lparam) {
                 /* receive interim response */
                 if (!cli_receive_smb(cli) || cli_is_error(cli)) {
-                        client_set_trans_sign_state_off(cli, mid);
                         return(False);
                 }
@@ -441 +429 @@
 
                         if (!cli_send_smb(cli)) {
-                                client_set_trans_sign_state_off(cli, mid);
                                 return False;
                         }
@@ -641 +628 @@
   out:
 
-        client_set_trans_sign_state_off(cli, SVAL(cli->inbuf,smb_mid));
         return ret;
 }

branches/samba-3.0/source/libsmb/nmblib.c

@@ -703 +703 @@
                 return(NULL);
 
+        ZERO_STRUCTP(p);        /* initialize for possible padding */
+
         p->next = NULL;
         p->prev = NULL;

branches/samba-3.0/source/libsmb/smb_signing.c

@@ -27 +27 @@
         uint16 mid;
         uint32 reply_seq_num;
-        BOOL can_delete; /* Set to False in trans state. */
 };
 
@@ -44 +43 @@
         for (t = *list; t; t = t->next) {
                 if (t->mid == mid) {
-                        return False;
+                        DLIST_REMOVE(*list, t);
+                        SAFE_FREE(t);
+                        break;
                 }
         }
@@ -53 +54 @@
         t->mid = mid;
         t->reply_seq_num = reply_seq_num;
-        t->can_delete = True;
 
         /*
@@ -80 +80 @@
                         DEBUG(10,("get_sequence_for_reply: found seq = %u mid = %u\n",
                                 (unsigned int)t->reply_seq_num, (unsigned int)t->mid ));
-                        if (t->can_delete) {
-                                DLIST_REMOVE(*list, t);
-                                SAFE_FREE(t);
-                        }
-                        return True;
-                }
-        }
-        return False;
-}
-
-static BOOL set_sequence_can_delete_flag(struct outstanding_packet_lookup **list, uint16 mid, BOOL can_delete_entry)
-{
-        struct outstanding_packet_lookup *t;
-
-        for (t = *list; t; t = t->next) {
-                if (t->mid == mid) {
-                        t->can_delete = can_delete_entry;
+                        DLIST_REMOVE(*list, t);
+                        SAFE_FREE(t);
                         return True;
                 }
@@ -605 +590 @@
 
 /***********************************************************
- Enter trans/trans2/nttrans state.
-************************************************************/
-
-BOOL client_set_trans_sign_state_on(struct cli_state *cli, uint16 mid)
-{
-        struct smb_sign_info *si = &cli->sign_info;
-        struct smb_basic_signing_context *data = (struct smb_basic_signing_context *)si->signing_context;
-
-        if (!si->doing_signing) {
-                return True;
-        }
-
-        if (!data) {
-                return False;
-        }
-
-        if (!set_sequence_can_delete_flag(&data->outstanding_packet_list, mid, False)) {
-                return False;
-        }
-
-        return True;
-}
-
-/***********************************************************
- Leave trans/trans2/nttrans state.
-************************************************************/
-
-BOOL client_set_trans_sign_state_off(struct cli_state *cli, uint16 mid)
-{
-        uint32 reply_seq_num;
-        struct smb_sign_info *si = &cli->sign_info;
-        struct smb_basic_signing_context *data = (struct smb_basic_signing_context *)si->signing_context;
-
-        if (!si->doing_signing) {
-                return True;
-        }
-
-        if (!data) {
-                return False;
-        }
-
-        if (!set_sequence_can_delete_flag(&data->outstanding_packet_list, mid, True)) {
-                return False;
-        }
-
-        /* Now delete the stored mid entry. */
-        if (!get_sequence_for_reply(&data->outstanding_packet_list, mid, &reply_seq_num)) {
-                return False;
-        }
-
-        return True;
-}
-
-/***********************************************************
  SMB signing - Server implementation - send the MAC.
 ************************************************************/

branches/samba-3.0/source/libsmb/smbencrypt.c

@@ -445 +445 @@
            This prevents username swapping during the auth exchange
         */
-        if (!ntv2_owf_gen(nt_hash, user, domain, True, ntlm_v2_hash)) {
+        if (!ntv2_owf_gen(nt_hash, user, domain, False, ntlm_v2_hash)) {
                 return False;
         }

branches/samba-3.0/source/libsmb/trusts_util.c

@@ -42 +42 @@
 
         if (cli->auth.auth_type != PIPE_AUTH_TYPE_SCHANNEL) {
-                uint32 neg_flags = NETLOGON_NEG_AUTH2_FLAGS;
+                uint32 neg_flags = NETLOGON_NEG_SELECT_AUTH2_FLAGS;
 
                 result = rpccli_netlogon_setup_creds(cli, 

branches/samba-3.0/source/libsmb/unexpected.c

@@ -60 +60 @@
         len = build_packet(buf, p);
 
+        ZERO_STRUCT(key);       /* needed for potential alignment */
+
         key.packet_type = p->packet_type;
         key.timestamp = p->timestamp;
@@ -81 +83 @@
 {
         struct unexpected_key key;
+
+        if (kbuf.dsize != sizeof(key)) {
+                tdb_delete(ttdb, kbuf);
+        }
 
         memcpy(&key, kbuf.dptr, sizeof(key));
@@ -120 +126 @@
         struct unexpected_key key;
         struct packet_struct *p;
+
+        if (kbuf.dsize != sizeof(key)) {
+                return 0;
+        }
 
         memcpy(&key, kbuf.dptr, sizeof(key));