svn commit: samba r15769 - in branches/SAMBA_4_0/source: param smb_server smb_server/smb smb_server/smb2

[metze at samba.org]

Author: metze
Date: 2006-05-21 10:06:15 +0000 (Sun, 21 May 2006)
New Revision: 15769

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15769

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

metze
Modified:
   branches/SAMBA_4_0/source/param/loadparm.c
   branches/SAMBA_4_0/source/smb_server/smb/service.c
   branches/SAMBA_4_0/source/smb_server/smb2/tcon.c
   branches/SAMBA_4_0/source/smb_server/tcon.c


Changeset:
Modified: branches/SAMBA_4_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_4_0/source/param/loadparm.c	2006-05-21 08:29:56 UTC (rev 15768)
+++ branches/SAMBA_4_0/source/param/loadparm.c	2006-05-21 10:06:15 UTC (rev 15769)
@@ -2543,6 +2543,24 @@
 	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. 
 ********************************************************************/

Modified: branches/SAMBA_4_0/source/smb_server/smb/service.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb/service.c	2006-05-21 08:29:56 UTC (rev 15768)
+++ branches/SAMBA_4_0/source/smb_server/smb/service.c	2006-05-21 10:06:15 UTC (rev 15769)
@@ -136,7 +136,7 @@
 		}
 	}
 
-	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;

Modified: branches/SAMBA_4_0/source/smb_server/smb2/tcon.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb2/tcon.c	2006-05-21 08:29:56 UTC (rev 15768)
+++ branches/SAMBA_4_0/source/smb_server/smb2/tcon.c	2006-05-21 10:06:15 UTC (rev 15769)
@@ -158,7 +158,7 @@
 		}
 	}
 
-	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;

Modified: branches/SAMBA_4_0/source/smb_server/tcon.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/tcon.c	2006-05-21 08:29:56 UTC (rev 15768)
+++ branches/SAMBA_4_0/source/smb_server/tcon.c	2006-05-21 10:06:15 UTC (rev 15769)
@@ -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,