s3:smbd: move struct user_struct to globals.h

metze

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 58d94385a49efcef7c01dc97571427e4af4630db..5938e0b80174c1df34bea67a2050a96b4e8e1f5a 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -918,19 +918,6 @@ struct node_status_extra {
        /* There really is more here ... */ 
 };
 
-struct user_struct {
-       struct user_struct *next, *prev;
-       uint16 vuid; /* Tag for this entry. */
-
-       char *session_keystr; /* used by utmp and pam session code.  
-                                TDB key string */
-       int homes_snum;
-
-       struct auth_session_info *session_info;
-
-       struct gensec_security *gensec_security;
-};
-
 /*
    Do you want session setups at user level security with a invalid
    password to be rejected or allowed in as guest? WinNT rejects them

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index f692eae488554b0cefd957781444a63a5bd2675e..139854d497ec84fcb4b9e386d3421858948d553b 100644 (file)
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -438,6 +438,7 @@ struct smbd_smb2_request {
 };
 
 struct smbd_server_connection;
+struct user_struct;
 
 struct smbd_smb2_session {
        struct smbd_smb2_session *prev, *next;
@@ -473,6 +474,19 @@ struct smbd_smb2_tcon {
 struct pending_message_list;
 struct pending_auth_data;
 
+struct user_struct {
+       struct user_struct *next, *prev;
+       uint16 vuid; /* Tag for this entry. */
+
+       char *session_keystr; /* used by utmp and pam session code.
+                                TDB key string */
+       int homes_snum;
+
+       struct auth_session_info *session_info;
+
+       struct gensec_security *gensec_security;
+};
+
 struct smbd_server_connection {
        int sock;
        const struct tsocket_address *local_address;