Changeset 745 for trunk/server/source4/utils/ntlm_auth.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/utils/ntlm_auth.c (modified) (20 diffs)

trunk/server/source4/utils/ntlm_auth.c

@@ -25 +25 @@
 #include "system/filesys.h"
 #include "lib/cmdline/popt_common.h"
-#include "lib/ldb/include/ldb.h"
+#include <ldb.h>
 #include "auth/credentials/credentials.h"
 #include "auth/gensec/gensec.h"
@@ -212 +212 @@
                 
                 nt_status = ntlm_password_check(mem_ctx, 
-                                                lp_lanman_auth(lp_ctx),
-                                                lp_ntlm_auth(lp_ctx),
+                                                lpcfg_lanman_auth(lp_ctx),
+                                                lpcfg_ntlm_auth(lp_ctx),
                                                 MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT |
                                                 MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT,
@@ -226 +226 @@
                 if (NT_STATUS_IS_OK(nt_status)) {
                         if (unix_name) {
-                                asprintf(unix_name, 
-                                         "%s%c%s", domain,
-                                         *lp_winbind_separator(lp_ctx), 
-                                         username);
+                                if (asprintf(unix_name, "%s%c%s", domain,
+                                             *lpcfg_winbind_separator(lp_ctx),
+                                             username) < 0) {
+                                        nt_status = NT_STATUS_NO_MEMORY;
+                                }
                         }
                 } else {
@@ -477 +478 @@
 
                         nt_status = gensec_client_start(NULL, &state->gensec_state, ev, 
-                                                        lp_gensec_settings(NULL, lp_ctx));
+                                                        lpcfg_gensec_settings(NULL, lp_ctx));
                         if (!NT_STATUS_IS_OK(nt_status)) {
                                 talloc_free(mem_ctx);
@@ -490 +491 @@
                         struct auth_context *auth_context;
 
-                        msg = messaging_client_init(state, lp_messaging_path(state, lp_ctx), 
-                                                    lp_iconv_convenience(lp_ctx), ev);
+                        msg = messaging_client_init(state, lpcfg_messaging_path(state, lp_ctx), ev);
                         if (!msg) {
                                 talloc_free(mem_ctx);
@@ -501 +501 @@
                                                                 msg, 
                                                                 lp_ctx,
+                                                                NULL,
                                                                 &auth_context);
         
@@ -509 +510 @@
                         
                         if (!NT_STATUS_IS_OK(gensec_server_start(state, ev, 
-                                                                 lp_gensec_settings(state, lp_ctx), 
+                                                                 lpcfg_gensec_settings(state, lp_ctx),
                                                                  auth_context, &state->gensec_state))) {
                                 talloc_free(mem_ctx);
@@ -617 +618 @@
                         struct security_token *token = session_info->security_token; 
                         const char *sidstr = dom_sid_string(session_info, 
-                                                            token->sids[i]);
+                                                            &token->sids[i]);
                         grouplist = talloc_asprintf_append_buffer(grouplist, "%s,", sidstr);
                 }
@@ -647 +648 @@
 
         if (strncmp(buf, "GF", 2) == 0) {
-                struct gensec_ntlmssp_state *gensec_ntlmssp_state;
+                struct ntlmssp_state *ntlmssp_state;
                 uint32_t neg_flags;
 
-                gensec_ntlmssp_state = talloc_get_type(state->gensec_state->private_data, 
-                                struct gensec_ntlmssp_state);
-                neg_flags = gensec_ntlmssp_state->neg_flags;
+                ntlmssp_state = talloc_get_type(state->gensec_state->private_data,
+                                struct ntlmssp_state);
+                neg_flags = ntlmssp_state->neg_flags;
 
                 DEBUG(10, ("Requested negotiated feature flags\n"));
@@ -662 +663 @@
         
         /* don't leak 'bad password'/'no such user' info to the network client */
-        nt_status = auth_nt_status_squash(nt_status);
+        nt_status = nt_status_squash(nt_status);
 
         if (out.length) {
@@ -702 +703 @@
                         reply_code = "BH Failed to retrive session info";
                         reply_arg = nt_errstr(nt_status);
-                        DEBUG(1, ("GENSEC failed to retreive the session info: %s\n", nt_errstr(nt_status)));
+                        DEBUG(1, ("GENSEC failed to retrieve the session info: %s\n", nt_errstr(nt_status)));
                 } else {
 
                         reply_code = "AF";
                         reply_arg = talloc_asprintf(state->gensec_state, 
-                                                    "%s%s%s", session_info->server_info->domain_name, 
-                                                    lp_winbind_separator(lp_ctx), session_info->server_info->account_name);
+                                                    "%s%s%s", session_info->info->domain_name,
+                                                    lpcfg_winbind_separator(lp_ctx), session_info->info->account_name);
                         talloc_free(session_info);
                 }
@@ -760 +761 @@
                         /* handle this request as plaintext */
                         if (!full_username) {
-                                if (asprintf(&full_username, "%s%c%s", domain, *lp_winbind_separator(lp_ctx), username) == -1) {
+                                if (asprintf(&full_username, "%s%c%s", domain, *lpcfg_winbind_separator(lp_ctx), username) < 0) {
                                         mux_printf(mux_id, "Error: Out of memory in asprintf!\n.\n");
                                         return;
@@ -785 +786 @@
                                 if (!parse_ntlm_auth_domain_user(full_username, &username, 
                                                                                                  &domain, 
-                                                                                                 *lp_winbind_separator(lp_ctx))) {
+                                                                                                 *lpcfg_winbind_separator(lp_ctx))) {
                                         /* username might be 'tainted', don't print into our new-line deleimianted stream */
                                         mux_printf(mux_id, "Error: Could not parse into domain and username\n");
@@ -792 +793 @@
 
                         if (!domain) {
-                                domain = smb_xstrdup(lp_workgroup(lp_ctx));
+                                domain = smb_xstrdup(lpcfg_workgroup(lp_ctx));
                         }
 
@@ -805 +806 @@
                                                              username, 
                                                               domain, 
-                                                              lp_netbios_name(lp_ctx),
+                                                              lpcfg_netbios_name(lp_ctx),
                                                               &challenge, 
                                                               &lm_response, 
@@ -933 +934 @@
 }
 
-static void manage_squid_request(struct loadparm_context *lp_ctx, enum stdio_helper_mode helper_mode, 
+static void manage_squid_request(struct loadparm_context *lp_ctx, enum stdio_helper_mode helper_mode,
                                  stdio_helper_function fn, void **private2) 
 {
@@ -1040 +1041 @@
 }
 
-static void squid_stream(struct loadparm_context *lp_ctx, 
+static void squid_stream(struct loadparm_context *lp_ctx,
                          enum stdio_helper_mode stdio_mode, 
                          stdio_helper_function fn) {
@@ -1133 +1134 @@
 
         if (opt_domain == NULL) {
-                opt_domain = lp_workgroup(cmdline_lp_ctx);
+                opt_domain = lpcfg_workgroup(cmdline_lp_ctx);
         }
 
@@ -1160 +1161 @@
 
         if (opt_workstation == NULL) {
-                opt_workstation = lp_netbios_name(cmdline_lp_ctx);
+                opt_workstation = lpcfg_netbios_name(cmdline_lp_ctx);
         }
 
@@ -1170 +1171 @@
                 char *user;
 
-                asprintf(&user, "%s%c%s", opt_domain, *lp_winbind_separator(cmdline_lp_ctx), opt_username);
+                if (asprintf(&user, "%s%c%s", opt_domain,
+                             *lpcfg_winbind_separator(cmdline_lp_ctx),
+                             opt_username) < 0) {
+                        return 1;
+                }
                 if (!check_plaintext_auth(user, opt_password, true)) {
                         return 1;