summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-05-25 15:01:04 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-05-31 00:32:07 +0200
commit33e8126c3c810388d079008d6de8291a294b9bd8 (patch)
treee70a5f08046c0d1e31d583e18d1871a3ad4af285 /source3/lib
parentade01f083c502ecf7cba19303eb16d3c9a4be52a (diff)
downloadsamba-33e8126c3c810388d079008d6de8291a294b9bd8.tar.gz
samba-33e8126c3c810388d079008d6de8291a294b9bd8.tar.bz2
samba-33e8126c3c810388d079008d6de8291a294b9bd8.zip
s3-param split service.c into param and smbd components
The dependency chain of find_service can't be satisfied sensibly outside smbd, so don't include this in the main 'param' subsystem. Also remove the duplicate find_service() and conn_snum_used() from dummysmbd.c: The WAF build does not need these dummies any more, but file. Andrew Bartlett
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/dummyparam.c35
-rw-r--r--source3/lib/dummysmbd.c11
2 files changed, 35 insertions, 11 deletions
diff --git a/source3/lib/dummyparam.c b/source3/lib/dummyparam.c
new file mode 100644
index 0000000000..bad5d56ffc
--- /dev/null
+++ b/source3/lib/dummyparam.c
@@ -0,0 +1,35 @@
+/*
+ Unix SMB/CIFS implementation.
+ RPC pipe client
+
+ Copyright (C) Gerald (Jerry) Carter 2004.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* Stupid dummy functions required due to the horrible dependency mess
+ in Samba. */
+
+#include "includes.h"
+
+int find_service(TALLOC_CTX *ctx, const char *service_in, char **p_service_out)
+{
+ return -1;
+}
+
+bool conn_snum_used(struct smbd_server_connection *sconn,
+ int snum)
+{
+ return False;
+}
diff --git a/source3/lib/dummysmbd.c b/source3/lib/dummysmbd.c
index 7a6c2cd319..1d311a2dd9 100644
--- a/source3/lib/dummysmbd.c
+++ b/source3/lib/dummysmbd.c
@@ -23,17 +23,6 @@
#include "includes.h"
-int find_service(TALLOC_CTX *ctx, const char *service_in, char **p_service_out)
-{
- return -1;
-}
-
-bool conn_snum_used(struct smbd_server_connection *sconn,
- int snum)
-{
- return False;
-}
-
void cancel_pending_lock_requests_by_fid(files_struct *fsp,
struct byte_range_lock *br_lck,
enum file_close_type close_type)