Changeset 745 for trunk/server/source3/auth/auth_wbc.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)
• source3/auth/auth_wbc.c (modified) (7 diffs)

trunk/server/source3/auth/auth_wbc.c

@@ -39 +39 @@
 
 #include "includes.h"
+#include "auth.h"
+#include "nsswitch/libwbclient/wbclient.h"
 
 #undef DBGC_CLASS
@@ -48 +50 @@
                                        void *my_private_data,
                                        TALLOC_CTX *mem_ctx,
-                                       const auth_usersupplied_info *user_info,
-                                       auth_serversupplied_info **server_info)
+                                       const struct auth_usersupplied_info *user_info,
+                                       struct auth_serversupplied_info **server_info)
 {
         NTSTATUS nt_status;
@@ -60 +62 @@
                 return NT_STATUS_INVALID_PARAMETER;
         }
+
+        ZERO_STRUCT(params);
+
         /* Send off request */
 
-        params.account_name     = user_info->smb_name;
-        params.domain_name      = user_info->domain;
-        params.workstation_name = user_info->wksta_name;
+        DEBUG(10, ("Check auth for: [%s]", user_info->mapped.account_name));
+
+        params.account_name     = user_info->client.account_name;
+        params.domain_name      = user_info->mapped.domain_name;
+        params.workstation_name = user_info->workstation_name;
 
         params.flags            = 0;
@@ -70 +77 @@
 
         /* Handle plaintext */
-        if (!user_info->encrypted) {
+        switch (user_info->password_state) {
+        case AUTH_PASSWORD_PLAIN:
+        {
                 DEBUG(3,("Checking plaintext password for %s.\n",
-                         user_info->internal_username));
+                         user_info->mapped.account_name));
                 params.level = WBC_AUTH_USER_LEVEL_PLAIN;
 
-                params.password.plaintext = (char *)user_info->plaintext_password.data;
-        } else {
+                params.password.plaintext = user_info->password.plaintext;
+                break;
+        }
+        case AUTH_PASSWORD_RESPONSE:
+        case AUTH_PASSWORD_HASH:
+        {
                 DEBUG(3,("Checking encrypted password for %s.\n",
-                         user_info->internal_username));
+                         user_info->mapped.account_name));
                 params.level = WBC_AUTH_USER_LEVEL_RESPONSE;
 
@@ -85 +98 @@
                     sizeof(params.password.response.challenge));
 
-                params.password.response.nt_length = user_info->nt_resp.length;
-                params.password.response.nt_data = user_info->nt_resp.data;
-                params.password.response.lm_length = user_info->lm_resp.length;
-                params.password.response.lm_data = user_info->lm_resp.data;
+                if (user_info->password.response.nt.length != 0) {
+                        params.password.response.nt_length =
+                                user_info->password.response.nt.length;
+                        params.password.response.nt_data =
+                                user_info->password.response.nt.data;
+                }
+                if (user_info->password.response.lanman.length != 0) {
+                        params.password.response.lm_length =
+                                user_info->password.response.lanman.length;
+                        params.password.response.lm_data =
+                                user_info->password.response.lanman.data;
+                }
+                break;
+        }
+        default:
+                DEBUG(0,("user_info constructed for user '%s' was invalid - password_state=%u invalid.\n",user_info->mapped.account_name, user_info->password_state));
+                return NT_STATUS_INTERNAL_ERROR;
+#if 0 /* If ever implemented in libwbclient */
+        case AUTH_PASSWORD_HASH:
+        {
+                DEBUG(3,("Checking logon (hash) password for %s.\n",
+                         user_info->mapped.account_name));
+                params.level = WBC_AUTH_USER_LEVEL_HASH;
 
+                if (user_info->password.hash.nt) {
+                        memcpy(params.password.hash.nt_hash, user_info->password.hash.nt, sizeof(* user_info->password.hash.nt));
+                } else {
+                        memset(params.password.hash.nt_hash, '\0', sizeof(params.password.hash.nt_hash));
+                }
+
+                if (user_info->password.hash.lanman) {
+                        memcpy(params.password.hash.lm_hash, user_info->password.hash.lanman, sizeof(* user_info->password.hash.lanman));
+                } else {
+                        memset(params.password.hash.lm_hash, '\0', sizeof(params.password.hash.lm_hash));
+                }
+
+        }
+#endif
         }
 
@@ -119 +165 @@
 
         nt_status = make_server_info_wbcAuthUserInfo(mem_ctx,
-                                                     user_info->smb_name,
-                                                     user_info->domain,
+                                                     user_info->client.account_name,
+                                                     user_info->mapped.domain_name,
                                                      info, server_info);
         wbcFreeMemory(info);
@@ -135 +181 @@
 static NTSTATUS auth_init_wbc(struct auth_context *auth_context, const char *param, auth_methods **auth_method)
 {
-        if (!make_auth_methods(auth_context, auth_method)) {
+        struct auth_methods *result;
+
+        result = TALLOC_ZERO_P(auth_context, struct auth_methods);
+        if (result == NULL) {
                 return NT_STATUS_NO_MEMORY;
         }
+        result->name = "wbc";
+        result->auth = check_wbc_security;
 
-        (*auth_method)->name = "wbc";
-        (*auth_method)->auth = check_wbc_security;
-
+        *auth_method = result;
         return NT_STATUS_OK;
 }