Changeset 165 for branches/samba-3.0/source/utils

Timestamp:

Mar 11, 2009, 9:14:55 AM (16 years ago)

Author:

Paul Smedley

Message:

Add 'missing' 3.0.34 diffs

Location:

branches/samba-3.0/source/utils

Files:

• net_ads.c (modified) (2 diffs)
• net_rpc.c (modified) (1 diff)
• ntlm_auth.c (modified) (1 diff)
• smbtree.c (modified) (3 diffs)

branches/samba-3.0/source/utils/net_ads.c

@@ -307 +307 @@
                 tried_closest_dc = True; /* avoid loop */
 
-                if (!ads->config.tried_closest_dc) {
+                if (!ads_closest_dc(ads)) {
 
                         namecache_delete(ads->server.realm, 0x1C);
@@ -1575 +1575 @@
                 goto fail;
         }
+
+        saf_join_store(ads->server.workgroup, ads->config.ldap_server_name);
+        saf_join_store(ads->server.realm, ads->config.ldap_server_name);
 
         /* Verify that everything is ok */

branches/samba-3.0/source/utils/net_rpc.c

@@ -228 +228 @@
 int net_rpc_changetrustpw(int argc, const char **argv) 
 {
+        net_use_machine_account();
+
         return run_rpc_command(NULL, PI_NETLOGON, NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC, 
                                rpc_changetrustpw_internals,

branches/samba-3.0/source/utils/ntlm_auth.c

@@ -351 +351 @@
 
         if (nt_response && nt_response->length) {
-                memcpy(request.data.auth_crap.nt_resp, 
-                       nt_response->data, 
-                       MIN(nt_response->length, sizeof(request.data.auth_crap.nt_resp)));
+                if (nt_response->length > sizeof(request.data.auth_crap.nt_resp)) {
+                        request.flags = request.flags | WBFLAG_BIG_NTLMV2_BLOB;
+                        request.extra_len = nt_response->length;
+                        request.extra_data.data = SMB_MALLOC_ARRAY(char, request.extra_len);
+                        if (request.extra_data.data == NULL) {
+                                return NT_STATUS_NO_MEMORY;
+                        }
+                        memcpy(request.extra_data.data, nt_response->data,
+                               nt_response->length);
+
+                } else {
+                        memcpy(request.data.auth_crap.nt_resp,
+                               nt_response->data, nt_response->length);
+                }
                 request.data.auth_crap.nt_resp_len = nt_response->length;
         }
-        
+
         result = winbindd_request_response(WINBINDD_PAM_AUTH_CRAP, &request, &response);
+        SAFE_FREE(request.extra_data.data);
 
         /* Display response */

branches/samba-3.0/source/utils/smbtree.c

@@ -32 +32 @@
 /* Holds a list of workgroups or servers */
 
-struct name_list {
-        struct name_list *prev, *next;
+struct smb_name_list {
+        struct smb_name_list *prev, *next;
         pstring name, comment;
         uint32 server_type;
 };
 
-static struct name_list *workgroups, *servers, *shares;
-
-static void free_name_list(struct name_list *list)
+static struct smb_name_list *workgroups, *servers, *shares;
+
+static void free_name_list(struct smb_name_list *list)
 {
         while(list)
@@ -49 +49 @@
                      const char *comment, void *state)
 {
-        struct name_list **name_list = (struct name_list **)state;
-        struct name_list *new_name;
-
-        new_name = SMB_MALLOC_P(struct name_list);
+        struct smb_name_list **name_list = (struct smb_name_list **)state;
+        struct smb_name_list *new_name;
+
+        new_name = SMB_MALLOC_P(struct smb_name_list);
 
         if (!new_name)
@@ -200 +200 @@
 static BOOL print_tree(struct user_auth_info *user_info)
 {
-        struct name_list *wg, *sv, *sh;
+        struct smb_name_list *wg, *sv, *sh;
 
         /* List workgroups */