s3-talloc Change TALLOC_ZERO_P() to talloc_zero()

[nivanova/samba-autobuild/.git] / source3 / auth / auth_script.c

diff --git a/source3/auth/auth_script.c b/source3/auth/auth_script.c
index 81c80eb4fbdd1f85aa6c3fbb2061410ff3a124aa..4432ff4aecc5edbbe90af93ad173878fd3c94761 100644 (file)
--- a/source3/auth/auth_script.c
+++ b/source3/auth/auth_script.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "auth.h"
 
 #undef malloc
 
@@ -62,8 +63,8 @@ static NTSTATUS script_check_user_credentials(const struct auth_context *auth_co
                return NT_STATUS_INVALID_PARAMETER;
        }               
 
-       secret_str_len = strlen(user_info->domain) + 1 +
-                       strlen(user_info->smb_name) + 1 +
+       secret_str_len = strlen(user_info->mapped.domain_name) + 1 +
+                       strlen(user_info->client.account_name) + 1 +
                        16 + 1 + /* 8 bytes of challenge going to 16 */
                        48 + 1 + /* 24 bytes of challenge going to 48 */
                        48 + 1;
@@ -73,32 +74,32 @@ static NTSTATUS script_check_user_credentials(const struct auth_context *auth_co
                return NT_STATUS_NO_MEMORY;
        }
 
-       safe_strcpy( secret_str, user_info->domain, secret_str_len - 1);
-       safe_strcat( secret_str, "\n", secret_str_len - 1);
-       safe_strcat( secret_str, user_info->smb_name, secret_str_len - 1);
-       safe_strcat( secret_str, "\n", secret_str_len - 1);
+       strlcpy( secret_str, user_info->mapped.domain_name, secret_str_len);
+       strlcat( secret_str, "\n", secret_str_len);
+       strlcat( secret_str, user_info->client.account_name, secret_str_len);
+       strlcat( secret_str, "\n", secret_str_len);
 
        for (i = 0; i < 8; i++) {
                slprintf(&hex_str[i*2], 3, "%02X", auth_context->challenge.data[i]);
        }
-       safe_strcat( secret_str, hex_str, secret_str_len - 1);
-       safe_strcat( secret_str, "\n", secret_str_len - 1);
+       strlcat( secret_str, hex_str, secret_str_len);
+       strlcat( secret_str, "\n", secret_str_len);
 
-       if (user_info->lm_resp.data) {
+       if (user_info->password.response.lanman.data) {
                for (i = 0; i < 24; i++) {
-                       slprintf(&hex_str[i*2], 3, "%02X", user_info->lm_resp.data[i]);
+                       slprintf(&hex_str[i*2], 3, "%02X", user_info->password.response.lanman.data[i]);
                }
-               safe_strcat( secret_str, hex_str, secret_str_len - 1);
+               strlcat( secret_str, hex_str, secret_str_len);
        }
-       safe_strcat( secret_str, "\n", secret_str_len - 1);
+       strlcat( secret_str, "\n", secret_str_len);
 
-       if (user_info->nt_resp.data) {
+       if (user_info->password.response.nt.data) {
                for (i = 0; i < 24; i++) {
-                       slprintf(&hex_str[i*2], 3, "%02X", user_info->nt_resp.data[i]);
+                       slprintf(&hex_str[i*2], 3, "%02X", user_info->password.response.nt.data[i]);
                }
-               safe_strcat( secret_str, hex_str, secret_str_len - 1);
+               strlcat( secret_str, hex_str, secret_str_len);
        }
-       safe_strcat( secret_str, "\n", secret_str_len - 1);
+       strlcat( secret_str, "\n", secret_str_len);
 
        DEBUG(10,("script_check_user_credentials: running %s with parameters:\n%s\n",
                script, secret_str ));
@@ -109,7 +110,7 @@ static NTSTATUS script_check_user_credentials(const struct auth_context *auth_co
 
        if (ret) {
                DEBUG(1,("script_check_user_credentials: failed to authenticate %s\\%s\n",
-                       user_info->domain, user_info->smb_name ));
+                       user_info->mapped.domain_name, user_info->client.account_name ));
                /* auth failed. */
                return NT_STATUS_NO_SUCH_USER;
        }
@@ -123,7 +124,7 @@ static NTSTATUS auth_init_script(struct auth_context *auth_context, const char *
 {
        struct auth_methods *result;
 
-       result = TALLOC_ZERO_P(auth_context, struct auth_methods);
+       result = talloc_zero(auth_context, struct auth_methods);
        if (result == NULL) {
                return NT_STATUS_NO_MEMORY;
        }