s3:smbd: remove unused sconn_server_id()

metze

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 1389293ad8d9bd5f2a9cb751c8a6e312f2555a48..cf7c5aeafebb09196c255cedc10cf45c94d5acee 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -441,7 +441,6 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \
          ../lib/socket/interfaces.o lib/memcache.o \
          lib/talloc_dict.o \
          lib/serverid.o \
-         lib/util_sconn.o \
          lib/util_transfer_file.o ../lib/async_req/async_sock.o \
          lib/addrchange.o \
          $(TDB_LIB_OBJ) \

diff --git a/source3/lib/util_sconn.c b/source3/lib/util_sconn.c
deleted file mode 100644 (file)
index 51ba29e..0000000
--- a/source3/lib/util_sconn.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-   Implementation of a reliable server_exists()
-   Copyright (C) Volker Lendecke 2010
-
-   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/>.
-*/
-
-#include "includes.h"
-#include "smbd/globals.h"
-#include "messages.h"
-
-struct server_id sconn_server_id(const struct smbd_server_connection *sconn)
-{
-       return messaging_server_id(sconn->msg_ctx);
-}

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 3c6aa12f1bc613602a363313eaf6ca0fdfa4e6c8..76172b08bafde4e34755fc9928e2affc2735236b 100644 (file)
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -226,8 +226,6 @@ void smbd_server_connection_terminate_ex(struct smbd_server_connection *sconn,
 #define smbd_server_connection_terminate(sconn, reason) \
        smbd_server_connection_terminate_ex(sconn, reason, __location__)
 
-struct server_id sconn_server_id(const struct smbd_server_connection *sconn);
-
 const char *smb2_opcode_name(uint16_t opcode);
 bool smbd_is_smb2_header(const uint8_t *inbuf, size_t size);
 

diff --git a/source3/wscript_build b/source3/wscript_build
index 4fe432bf5015624df658486f38fff966b7833cdc..8ac6cc0d48767084ae97fbeaa698659e68abbedc 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -47,7 +47,6 @@ LIB_SRC = '''
           lib/messages_ctdbd.c lib/ctdb_packet.c lib/ctdbd_conn.c
           lib/id_cache.c
           lib/talloc_dict.c
-          lib/util_sconn.c
           lib/serverid.c
           lib/util_transfer_file.c
           lib/addrchange.c