s4:auth: Reformat function calls

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c
index 3c48c77ec5b09868cb9dbc42fb6caf6cf5cc6d90..8c01b5a5083a619ca9096133bea59522b91f5444 100644 (file)
--- a/source4/auth/ntlm/auth.c
+++ b/source4/auth/ntlm/auth.c
@@ -558,9 +558,12 @@ static NTSTATUS auth_generate_session_info_wrapper(struct auth4_context *auth_co
                session_info_flags |= AUTH_SESSION_INFO_AUTHENTICATED;
        }
 
-       status = auth_generate_session_info(mem_ctx, auth_context->lp_ctx,
-                                           auth_context->sam_ctx, user_info_dc,
-                                           session_info_flags, session_info);
+       status = auth_generate_session_info(mem_ctx,
+                                           auth_context->lp_ctx,
+                                           auth_context->sam_ctx,
+                                           user_info_dc,
+                                           session_info_flags,
+                                           session_info);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }

diff --git a/source4/auth/session.c b/source4/auth/session.c
index 61e3d7ca0219636f5f57251037ed2ddc8875fc49..7d03dc77403ac87a203dd78e63c58ed881b67cc0 100644 (file)
--- a/source4/auth/session.c
+++ b/source4/auth/session.c
@@ -431,7 +431,8 @@ NTSTATUS authsam_get_session_info_principal(TALLOC_CTX *mem_ctx,
        }
 
        nt_status = auth_generate_session_info(tmp_ctx, lp_ctx, sam_ctx,
-                                              user_info_dc, session_info_flags,
+                                              user_info_dc,
+                                              session_info_flags,
                                               session_info);
 
        if (NT_STATUS_IS_OK(nt_status)) {

diff --git a/source4/auth/system_session.c b/source4/auth/system_session.c
index 17773776fb5e4dad2f5a6a90c21ab42d2791fc2e..31a45174f0ff9655bb9e27f84207b7b86028ad90 100644 (file)
--- a/source4/auth/system_session.c
+++ b/source4/auth/system_session.c
@@ -92,7 +92,12 @@ NTSTATUS auth_system_session_info(TALLOC_CTX *parent_ctx,
        }
 
        /* references the user_info_dc into the session_info */
-       nt_status = auth_generate_session_info(parent_ctx, lp_ctx, NULL, user_info_dc, AUTH_SESSION_INFO_SIMPLE_PRIVILEGES, &session_info);
+       nt_status = auth_generate_session_info(parent_ctx,
+                                              lp_ctx,
+                                              NULL /* sam_ctx */,
+                                              user_info_dc,
+                                              AUTH_SESSION_INFO_SIMPLE_PRIVILEGES,
+                                              &session_info);
        talloc_free(mem_ctx);
 
        NT_STATUS_NOT_OK_RETURN(nt_status);
@@ -369,15 +374,20 @@ static NTSTATUS auth_domain_admin_session_info(TALLOC_CTX *parent_ctx,
 
        NT_STATUS_HAVE_NO_MEMORY(mem_ctx);
 
-       nt_status = auth_domain_admin_user_info_dc(mem_ctx, lpcfg_netbios_name(lp_ctx),
-                                                 lpcfg_workgroup(lp_ctx), domain_sid,
-                                                 &user_info_dc);
+       nt_status = auth_domain_admin_user_info_dc(mem_ctx,
+                                                  lpcfg_netbios_name(lp_ctx),
+                                                  lpcfg_workgroup(lp_ctx),
+                                                  domain_sid,
+                                                  &user_info_dc);
        if (!NT_STATUS_IS_OK(nt_status)) {
                talloc_free(mem_ctx);
                return nt_status;
        }
 
-       nt_status = auth_generate_session_info(mem_ctx, lp_ctx, NULL, user_info_dc,
+       nt_status = auth_generate_session_info(mem_ctx,
+                                              lp_ctx,
+                                              NULL /* sam_ctx */,
+                                              user_info_dc,
                                               AUTH_SESSION_INFO_SIMPLE_PRIVILEGES|AUTH_SESSION_INFO_AUTHENTICATED|AUTH_SESSION_INFO_DEFAULT_GROUPS,
                                               session_info);
        /* There is already a reference between the session_info and user_info_dc */
@@ -417,15 +427,20 @@ _PUBLIC_ NTSTATUS auth_anonymous_session_info(TALLOC_CTX *parent_ctx,
        }
        
        nt_status = auth_anonymous_user_info_dc(mem_ctx,
-                                              lpcfg_netbios_name(lp_ctx),
-                                              &user_info_dc);
+                                               lpcfg_netbios_name(lp_ctx),
+                                               &user_info_dc);
        if (!NT_STATUS_IS_OK(nt_status)) {
                talloc_free(mem_ctx);
                return nt_status;
        }
 
        /* references the user_info_dc into the session_info */
-       nt_status = auth_generate_session_info(parent_ctx, lp_ctx, NULL, user_info_dc, AUTH_SESSION_INFO_SIMPLE_PRIVILEGES, &session_info);
+       nt_status = auth_generate_session_info(parent_ctx,
+                                              lp_ctx,
+                                              NULL /* sam_ctx */,
+                                              user_info_dc,
+                                              AUTH_SESSION_INFO_SIMPLE_PRIVILEGES,
+                                              &session_info);
        talloc_free(mem_ctx);
 
        NT_STATUS_NOT_OK_RETURN(nt_status);