s4:torture:basic:misc: fix O3 error unused result of asprintf

[sfrench/samba-autobuild/.git] / auth / auth_sam_reply.c

diff --git a/auth/auth_sam_reply.c b/auth/auth_sam_reply.c
index 1644278bf0435efc8a6c3f60bcd5b1ed4be86694..4ede02cb9c5dbf2fed09c67af9d6d54332cc473b 100644 (file)
--- a/auth/auth_sam_reply.c
+++ b/auth/auth_sam_reply.c
@@ -59,9 +59,9 @@ NTSTATUS auth_convert_user_info_dc_sambaseinfo(TALLOC_CTX *mem_ctx,
 
        info = user_info_dc->info;
 
-       sam->last_logon = info->last_logon;
-       sam->last_logoff =  info->last_logoff;
-       sam->acct_expiry = info->acct_expiry;
+       sam->logon_time = info->last_logon;
+       sam->logoff_time =  info->last_logoff;
+       sam->kickoff_time = info->acct_expiry;
        sam->last_password_change = info->last_password_change;
        sam->allow_password_change = info->allow_password_change;
        sam->force_password_change = info->force_password_change;
@@ -107,9 +107,12 @@ NTSTATUS auth_convert_user_info_dc_sambaseinfo(TALLOC_CTX *mem_ctx,
        }
        sam->acct_flags = user_info_dc->info->acct_flags;
        sam->logon_server.string = user_info_dc->info->logon_server;
-       sam->domain.string = user_info_dc->info->domain_name;
-
-       ZERO_STRUCT(sam->unknown);
+       sam->logon_domain.string = user_info_dc->info->domain_name;
+       sam->sub_auth_status = 0;
+       sam->last_successful_logon = 0;
+       sam->last_failed_logon = 0;
+       sam->failed_logon_count = 0;
+       sam->reserved = 0;
 
        ZERO_STRUCT(sam->key);
        if (user_info_dc->user_session_key.length == sizeof(sam->key.key)) {
@@ -151,7 +154,10 @@ NTSTATUS auth_convert_user_info_dc_saminfo3(TALLOC_CTX *mem_ctx,
 
        sam3->sids = talloc_array(sam, struct netr_SidAttr,
                                  user_info_dc->num_sids);
-       NT_STATUS_HAVE_NO_MEMORY_AND_FREE(sam3->sids, sam3);
+       if (sam3->sids == NULL) {
+               TALLOC_FREE(sam3);
+               return NT_STATUS_NO_MEMORY;
+       }
 
        /* We don't put the user and group SIDs in there */
        for (i=2; i<user_info_dc->num_sids; i++) {
@@ -159,7 +165,10 @@ NTSTATUS auth_convert_user_info_dc_saminfo3(TALLOC_CTX *mem_ctx,
                        continue;
                }
                sam3->sids[sam3->sidcount].sid = dom_sid_dup(sam3->sids, &user_info_dc->sids[i]);
-               NT_STATUS_HAVE_NO_MEMORY_AND_FREE(sam3->sids[sam3->sidcount].sid, sam3);
+               if (sam3->sids[sam3->sidcount].sid == NULL) {
+                       TALLOC_FREE(sam3);
+                       return NT_STATUS_NO_MEMORY;
+               }
                sam3->sids[sam3->sidcount].attributes =
                        SE_GROUP_MANDATORY | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_ENABLED;
                sam3->sidcount += 1;
@@ -192,22 +201,44 @@ NTSTATUS make_user_info_SamBaseInfo(TALLOC_CTX *mem_ctx,
        NT_STATUS_HAVE_NO_MEMORY(info);
 
        if (base->account_name.string) {
-               info->account_name = talloc_reference(info, base->account_name.string);
+               info->account_name = talloc_strdup(info, base->account_name.string);
        } else {
                info->account_name = talloc_strdup(info, account_name);
-               NT_STATUS_HAVE_NO_MEMORY(info->account_name);
        }
+       NT_STATUS_HAVE_NO_MEMORY(info->account_name);
 
-       info->domain_name = talloc_reference(info, base->domain.string);
-       info->full_name = talloc_reference(info, base->full_name.string);
-       info->logon_script = talloc_reference(info, base->logon_script.string);
-       info->profile_path = talloc_reference(info, base->profile_path.string);
-       info->home_directory = talloc_reference(info, base->home_directory.string);
-       info->home_drive = talloc_reference(info, base->home_drive.string);
-       info->logon_server = talloc_reference(info, base->logon_server.string);
-       info->last_logon = base->last_logon;
-       info->last_logoff = base->last_logoff;
-       info->acct_expiry = base->acct_expiry;
+       if (base->logon_domain.string) {
+               info->domain_name = talloc_strdup(info, base->logon_domain.string);
+               NT_STATUS_HAVE_NO_MEMORY(info->domain_name);
+       }
+
+       if (base->full_name.string) {
+               info->full_name = talloc_strdup(info, base->full_name.string);
+               NT_STATUS_HAVE_NO_MEMORY(info->full_name);
+       }
+       if (base->logon_script.string) {
+               info->logon_script = talloc_strdup(info, base->logon_script.string);
+               NT_STATUS_HAVE_NO_MEMORY(info->logon_script);
+       }
+       if (base->profile_path.string) {
+               info->profile_path = talloc_strdup(info, base->profile_path.string);
+               NT_STATUS_HAVE_NO_MEMORY(info->profile_path);
+       }
+       if (base->home_directory.string) {
+               info->home_directory = talloc_strdup(info, base->home_directory.string);
+               NT_STATUS_HAVE_NO_MEMORY(info->home_directory);
+       }
+       if (base->home_drive.string) {
+               info->home_drive = talloc_strdup(info, base->home_drive.string);
+               NT_STATUS_HAVE_NO_MEMORY(info->home_drive);
+       }
+       if (base->logon_server.string) {
+               info->logon_server = talloc_strdup(info, base->logon_server.string);
+               NT_STATUS_HAVE_NO_MEMORY(info->logon_server);
+       }
+       info->last_logon = base->logon_time;
+       info->last_logoff = base->logoff_time;
+       info->acct_expiry = base->kickoff_time;
        info->last_password_change = base->last_password_change;
        info->allow_password_change = base->allow_password_change;
        info->force_password_change = base->force_password_change;
@@ -215,7 +246,8 @@ NTSTATUS make_user_info_SamBaseInfo(TALLOC_CTX *mem_ctx,
        info->bad_password_count = base->bad_password_count;
        info->acct_flags = base->acct_flags;
 
-       info->authenticated = authenticated;
+       /* Only set authenticated if both NETLOGON_GUEST is not set, and authenticated is set */
+       info->authenticated = (authenticated && (!(base->user_flags & NETLOGON_GUEST)));
 
        *_user_info = info;
        return NT_STATUS_OK;
@@ -403,7 +435,10 @@ NTSTATUS make_user_info_dc_pac(TALLOC_CTX *mem_ctx,
                sidcount = user_info_dc->num_sids + pac_logon_info->res_groups.count;
                user_info_dc->sids
                        = talloc_realloc(user_info_dc, user_info_dc->sids, struct dom_sid, sidcount);
-               NT_STATUS_HAVE_NO_MEMORY_AND_FREE(user_info_dc->sids, user_info_dc);
+               if (user_info_dc->sids == NULL) {
+                       TALLOC_FREE(user_info_dc);
+                       return NT_STATUS_NO_MEMORY;
+               }
 
                for (i = 0; pac_logon_info->res_group_dom_sid && i < pac_logon_info->res_groups.count; i++) {
                        user_info_dc->sids[user_info_dc->num_sids] = *pac_logon_info->res_group_dom_sid;