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

Timestamp:

Jul 11, 2008, 1:13:42 AM (17 years ago)

Author:

Paul Smedley

Message:

Update branch to 3.0.31 release

Location:

branches/samba-3.0/source/libsmb

Files:

• asn1.c (modified) (1 diff)
• cliconnect.c (modified) (8 diffs)
• clierror.c (modified) (1 diff)
• namequery.c (modified) (7 diffs)
• smbencrypt.c (modified) (1 diff)

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

@@ -397 +397 @@
         if (strcmp(id, OID) != 0) {
                 data->has_error = True;
+                free(id);
                 return False;
         }

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;
                 }
 

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

@@ -235 +235 @@
         {NT_STATUS_ACCESS_DENIED, EACCES},
         {NT_STATUS_OBJECT_NAME_NOT_FOUND, ENOENT},
+        {NT_STATUS_OBJECT_PATH_NOT_FOUND, ENOENT},
         {NT_STATUS_SHARING_VIOLATION, EBUSY},
         {NT_STATUS_OBJECT_PATH_INVALID, ENOTDIR},

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

@@ -1429 +1429 @@
         BOOL done_auto_lookup = False;
         int auto_count = 0;
+        NTSTATUS status;
+
+        *ip_list = NULL;
+        *count = 0;
 
         *ordered = False;
@@ -1481 +1485 @@
                 if (internal_resolve_name(domain, 0x1C, sitename, ip_list, count,
                                           resolve_order)) {
-                        return NT_STATUS_OK;
+                        status = NT_STATUS_OK;
+                        goto out;
                 } else {
-                        return NT_STATUS_NO_LOGON_SERVERS;
+                        status = NT_STATUS_NO_LOGON_SERVERS;
+                        goto out;
                 }
         }
@@ -1498 +1504 @@
         p = pserver;
         while (next_token(&p,name,LIST_SEP,sizeof(name))) {
-                if (strequal(name, "*")) {
+                if (!done_auto_lookup && strequal(name, "*")) {
                         if (internal_resolve_name(domain, 0x1C, sitename, &auto_ip_list,
                                                   &auto_count, resolve_order))
@@ -1515 +1521 @@
                 if ( done_auto_lookup ) {
                         DEBUG(4,("get_dc_list: no servers found\n")); 
-                        SAFE_FREE(auto_ip_list);
-                        return NT_STATUS_NO_LOGON_SERVERS;
+                        status = NT_STATUS_NO_LOGON_SERVERS;
+                        goto out;
                 }
                 if (internal_resolve_name(domain, 0x1C, sitename, ip_list, count,
                                           resolve_order)) {
-                        return NT_STATUS_OK;
+                        status = NT_STATUS_OK;
+                        goto out;
                 } else {
-                        return NT_STATUS_NO_LOGON_SERVERS;
+                        status = NT_STATUS_NO_LOGON_SERVERS;
+                        goto out;
                 }
         }
@@ -1528 +1536 @@
         if ( (return_iplist = SMB_MALLOC_ARRAY(struct ip_service, num_addresses)) == NULL ) {
                 DEBUG(3,("get_dc_list: malloc fail !\n"));
-                SAFE_FREE(auto_ip_list);
-                return NT_STATUS_NO_MEMORY;
+                status = NT_STATUS_NO_MEMORY;
+                goto out;
         }
 
@@ -1586 +1594 @@
         }
                                 
-        SAFE_FREE(auto_ip_list);
-
         /* need to remove duplicates in the list if we have any 
            explicit password servers */
@@ -1607 +1613 @@
         *count = local_count;
 
-        return ( *count != 0 ? NT_STATUS_OK : NT_STATUS_NO_LOGON_SERVERS );
+        status = ( *count != 0 ? NT_STATUS_OK : NT_STATUS_NO_LOGON_SERVERS );
+
+  out:
+
+        if (!NT_STATUS_IS_OK(status)) {
+                SAFE_FREE(return_iplist);
+                *ip_list = NULL;
+                *count = 0;
+        }
+
+        SAFE_FREE(auto_ip_list);
+
+        return status;
 }
 

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

@@ -183 +183 @@
         if (domain_byte_len == (size_t)-1) {
                 DEBUG(0, ("push_uss2_allocate() for domain returned -1 (probably malloc() failure)\n"));
+                SAFE_FREE(user);
                 return False;
         }