s3: Remove the typedef for "auth_usersupplied_info"

diff --git a/source3/auth/auth_builtin.c b/source3/auth/auth_builtin.c
index 3741f29779b361ac9a666f4d535aa12516e537d8..dbd7937e376ae65672f2d60e45ed4e4d3998ebd6 100644 (file)
--- a/source3/auth/auth_builtin.c
+++ b/source3/auth/auth_builtin.c
@@ -34,7 +34,7 @@
 static NTSTATUS check_guest_security(const struct auth_context *auth_context,
                                     void *my_private_data, 
                                     TALLOC_CTX *mem_ctx,
-                                    const auth_usersupplied_info *user_info, 
+                                    const struct auth_usersupplied_info *user_info,
                                     auth_serversupplied_info **server_info)
 {
        /* mark this as 'not for me' */
@@ -77,7 +77,7 @@ static NTSTATUS auth_init_guest(struct auth_context *auth_context, const char *o
 static NTSTATUS check_name_to_ntstatus_security(const struct auth_context *auth_context,
                                                void *my_private_data, 
                                                TALLOC_CTX *mem_ctx,
-                                               const auth_usersupplied_info *user_info, 
+                                               const struct auth_usersupplied_info *user_info,
                                                auth_serversupplied_info **server_info)
 {
        NTSTATUS nt_status;
@@ -130,7 +130,7 @@ static NTSTATUS auth_init_name_to_ntstatus(struct auth_context *auth_context, co
 static NTSTATUS check_fixed_challenge_security(const struct auth_context *auth_context,
                                               void *my_private_data, 
                                               TALLOC_CTX *mem_ctx,
-                                              const auth_usersupplied_info *user_info, 
+                                              const struct auth_usersupplied_info *user_info,
                                               auth_serversupplied_info **server_info)
 {
        return NT_STATUS_NOT_IMPLEMENTED;

diff --git a/source3/auth/auth_compat.c b/source3/auth/auth_compat.c
index 77a994828f4373b81d4a43bdd1c3f9ac18207544..dc046d5c0d54c71d3706017041b8c2abbe08c519 100644 (file)
--- a/source3/auth/auth_compat.c
+++ b/source3/auth/auth_compat.c
@@ -38,7 +38,7 @@ return True if the password is correct, False otherwise
 NTSTATUS check_plaintext_password(const char *smb_name, DATA_BLOB plaintext_password, auth_serversupplied_info **server_info)
 {
        struct auth_context *plaintext_auth_context = NULL;
-       auth_usersupplied_info *user_info = NULL;
+       struct auth_usersupplied_info *user_info = NULL;
        uint8_t chal[8];
        NTSTATUS nt_status;
        if (!NT_STATUS_IS_OK(nt_status = make_auth_context_subsystem(&plaintext_auth_context))) {
@@ -74,7 +74,7 @@ static NTSTATUS pass_check_smb(struct auth_context *actx,
        NTSTATUS nt_status;
        auth_serversupplied_info *server_info = NULL;
        if (encrypted) {
-               auth_usersupplied_info *user_info = NULL;
+               struct auth_usersupplied_info *user_info = NULL;
                if (actx == NULL) {
                        return NT_STATUS_INTERNAL_ERROR;
                }

diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index c5273603215b279884bfea2eac79f5891d9193b3..bbe0ba5d408879a62b4e5a72daa8e6c680ca5ed3 100644 (file)
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -251,7 +251,7 @@ machine %s. Error was : %s.\n", dc_name, cli_errstr(*cli)));
 ************************************************************************/
 
 static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
-                                       const auth_usersupplied_info *user_info, 
+                                       const struct auth_usersupplied_info *user_info,
                                        const char *domain,
                                        uchar chal[8],
                                        auth_serversupplied_info **server_info, 
@@ -372,7 +372,7 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
 static NTSTATUS check_ntdomain_security(const struct auth_context *auth_context,
                                        void *my_private_data, 
                                        TALLOC_CTX *mem_ctx,
-                                       const auth_usersupplied_info *user_info, 
+                                       const struct auth_usersupplied_info *user_info,
                                        auth_serversupplied_info **server_info)
 {
        NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE;
@@ -441,7 +441,7 @@ static NTSTATUS auth_init_ntdomain(struct auth_context *auth_context, const char
 static NTSTATUS check_trustdomain_security(const struct auth_context *auth_context,
                                           void *my_private_data, 
                                           TALLOC_CTX *mem_ctx,
-                                          const auth_usersupplied_info *user_info, 
+                                          const struct auth_usersupplied_info *user_info,
                                           auth_serversupplied_info **server_info)
 {
        NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE;

diff --git a/source3/auth/auth_netlogond.c b/source3/auth/auth_netlogond.c
index ebfed83d41ec3fb10d0b9fb156848039b99fa9c9..f3b66e49487169c6ec0d0cc164a699b174283c13 100644 (file)
--- a/source3/auth/auth_netlogond.c
+++ b/source3/auth/auth_netlogond.c
@@ -27,7 +27,7 @@ static NTSTATUS netlogond_validate(TALLOC_CTX *mem_ctx,
                                   const struct auth_context *auth_context,
                                   const char *ncalrpc_sockname,
                                   uint8_t schannel_key[16],
-                                  const auth_usersupplied_info *user_info,
+                                  const struct auth_usersupplied_info *user_info,
                                   struct netr_SamInfo3 **pinfo3,
                                   NTSTATUS *schannel_bind_result)
 {
@@ -153,7 +153,7 @@ static char *mymachinepw(TALLOC_CTX *mem_ctx)
 static NTSTATUS check_netlogond_security(const struct auth_context *auth_context,
                                         void *my_private_data,
                                         TALLOC_CTX *mem_ctx,
-                                        const auth_usersupplied_info *user_info,
+                                        const struct auth_usersupplied_info *user_info,
                                         auth_serversupplied_info **server_info)
 {
        TALLOC_CTX *frame = talloc_stackframe();

diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c
index 4243a24ca72a5ac3a538c95dc598c3539888c79a..88f0e694434833e1cefaa24a3a82c8e4300fb135 100644 (file)
--- a/source3/auth/auth_ntlmssp.c
+++ b/source3/auth/auth_ntlmssp.c
@@ -85,7 +85,7 @@ static NTSTATUS auth_ntlmssp_check_password(struct ntlmssp_state *ntlmssp_state,
 {
        AUTH_NTLMSSP_STATE *auth_ntlmssp_state =
                (AUTH_NTLMSSP_STATE *)ntlmssp_state->auth_context;
-       auth_usersupplied_info *user_info = NULL;
+       struct auth_usersupplied_info *user_info = NULL;
        NTSTATUS nt_status;
        bool username_was_mapped;
 

diff --git a/source3/auth/auth_sam.c b/source3/auth/auth_sam.c
index ef0cd97c52729804f7a22ca8ede6dbdb11e7213b..01f82517d66450030781057c9d09a99620f6707b 100644 (file)
--- a/source3/auth/auth_sam.c
+++ b/source3/auth/auth_sam.c
@@ -37,7 +37,7 @@ static NTSTATUS sam_password_ok(const struct auth_context *auth_context,
                                uint32_t acct_ctrl,
                                const uint8_t *lm_pw,
                                const uint8_t *nt_pw,
-                               const auth_usersupplied_info *user_info, 
+                               const struct auth_usersupplied_info *user_info,
                                DATA_BLOB *user_sess_key, 
                                DATA_BLOB *lm_sess_key)
 {
@@ -168,7 +168,7 @@ static bool logon_hours_ok(struct samu *sampass)
 
 static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
                               struct samu *sampass, 
-                              const auth_usersupplied_info *user_info)
+                              const struct auth_usersupplied_info *user_info)
 {
        uint32  acct_ctrl = pdb_get_acct_ctrl(sampass);
        char *workstation_list;
@@ -290,7 +290,7 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
 static bool need_to_increment_bad_pw_count(
        const struct auth_context *auth_context,
        struct samu* sampass,
-       const auth_usersupplied_info *user_info)
+       const struct auth_usersupplied_info *user_info)
 {
        uint8_t i;
        const uint8_t *pwhistory;
@@ -359,7 +359,7 @@ return an NT_STATUS constant.
 static NTSTATUS check_sam_security(const struct auth_context *auth_context,
                                   void *my_private_data, 
                                   TALLOC_CTX *mem_ctx,
-                                  const auth_usersupplied_info *user_info, 
+                                  const struct auth_usersupplied_info *user_info,
                                   auth_serversupplied_info **server_info)
 {
        struct samu *sampass=NULL;
@@ -532,7 +532,7 @@ Check SAM security (above) but with a few extra checks.
 static NTSTATUS check_samstrict_security(const struct auth_context *auth_context,
                                         void *my_private_data, 
                                         TALLOC_CTX *mem_ctx,
-                                        const auth_usersupplied_info *user_info, 
+                                        const struct auth_usersupplied_info *user_info,
                                         auth_serversupplied_info **server_info)
 {
        bool is_local_name, is_my_domain;

diff --git a/source3/auth/auth_script.c b/source3/auth/auth_script.c
index 6cbace71e8625dada2b847931212bc9beab18cf4..353f3be78fe2d140cb553fa6b800e97bea217740 100644 (file)
--- a/source3/auth/auth_script.c
+++ b/source3/auth/auth_script.c
@@ -40,7 +40,7 @@
 static NTSTATUS script_check_user_credentials(const struct auth_context *auth_context,
                                        void *my_private_data, 
                                        TALLOC_CTX *mem_ctx,
-                                       const auth_usersupplied_info *user_info, 
+                                       const struct auth_usersupplied_info *user_info,
                                        auth_serversupplied_info **server_info)
 {
        const char *script = lp_parm_const_string( GLOBAL_SECTION_SNUM, "auth_script", "script", NULL);

diff --git a/source3/auth/auth_server.c b/source3/auth/auth_server.c
index 287b50b080ff437edc11b69a9c22c6e38634da82..3f0ab9dc729bec465b229036a72fd29a7eb3c5d9 100644 (file)
--- a/source3/auth/auth_server.c
+++ b/source3/auth/auth_server.c
@@ -270,7 +270,7 @@ static DATA_BLOB auth_get_challenge_server(const struct auth_context *auth_conte
 static NTSTATUS check_smbserver_security(const struct auth_context *auth_context,
                                         void *my_private_data, 
                                         TALLOC_CTX *mem_ctx,
-                                        const auth_usersupplied_info *user_info, 
+                                        const struct auth_usersupplied_info *user_info,
                                         auth_serversupplied_info **server_info)
 {
        struct server_security_state *state = talloc_get_type_abort(

diff --git a/source3/auth/auth_unix.c b/source3/auth/auth_unix.c
index 58c765226d633c707d05a9923e6588eb987da44b..6f2f9f10a97346d2af918d51d15a0118279d9303 100644 (file)
--- a/source3/auth/auth_unix.c
+++ b/source3/auth/auth_unix.c
@@ -85,7 +85,7 @@ static bool update_smbpassword_file(const char *user, const char *password)
 static NTSTATUS check_unix_security(const struct auth_context *auth_context,
                             void *my_private_data, 
                             TALLOC_CTX *mem_ctx,
-                            const auth_usersupplied_info *user_info, 
+                            const struct auth_usersupplied_info *user_info,
                             auth_serversupplied_info **server_info)
 {
        NTSTATUS nt_status;

diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 8167a80a4fac9f65fd5815df2631224012409766..eebc21b93c749571f29ac4514f38aad02be988b9 100644 (file)
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -107,7 +107,7 @@ static int _smb_create_user(const char *domain, const char *unix_username, const
  Create an auth_usersupplied_data structure
 ****************************************************************************/
 
-static NTSTATUS make_user_info(auth_usersupplied_info **user_info,
+static NTSTATUS make_user_info(struct auth_usersupplied_info **user_info,
                                const char *smb_name,
                                const char *internal_username,
                                const char *client_domain,
@@ -121,7 +121,7 @@ static NTSTATUS make_user_info(auth_usersupplied_info **user_info,
 
        DEBUG(5,("attempting to make a user_info for %s (%s)\n", internal_username, smb_name));
 
-       *user_info = SMB_MALLOC_P(auth_usersupplied_info);
+       *user_info = SMB_MALLOC_P(struct auth_usersupplied_info);
        if (*user_info == NULL) {
                DEBUG(0,("malloc failed for user_info (size %lu)\n", (unsigned long)sizeof(*user_info)));
                return NT_STATUS_NO_MEMORY;
@@ -188,7 +188,7 @@ static NTSTATUS make_user_info(auth_usersupplied_info **user_info,
  Create an auth_usersupplied_data structure after appropriate mapping.
 ****************************************************************************/
 
-NTSTATUS make_user_info_map(auth_usersupplied_info **user_info,
+NTSTATUS make_user_info_map(struct auth_usersupplied_info **user_info,
                            const char *smb_name,
                            const char *client_domain,
                            const char *wksta_name,
@@ -252,7 +252,7 @@ NTSTATUS make_user_info_map(auth_usersupplied_info **user_info,
  Decrypt and encrypt the passwords.
 ****************************************************************************/
 
-bool make_user_info_netlogon_network(auth_usersupplied_info **user_info, 
+bool make_user_info_netlogon_network(struct auth_usersupplied_info **user_info,
                                     const char *smb_name, 
                                     const char *client_domain, 
                                     const char *wksta_name, 
@@ -290,7 +290,7 @@ bool make_user_info_netlogon_network(auth_usersupplied_info **user_info,
  Decrypt and encrypt the passwords.
 ****************************************************************************/
 
-bool make_user_info_netlogon_interactive(auth_usersupplied_info **user_info, 
+bool make_user_info_netlogon_interactive(struct auth_usersupplied_info **user_info,
                                         const char *smb_name, 
                                         const char *client_domain, 
                                         const char *wksta_name, 
@@ -402,7 +402,7 @@ bool make_user_info_netlogon_interactive(auth_usersupplied_info **user_info,
  Create an auth_usersupplied_data structure
 ****************************************************************************/
 
-bool make_user_info_for_reply(auth_usersupplied_info **user_info, 
+bool make_user_info_for_reply(struct auth_usersupplied_info **user_info,
                              const char *smb_name, 
                              const char *client_domain,
                              const uint8 chal[8],
@@ -460,7 +460,7 @@ bool make_user_info_for_reply(auth_usersupplied_info **user_info,
  Create an auth_usersupplied_data structure
 ****************************************************************************/
 
-NTSTATUS make_user_info_for_reply_enc(auth_usersupplied_info **user_info, 
+NTSTATUS make_user_info_for_reply_enc(struct auth_usersupplied_info **user_info,
                                       const char *smb_name,
                                       const char *client_domain, 
                                       DATA_BLOB lm_resp, DATA_BLOB nt_resp)
@@ -478,7 +478,7 @@ NTSTATUS make_user_info_for_reply_enc(auth_usersupplied_info **user_info,
  Create a guest user_info blob, for anonymous authenticaion.
 ****************************************************************************/
 
-bool make_user_info_guest(auth_usersupplied_info **user_info) 
+bool make_user_info_guest(struct auth_usersupplied_info **user_info)
 {
        NTSTATUS nt_status;
 
@@ -2114,7 +2114,7 @@ NTSTATUS make_server_info_wbcAuthUserInfo(TALLOC_CTX *mem_ctx,
  Free a user_info struct
 ***************************************************************************/
 
-void free_user_info(auth_usersupplied_info **user_info)
+void free_user_info(struct auth_usersupplied_info **user_info)
 {
        DEBUG(5,("attempting to free (and zero) a user_info structure\n"));
        if (*user_info != NULL) {

diff --git a/source3/auth/auth_wbc.c b/source3/auth/auth_wbc.c
index 580c8b550d94a6a944bdeaefa62c484fce477d65..d86ea49c8956b769834884bb78a2a3b1bf62c8f8 100644 (file)
--- a/source3/auth/auth_wbc.c
+++ b/source3/auth/auth_wbc.c
@@ -47,7 +47,7 @@
 static NTSTATUS check_wbc_security(const struct auth_context *auth_context,
                                       void *my_private_data,
                                       TALLOC_CTX *mem_ctx,
-                                      const auth_usersupplied_info *user_info,
+                                      const struct auth_usersupplied_info *user_info,
                                       auth_serversupplied_info **server_info)
 {
        NTSTATUS nt_status;

diff --git a/source3/auth/auth_winbind.c b/source3/auth/auth_winbind.c
index d1b00a32686495447c5fa0bb635ea15d32a886d8..01f60f8df772df0dd8e37cb8aebbe89b27faa2e9 100644 (file)
--- a/source3/auth/auth_winbind.c
+++ b/source3/auth/auth_winbind.c
@@ -30,7 +30,7 @@
 static NTSTATUS check_winbind_security(const struct auth_context *auth_context,
                                       void *my_private_data, 
                                       TALLOC_CTX *mem_ctx,
-                                      const auth_usersupplied_info *user_info, 
+                                      const struct auth_usersupplied_info *user_info,
                                       auth_serversupplied_info **server_info)
 {
        NTSTATUS nt_status;

diff --git a/source3/include/auth.h b/source3/include/auth.h
index 7d778b92d0c1b40f2026542b3b4e1b10b4e2e4b4..4d5c2cd850b5f37e4cc2b535d218ce6396943f7e 100644 (file)
--- a/source3/include/auth.h
+++ b/source3/include/auth.h
@@ -19,7 +19,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-typedef struct auth_usersupplied_info {
+struct auth_usersupplied_info {
        DATA_BLOB lm_resp;
        DATA_BLOB nt_resp;
        DATA_BLOB lm_interactive_pwd;
@@ -38,7 +38,7 @@ typedef struct auth_usersupplied_info {
 
        uint32 logon_parameters;
 
-} auth_usersupplied_info;
+};
 
 typedef struct auth_serversupplied_info {
        bool guest;

diff --git a/source3/include/proto.h b/source3/include/proto.h
index c0ca96bb926529bb41653312384077d8eac91a55..e39f359ed1a88ee7b641478c955bea7386c6a50d 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -71,7 +71,7 @@ NTSTATUS auth_unix_init(void);
 
 /* The following definitions come from auth/auth_util.c  */
 
-NTSTATUS make_user_info_map(auth_usersupplied_info **user_info, 
+NTSTATUS make_user_info_map(struct auth_usersupplied_info **user_info,
                            const char *smb_name, 
                            const char *client_domain, 
                            const char *wksta_name, 
@@ -79,7 +79,7 @@ NTSTATUS make_user_info_map(auth_usersupplied_info **user_info,
                            DATA_BLOB *lm_interactive_pwd, DATA_BLOB *nt_interactive_pwd,
                            DATA_BLOB *plaintext, 
                            bool encrypted);
-bool make_user_info_netlogon_network(auth_usersupplied_info **user_info, 
+bool make_user_info_netlogon_network(struct auth_usersupplied_info **user_info,
                                     const char *smb_name, 
                                     const char *client_domain, 
                                     const char *wksta_name, 
@@ -88,7 +88,7 @@ bool make_user_info_netlogon_network(auth_usersupplied_info **user_info,
                                     int lm_pwd_len,
                                     const uchar *nt_network_pwd,
                                     int nt_pwd_len);
-bool make_user_info_netlogon_interactive(auth_usersupplied_info **user_info, 
+bool make_user_info_netlogon_interactive(struct auth_usersupplied_info **user_info,
                                         const char *smb_name, 
                                         const char *client_domain, 
                                         const char *wksta_name, 
@@ -97,19 +97,19 @@ bool make_user_info_netlogon_interactive(auth_usersupplied_info **user_info,
                                         const uchar lm_interactive_pwd[16], 
                                         const uchar nt_interactive_pwd[16], 
                                         const uchar *dc_sess_key);
-bool make_user_info_for_reply(auth_usersupplied_info **user_info, 
+bool make_user_info_for_reply(struct auth_usersupplied_info **user_info,
                              const char *smb_name, 
                              const char *client_domain,
                              const uint8 chal[8],
                              DATA_BLOB plaintext_password);
-NTSTATUS make_user_info_for_reply_enc(auth_usersupplied_info **user_info, 
+NTSTATUS make_user_info_for_reply_enc(struct auth_usersupplied_info **user_info,
                                       const char *smb_name,
                                       const char *client_domain, 
                                       DATA_BLOB lm_resp, DATA_BLOB nt_resp);
-bool make_user_info_guest(auth_usersupplied_info **user_info) ;
-NTSTATUS make_server_info_sam(auth_serversupplied_info **server_info, 
+bool make_user_info_guest(struct auth_usersupplied_info **user_info) ;
+NTSTATUS make_server_info_sam(struct auth_serversupplied_info **server_info,
                              struct samu *sampass);
-NTSTATUS create_local_token(auth_serversupplied_info *server_info);
+NTSTATUS create_local_token(struct auth_serversupplied_info *server_info);
 NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
                                    bool is_guest,
                                    uid_t *uid, gid_t *gid,
@@ -144,7 +144,7 @@ NTSTATUS make_server_info_wbcAuthUserInfo(TALLOC_CTX *mem_ctx,
                                          const char *domain,
                                          const struct wbcAuthUserInfo *info,
                                          auth_serversupplied_info **server_info);
-void free_user_info(auth_usersupplied_info **user_info);
+void free_user_info(struct auth_usersupplied_info **user_info);
 bool make_auth_methods(struct auth_context *auth_context, auth_methods **auth_method) ;
 bool is_trusted_domain(const char* dom_name);
 

diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c
index 8f4381cde1a6635e8a0c785de7723ecdea04e658..3c099518b853d91f9177717767f3fc5f6b332d8c 100644 (file)
--- a/source3/rpc_server/srv_netlog_nt.c
+++ b/source3/rpc_server/srv_netlog_nt.c
@@ -1057,7 +1057,7 @@ static NTSTATUS _netr_LogonSamLogon_base(pipes_struct *p,
        NTSTATUS status = NT_STATUS_OK;
        union netr_LogonLevel *logon = r->in.logon;
        const char *nt_username, *nt_domain, *nt_workstation;
-       auth_usersupplied_info *user_info = NULL;
+       struct auth_usersupplied_info *user_info = NULL;
        auth_serversupplied_info *server_info = NULL;
        struct auth_context *auth_context = NULL;
        uint8_t pipe_session_key[16];

diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 612cf2231ae96dcaa7ee72a71205be620cf14d80..598daa0582b13fb61f3b7d266aefd4a540976526 100644 (file)
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -131,7 +131,7 @@ static void reply_sesssetup_blob(struct smb_request *req,
 static NTSTATUS check_guest_password(auth_serversupplied_info **server_info)
 {
        struct auth_context *auth_context;
-       auth_usersupplied_info *user_info = NULL;
+       struct auth_usersupplied_info *user_info = NULL;
 
        NTSTATUS nt_status;
        unsigned char chal[8];
@@ -1388,7 +1388,7 @@ void reply_sesssetup_and_X(struct smb_request *req)
        const char *native_os;
        const char *native_lanman;
        const char *primary_domain;
-       auth_usersupplied_info *user_info = NULL;
+       struct auth_usersupplied_info *user_info = NULL;
        auth_serversupplied_info *server_info = NULL;
        uint16 smb_flag2 = req->flags2;