s3:smbd user_in_network() doesn't need sconn anymore

Signed-off-by: Andreas Schneider <asn@samba.org>

diff --git a/source3/include/proto.h b/source3/include/proto.h
index cae51e5ee3d501e99ae733fac915b9a20b6ad6df..d52ce69e7290d6f0e5e078ec945b6183c65d4232 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5971,8 +5971,7 @@ void add_session_user(struct smbd_server_connection *sconn, const char *user);
 void add_session_workgroup(struct smbd_server_connection *sconn,
                           const char *workgroup);
 const char *get_session_workgroup(struct smbd_server_connection *sconn);
-bool user_in_netgroup(struct smbd_server_connection *sconn,
-                     const char *user, const char *ngname);
+bool user_in_netgroup(const char *user, const char *ngname);
 bool user_in_list(struct smbd_server_connection *sconn,
                  const char *user,const char **list);
 bool authorise_login(struct smbd_server_connection *sconn,

diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 7101f7c8c4775be69606e55fbb222dfe5cf5814c..6919e8bb3a0973bedefbdc55c94cc432054ef27d 100644 (file)
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -408,8 +408,7 @@ const char *get_session_workgroup(struct smbd_server_connection *sconn)
  try lower case.
 ****************************************************************************/
 
-bool user_in_netgroup(struct smbd_server_connection *sconn,
-                     const char *user, const char *ngname)
+bool user_in_netgroup(const char *user, const char *ngname)
 {
 #ifdef HAVE_NETGROUP
        static char *my_yp_domain = NULL;
@@ -489,7 +488,7 @@ bool user_in_list(struct smbd_server_connection *sconn,
                         * Old behaviour. Check netgroup list
                         * followed by UNIX list.
                         */
-                       if(user_in_netgroup(sconn, user, *list +1))
+                       if(user_in_netgroup(user, *list +1))
                                return True;
                        if(user_in_group(user, *list +1))
                                return True;
@@ -501,7 +500,7 @@ bool user_in_list(struct smbd_server_connection *sconn,
                                 */
                                if(user_in_group(user, *list +2))
                                        return True;
-                               if(user_in_netgroup(sconn, user, *list +2))
+                               if(user_in_netgroup(user, *list +2))
                                        return True;
 
                        } else {
@@ -520,7 +519,7 @@ bool user_in_list(struct smbd_server_connection *sconn,
                                /*
                                 * Search netgroup list followed by UNIX list.
                                 */
-                               if(user_in_netgroup(sconn, user, *list +2))
+                               if(user_in_netgroup(user, *list +2))
                                        return True;
                                if(user_in_group(user, *list +2))
                                        return True;
@@ -528,7 +527,7 @@ bool user_in_list(struct smbd_server_connection *sconn,
                                /*
                                 * Just search netgroup list.
                                 */
-                               if(user_in_netgroup(sconn, user, *list +1))
+                               if(user_in_netgroup(user, *list +1))
                                        return True;
                        }
                }

diff --git a/source3/smbd/share_access.c b/source3/smbd/share_access.c
index 9800e4f01a2bbc6cf0e464272f8de52859e160fb..d41b05d1d8cb88fcfd10bc9ccff28fdded959775 100644 (file)
--- a/source3/smbd/share_access.c
+++ b/source3/smbd/share_access.c
@@ -131,7 +131,7 @@ static bool token_contains_name(TALLOC_CTX *mem_ctx,
                }
                if (*prefix == '&') {
                        if (username) {
-                               if (user_in_netgroup(sconn, username, name)) {
+                               if (user_in_netgroup(username, name)) {
                                        return True;
                                }
                        }