Changeset 140 for branches/samba-3.0/source/libsmb/cliconnect.c

Timestamp:

07/11/08 01:13:42 (5 months ago)

Author:

psmedley

Message:

Update branch to 3.0.31 release

Files:

• branches/samba-3.0/source/libsmb/cliconnect.c (modified) (8 diffs)

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

@@ -788 +788 @@
 /****************************************************************************
  Do a spnego encrypted session setup.
+
+ user_domain: The shortname of the domain the user/machine is a member of.
+ dest_realm: The realm we're connecting to, if NULL we use our default realm.
 ****************************************************************************/
 
 ADS_STATUS cli_session_setup_spnego(struct cli_state *cli, const char *user, 
-                              const char *pass, const char *domain)
-{
-        char *principal;
+                              const char *pass, const char *user_domain,
+                              const char * dest_realm)
+{
+        char *principal = NULL;
         char *OIDs[ASN1_MAX_OIDS];
         int i;
@@ -814 +818 @@
         blob = data_blob(cli->secblob.data+16, cli->secblob.length-16);
 
-        /* the server sent us the first part of the SPNEGO exchange in the negprot 
-           reply */
+        /* The server sent us the first part of the SPNEGO exchange in the
+         * negprot reply. It is WRONG to depend on the principal sent in the
+         * negprot reply, but right now we do it. If we don't receive one,
+         * we try to best guess, then fall back to NTLM.  */
         if (!spnego_parse_negTokenInit(blob, OIDs, &principal)) {
                 data_blob_free(&blob);
@@ -833 +839 @@
 
         DEBUG(3,("got principal=%s\n", principal ? principal : "<null>"));
-
-        if (got_kerberos_mechanism && (principal == NULL)) {
-                /*
-                 * It is WRONG to depend on the principal sent in the negprot
-                 * reply, but right now we do it. So for safety (don't
-                 * segfault later) disable Kerberos when no principal was
-                 * sent. -- VL
-                 */
-                DEBUG(1, ("Kerberos mech was offered, but no principal was "
-                          "sent, disabling Kerberos\n"));
-                cli->use_kerberos = False;
-        }
 
         fstrcpy(cli->user_name, user);
@@ -897 +891 @@
                         }
 
-                        realm = kerberos_get_default_realm_from_ccache();
+                        if (dest_realm) {
+                                realm = SMB_STRDUP(dest_realm);
+                                strupper_m(realm);
+                        } else {
+                                realm = kerberos_get_default_realm_from_ccache();
+                        }
                         if (realm && *realm) {
                                 if (asprintf(&principal, "%s$@%s",
@@ -914 +913 @@
 
                 if (principal) {
-                        rc = cli_session_setup_kerberos(cli, principal, domain);
+                        rc = cli_session_setup_kerberos(cli, principal,
+                                dest_realm);
                         if (ADS_ERR_OK(rc) || !cli->fallback_after_kerberos) {
                                 SAFE_FREE(principal);
@@ -927 +927 @@
 ntlmssp:
 
-        return ADS_ERROR_NT(cli_session_setup_ntlmssp(cli, user, pass, domain));
+        return ADS_ERROR_NT(cli_session_setup_ntlmssp(cli, user, pass,
+                user_domain));
 }
 
@@ -1010 +1011 @@
 
         if (cli->capabilities & CAP_EXTENDED_SECURITY) {
-                ADS_STATUS status = cli_session_setup_spnego(cli, user, pass, workgroup);
+                ADS_STATUS status = cli_session_setup_spnego(cli, user, pass,
+                                                             workgroup, NULL);
                 if (!ADS_ERR_OK(status)) {
                         DEBUG(3, ("SPNEGO login failed: %s\n", ads_errstr(status)));
@@ -1329 +1331 @@
                         SAFE_FREE(cli->outbuf);
                         SAFE_FREE(cli->inbuf);
-                        cli->outbuf = (char *)SMB_MALLOC(CLI_SAMBA_MAX_LARGE_READX_SIZE+SAFETY_MARGIN);
-                        cli->inbuf = (char *)SMB_MALLOC(CLI_SAMBA_MAX_LARGE_READX_SIZE+SAFETY_MARGIN);
-                        cli->bufsize = CLI_SAMBA_MAX_LARGE_READX_SIZE;
+                        cli->outbuf = (char *)SMB_MALLOC(CLI_SAMBA_MAX_LARGE_READX_SIZE+LARGE_WRITEX_HDR_SIZE+SAFETY_MARGIN);
+                        cli->inbuf = (char *)SMB_MALLOC(CLI_SAMBA_MAX_LARGE_READX_SIZE+LARGE_WRITEX_HDR_SIZE+SAFETY_MARGIN);
+                        cli->bufsize = CLI_SAMBA_MAX_LARGE_READX_SIZE + LARGE_WRITEX_HDR_SIZE;
                 }