r15769: this functions belong to params/ so move it.

metze
(This used to be commit 9c4c40772bfd8a8324cd086c2234451d164be5d0)

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index c46cf51f4b6aa3ce633404dce867813429a16cfd..183cec802d556893aafb4acff22fb58bcda96803 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -2543,6 +2543,24 @@ int lp_servicenumber(const char *pszServiceName)
        return (iService);
 }
 
+int lp_find_valid_service(const char *pszServiceName)
+{
+       int iService;
+
+       iService = lp_servicenumber(pszServiceName);
+
+       if (iService >= 0 && !lp_snum_ok(iService)) {
+               DEBUG(0,("lp_find_valid_service: Invalid snum %d for '%s'\n",iService, pszServiceName));
+               iService = -1;
+       }
+
+       if (iService == -1) {
+               DEBUG(3,("lp_find_valid_service: failed to find service '%s'\n", pszServiceName));
+       }
+
+       return iService;
+}
+
 /*******************************************************************
  A useful volume label function. 
 ********************************************************************/

diff --git a/source4/smb_server/smb/service.c b/source4/smb_server/smb/service.c
index 176b954ac624dd6012b6bb1dab28b690ed5df440..676f417619e9b662dbb6072af1472c919099a72c 100644 (file)
--- a/source4/smb_server/smb/service.c
+++ b/source4/smb_server/smb/service.c
@@ -136,7 +136,7 @@ static NTSTATUS make_connection(struct smbsrv_request *req,
                }
        }
 
-       snum = smbsrv_find_service(service);
+       snum = lp_find_valid_service(service);
        if (snum == -1) {
                DEBUG(0,("couldn't find service %s\n", service));
                return NT_STATUS_BAD_NETWORK_NAME;

diff --git a/source4/smb_server/smb2/tcon.c b/source4/smb_server/smb2/tcon.c
index bfb3904d47444090a750e8784a45419013796c7d..b2270640c8c50a9422580c0e33f9ea884b06cd82 100644 (file)
--- a/source4/smb_server/smb2/tcon.c
+++ b/source4/smb_server/smb2/tcon.c
@@ -158,7 +158,7 @@ static NTSTATUS smb2srv_tcon_backend(struct smb2srv_request *req, union smb_tcon
                }
        }
 
-       snum = smbsrv_find_service(service);
+       snum = lp_find_valid_service(service);
        if (snum == -1) {
                DEBUG(0,("smb2srv_tcon_backend: couldn't find service %s\n", service));
                return NT_STATUS_BAD_NETWORK_NAME;

diff --git a/source4/smb_server/tcon.c b/source4/smb_server/tcon.c
index ad278e2e7742a15520d37e8bcbbcc9a4bb452080..ad68ddb83604aacd37f6ccec2641594c4fa3873d 100644 (file)
--- a/source4/smb_server/tcon.c
+++ b/source4/smb_server/tcon.c
@@ -26,24 +26,6 @@
 #include "smbd/service_stream.h"
 #include "ntvfs/ntvfs.h"
 
-int smbsrv_find_service(const char *service)
-{
-       int iService;
-
-       iService = lp_servicenumber(service);
-
-       if (iService >= 0 && !lp_snum_ok(iService)) {
-               DEBUG(0,("smbsrv_find_service: Invalid snum %d for '%s'\n",iService, service));
-               iService = -1;
-       }
-
-       if (iService == -1) {
-               DEBUG(3,("smbsrv_find_service: failed to find service '%s'\n", service));
-       }
-
-       return iService;
-}
-
 struct socket_address *smbsrv_get_my_addr(void *p, TALLOC_CTX *mem_ctx)
 {
        struct smbsrv_connection *smb_conn = talloc_get_type(p,