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

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/auth

Files:

• auth_domain.c (modified) (2 diffs)
• auth_ntlmssp.c (modified) (1 diff)
• auth_server.c (modified) (1 diff)
• auth_util.c (modified) (1 diff)

branches/samba-3.0/source/auth/auth_domain.c

@@ -126 +126 @@
         if (!lp_client_schannel()) {
                 /* We need to set up a creds chain on an unauthenticated netlogon pipe. */
-                uint32 neg_flags = NETLOGON_NEG_AUTH2_FLAGS;
+                uint32 neg_flags = NETLOGON_NEG_SELECT_AUTH2_FLAGS;
                 uint32 sec_chan_type = 0;
                 unsigned char machine_pwd[16];
-
-                if (!get_trust_pw(domain, machine_pwd, &sec_chan_type)) {
+                const char *account_name;
+
+                if (!get_trust_pw_hash(domain, machine_pwd, &account_name,
+                                       &sec_chan_type))
+                {
                         DEBUG(0, ("connect_to_domain_password_server: could not fetch "
                         "trust account password for domain '%s'\n",
@@ -144 +147 @@
                                         domain, /* domain */
                                         global_myname(), /* client name */
-                                        global_myname(), /* machine account name */
+                                        account_name, /* machine account name */
                                         machine_pwd,
                                         sec_chan_type,

branches/samba-3.0/source/auth/auth_ntlmssp.c

@@ -188 +188 @@
 void auth_ntlmssp_end(AUTH_NTLMSSP_STATE **auth_ntlmssp_state)
 {
-        TALLOC_CTX *mem_ctx = (*auth_ntlmssp_state)->mem_ctx;
+        TALLOC_CTX *mem_ctx;
+
+        if (*auth_ntlmssp_state == NULL) {
+                return;
+        }
+
+        mem_ctx = (*auth_ntlmssp_state)->mem_ctx;
 
         if ((*auth_ntlmssp_state)->ntlmssp_state) {

branches/samba-3.0/source/auth/auth_server.c

@@ -72 +72 @@
 
                 if (!grab_server_mutex(desthost)) {
+                        cli_shutdown(cli);
                         return NULL;
                 }

branches/samba-3.0/source/auth/auth_util.c

@@ -812 +812 @@
         }
         fstr_sprintf( root_name, "%s\\root", get_global_sam_name() );
-        ret = lookup_name( ctx, root_name, 0, NULL, NULL, &root_sid, &type );
+        ret = lookup_name( ctx, root_name, LOOKUP_NAME_DOMAIN, NULL, NULL, &root_sid, &type );
         TALLOC_FREE( ctx );