summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-03-11 22:02:48 +0000
committerJeremy Allison <jra@samba.org>2001-03-11 22:02:48 +0000
commit24993180ab50d8ebfbc1861279c2260b6c386b5f (patch)
tree564975b069c0cd6cc15de29d0f4ed2e4171c1f40
parentb2bc2bfaf056bdafd14513a0a6d1daef3d327ffc (diff)
downloadsamba-24993180ab50d8ebfbc1861279c2260b6c386b5f.tar.gz
samba-24993180ab50d8ebfbc1861279c2260b6c386b5f.tar.bz2
samba-24993180ab50d8ebfbc1861279c2260b6c386b5f.zip
Dead code removal. Not used anywhere.
Jeremy. (This used to be commit 90f334be23c20aa2a8a947e58907bd7854148574)
-rw-r--r--source3/Makefile.in6
-rw-r--r--source3/lib/msrpc-client.c403
-rw-r--r--source3/lib/msrpc_use.c327
3 files changed, 3 insertions, 733 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 958cd2aa19..97e800df6d 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -186,7 +186,7 @@ SMBD_OBJ1 = smbd/server.o smbd/files.o smbd/chgpasswd.o smbd/connection.o \
smbd/dosmode.o smbd/filename.o smbd/open.o smbd/close.o \
smbd/blocking.o smbd/sec_ctx.o \
smbd/vfs.o smbd/vfs-wrap.o smbd/statcache.o \
- smbd/posix_acls.o lib/msrpc-client.o lib/msrpc_use.o \
+ smbd/posix_acls.o \
smbd/process.o smbd/service.o smbd/error.o \
printing/printfsp.o lib/util_seaccess.o smbd/srvstr.o
@@ -219,7 +219,7 @@ NMBD_OBJ = $(NMBD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) \
$(LIB_OBJ)
SWAT_OBJ = web/cgi.o web/diagnose.o web/startstop.o web/statuspage.o \
- web/swat.o lib/msrpc-client.o $(PRINTING_OBJ) $(LIBSMB_OBJ) $(LOCKING_OBJ) \
+ web/swat.o $(PRINTING_OBJ) $(LIBSMB_OBJ) $(LOCKING_OBJ) \
$(PARAM_OBJ) $(PASSDB_OBJ) $(RPC_CLIENT_OBJ) $(RPC_PARSE_OBJ) \
$(UBIQX_OBJ) $(LIB_OBJ)
@@ -249,7 +249,7 @@ TESTPARM_OBJ = utils/testparm.o \
TESTPRNS_OBJ = utils/testprns.o $(PARAM_OBJ) $(PRINTING_OBJ) $(UBIQX_OBJ) \
$(LIB_OBJ)
-SMBPASSWD_OBJ = utils/smbpasswd.o lib/msrpc-client.o $(PARAM_OBJ) \
+SMBPASSWD_OBJ = utils/smbpasswd.o $(PARAM_OBJ) \
$(LIBSMB_OBJ) $(PASSDB_OBJ) \
$(UBIQX_OBJ) $(RPC_CLIENT_OBJ) $(RPC_PARSE_OBJ) $(LIB_OBJ)
diff --git a/source3/lib/msrpc-client.c b/source3/lib/msrpc-client.c
deleted file mode 100644
index 7051db563b..0000000000
--- a/source3/lib/msrpc-client.c
+++ /dev/null
@@ -1,403 +0,0 @@
-/*
- Unix SMB/Netbios implementation.
- Version 1.9.
- SMB msrpcent generic functions
- Copyright (C) Andrew Tridgell 1994-1999
- Copyright (C) Luke Kenneth Casson Leighton 1996-1999
-
- 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 2 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, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#define NO_SYSLOG
-
-#include "includes.h"
-
-extern int DEBUGLEVEL;
-
-/****************************************************************************
- read an msrpc pdu from a fd.
- The timeout is in milliseconds.
-****************************************************************************/
-BOOL receive_msrpc(int fd, prs_struct *data, unsigned int timeout)
-{
- BOOL ok;
- size_t len;
- RPC_HDR hdr;
-
- prs_init(data, 0, NULL, True);
-
- ok = prs_read(data, fd, 16, timeout);
-
- if (!ok)
- {
- prs_mem_free(data);
- return False;
- }
-
- if (!smb_io_rpc_hdr("hdr", &hdr, data, 0))
- {
- prs_mem_free(data);
- return False;
- }
-
- len = hdr.frag_len - 16;
- if (len > 0)
- {
- ok = prs_read(data, fd, hdr.frag_len, 0);
- if (!ok)
- {
- prs_mem_free(data);
- return False;
- }
- data->data_offset = hdr.frag_len;
- return True;
- }
-
- prs_mem_free(data);
- return False;
-}
-
-/****************************************************************************
- send an smb to a fd and re-establish if necessary
-****************************************************************************/
-BOOL msrpc_send(int fd, prs_struct *ps)
-{
- size_t len = ps != NULL ? ps->buffer_size : 0;
- size_t nwritten=0;
- ssize_t ret;
- char *outbuf = ps->data_p;
-
- DEBUG(10,("msrpc_send_prs: data: %p len %d\n", outbuf, len));
- dbgflush();
-
- dump_data(10, outbuf, len);
-
- while (nwritten < len)
- {
- ret = write_socket(fd,outbuf+nwritten,len - nwritten);
- if (ret <= 0)
- {
- DEBUG(0,("Error writing %d msrpc bytes. %d.\n",
- len,ret));
- prs_mem_free(ps);
- return False;
- }
- nwritten += ret;
- }
-
- prs_mem_free(ps);
- return True;
-}
-
-/****************************************************************************
- receive msrpc packet
-****************************************************************************/
-BOOL msrpc_receive(int fd, prs_struct *ps)
-{
- int len;
-
- DEBUG(10,("msrpc_receive: %d\n", __LINE__));
-
- if (!receive_msrpc(fd, ps, 0))
- {
- return False;
- }
-
- len = ps->buffer_size;
-
- if (ps->data_p == NULL || len <= 0)
- {
- return False;
- }
-
- dump_data(10, ps->data_p, len);
-
- DEBUG(10,("msrpc_receive: len %d\n", len));
-
- return True;
-}
-
-/****************************************************************************
-open the msrpcent sockets
-****************************************************************************/
-BOOL msrpc_connect(struct msrpc_state *msrpc, const char *pipe_name)
-{
- fstring path;
- slprintf(path, sizeof(path)-1, "%s/.msrpc/%s", LOCKDIR, pipe_name);
-
- fstrcpy(msrpc->pipe_name, pipe_name);
-
- msrpc->fd = open_pipe_sock(path);
-
- if (msrpc->fd == -1)
- {
- return False;
- }
-
- return True;
-}
-
-
-/****************************************************************************
-initialise a msrpcent structure
-****************************************************************************/
-void msrpc_init_creds(struct msrpc_state *msrpc, const struct user_creds *usr)
-{
- copy_user_creds(&msrpc->usr, usr);
-}
-
-/****************************************************************************
-close the socket descriptor
-****************************************************************************/
-void msrpc_close_socket(struct msrpc_state *msrpc)
-{
- if (msrpc->fd != -1)
- {
- close(msrpc->fd);
- }
- msrpc->fd = -1;
-}
-
-
-/****************************************************************************
-set socket options on a open connection
-****************************************************************************/
-void msrpc_sockopt(struct msrpc_state *msrpc, char *options)
-{
- set_socket_options(msrpc->fd, options);
-}
-
-
-static BOOL msrpc_authenticate(struct msrpc_state *msrpc,
- struct user_creds *usr)
-{
- struct msrpc_state msrpc_redir;
-
- int sock = msrpc->fd;
- char *data;
- prs_struct ps;
- uint32 len;
- char *in = msrpc->inbuf;
- char *out = msrpc->outbuf;
- uint16 command;
-
- command = usr != NULL ? AGENT_CMD_CON : AGENT_CMD_CON_ANON;
-
- if (!create_user_creds(&ps, msrpc->pipe_name, 0x0, command,
- msrpc->pid, usr))
- {
- DEBUG(0,("could not parse credentials\n"));
- close(sock);
- return False;
- }
-
- len = ps.data_offset;
- data = ps.data_p;
-
- SIVAL(data, 0, len);
-
-#ifdef DEBUG_PASSWORD
- DEBUG(100,("data len: %d\n", len));
- dump_data(100, data, len);
-#endif
-
- if (write(sock, data, len) <= 0)
- {
- DEBUG(0,("write failed\n"));
- return False;
- }
-
- if (msrpc->redirect)
- {
- len = read(sock, &msrpc_redir, sizeof(msrpc_redir));
-
- if (len != sizeof(msrpc_redir))
- {
- DEBUG(0,("read failed\n"));
- return False;
- }
-
- memcpy(msrpc, &msrpc_redir, sizeof(msrpc_redir));
- msrpc->inbuf = in;
- msrpc->outbuf = out;
- msrpc->fd = sock;
- msrpc->usr.reuse = False;
- }
- else
- {
- uint32 status;
- len = read(sock, &status, sizeof(status));
-
- return len == sizeof(status) && status == 0x0;
- }
- return True;
-}
-
-static BOOL msrpc_init_redirect(struct msrpc_state *msrpc,
- const char* pipe_name,
- struct user_creds *usr)
-{
- int sock;
- fstring path;
-
- slprintf(path, sizeof(path)-1, "/tmp/.msrpc/.%s/agent", pipe_name);
-
- sock = open_pipe_sock(path);
-
- if (sock < 0)
- {
- return False;
- }
-
- msrpc->fd = sock;
-
- if (!msrpc_authenticate(msrpc, usr))
- {
- DEBUG(0,("authenticate failed\n"));
- close(msrpc->fd);
- msrpc->fd = -1;
- return False;
- }
-
- return True;
-}
-
-BOOL msrpc_connect_auth(struct msrpc_state *msrpc,
- uint32 pid,
- const char* pipename,
- const struct user_creds *usr)
-{
- ZERO_STRUCTP(msrpc);
- if (!msrpc_initialise(msrpc, pid))
- {
- DEBUG(0,("unable to initialise msrpcent connection.\n"));
- return False;
- }
-
- msrpc_init_creds(msrpc, usr);
-
- if (!msrpc_establish_connection(msrpc, pipename))
- {
- msrpc_shutdown(msrpc);
- return False;
- }
-
- return True;
-}
-
-/****************************************************************************
-initialise a msrpcent structure
-****************************************************************************/
-struct msrpc_state *msrpc_initialise(struct msrpc_state *msrpc, uint32 pid)
-{
- if (!msrpc) {
- msrpc = (struct msrpc_state *)malloc(sizeof(*msrpc));
- if (!msrpc)
- return NULL;
- ZERO_STRUCTP(msrpc);
- }
-
- if (msrpc->initialised) {
- msrpc_shutdown(msrpc);
- }
-
- ZERO_STRUCTP(msrpc);
-
- msrpc->fd = -1;
- msrpc->outbuf = (char *)malloc(CLI_BUFFER_SIZE+4);
- msrpc->inbuf = (char *)malloc(CLI_BUFFER_SIZE+4);
- if (!msrpc->outbuf || !msrpc->inbuf)
- {
- return False;
- }
-
- msrpc->initialised = 1;
- msrpc_init_creds(msrpc, NULL);
- msrpc->pid = pid;
-
- return msrpc;
-}
-
-
-/****************************************************************************
-shutdown a msrpcent structure
-****************************************************************************/
-void msrpc_shutdown(struct msrpc_state *msrpc)
-{
- DEBUG(10,("msrpc_shutdown\n"));
- if (msrpc->outbuf)
- {
- free(msrpc->outbuf);
- }
- if (msrpc->inbuf)
- {
- free(msrpc->inbuf);
- }
- msrpc_close_socket(msrpc);
- memset(msrpc, 0, sizeof(*msrpc));
-}
-
-/****************************************************************************
-establishes a connection right up to doing tconX, reading in a password.
-****************************************************************************/
-BOOL msrpc_establish_connection(struct msrpc_state *msrpc,
- const char *pipe_name)
-{
- DEBUG(5,("msrpc_establish_connection: connecting to %s (%s) - %s\n",
- pipe_name,
- msrpc->usr.ntc.user_name, msrpc->usr.ntc.domain));
-
- /* establish connection */
-
- if ((!msrpc->initialised))
- {
- return False;
- }
-
- if (msrpc->fd == -1 && msrpc->redirect)
- {
- if (msrpc_init_redirect(msrpc, pipe_name, &msrpc->usr))
- {
- DEBUG(10,("msrpc_establish_connection: redirected OK\n"));
- return True;
- }
- else
- {
- DEBUG(10,("redirect FAILED\n"));
- return False;
- }
- }
- if (msrpc->fd == -1)
- {
- if (!msrpc_connect(msrpc, pipe_name))
- {
- DEBUG(1,("msrpc_establish_connection: failed %s)\n",
- pipe_name));
-
- return False;
- }
- }
-
- if (!msrpc_authenticate(msrpc, &msrpc->usr))
- {
- DEBUG(0,("authenticate failed\n"));
- close(msrpc->fd);
- msrpc->fd = -1;
- return False;
- }
-
- return True;
-}
-
diff --git a/source3/lib/msrpc_use.c b/source3/lib/msrpc_use.c
deleted file mode 100644
index 3451b6ec59..0000000000
--- a/source3/lib/msrpc_use.c
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- Unix SMB/Netbios implementation.
- Version 1.9.
- SMB client generic functions
- Copyright (C) Andrew Tridgell 1994-1999
- Copyright (C) Luke Kenneth Casson Leighton 1996-1999
-
- 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 2 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, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#define NO_SYSLOG
-
-#include "includes.h"
-
-extern int DEBUGLEVEL;
-extern pstring global_myname;
-
-struct msrpc_use
-{
- struct msrpc_state *cli;
- uint32 num_users;
-};
-
-static struct msrpc_use **msrpcs = NULL;
-uint32 num_msrpcs = 0;
-
-/****************************************************************************
-terminate client connection
-****************************************************************************/
-static void msrpc_use_free(struct msrpc_use *cli)
-{
- if (cli->cli != NULL)
- {
- if (cli->cli->initialised)
- {
- msrpc_shutdown(cli->cli);
- }
- free(cli->cli);
- }
-
- free(cli);
-}
-
-/****************************************************************************
-free a client array
-****************************************************************************/
-static void free_msrpc_array(uint32 num_entries, struct msrpc_use **entries)
-{
- void(*fn)(void*) = (void(*)(void*))&msrpc_use_free;
- free_void_array(num_entries, (void**)entries, *fn);
-}
-
-/****************************************************************************
-add a client state to the array
-****************************************************************************/
-static struct msrpc_use* add_msrpc_to_array(uint32 *len,
- struct msrpc_use ***array,
- struct msrpc_use *cli)
-{
- int i;
- for (i = 0; i < num_msrpcs; i++)
- {
- if (msrpcs[i] == NULL)
- {
- msrpcs[i] = cli;
- return cli;
- }
- }
-
- return (struct msrpc_use*)add_item_to_array(len,
- (void***)array, (void*)cli);
-
-}
-
-/****************************************************************************
-initiate client array
-****************************************************************************/
-void init_msrpc_use(void)
-{
- msrpcs = NULL;
- num_msrpcs = 0;
-}
-
-/****************************************************************************
-terminate client array
-****************************************************************************/
-void free_msrpc_use(void)
-{
- free_msrpc_array(num_msrpcs, msrpcs);
- init_msrpc_use();
-}
-
-/****************************************************************************
-find client state. server name, user name, domain name and password must all
-match.
-****************************************************************************/
-static struct msrpc_use *msrpc_find(const char* pipe_name,
- struct user_creds *usr_creds)
-{
- int i;
- struct user_creds null_usr;
-
- if (usr_creds == NULL)
- {
- copy_user_creds(&null_usr, usr_creds);
- usr_creds = &null_usr;
- }
-
- DEBUG(10,("msrpc_find: %s %s %s\n",
- pipe_name,
- usr_creds != NULL ? usr_creds->ntc.user_name : "null",
- usr_creds != NULL ? usr_creds->ntc.domain : "null"));
-
- for (i = 0; i < num_msrpcs; i++)
- {
- char *msrpc_name = NULL;
- struct msrpc_use *c = msrpcs[i];
-
- if (c == NULL) continue;
-
- msrpc_name = c->cli->pipe_name;
-
- DEBUG(10,("msrpc_find[%d]: %s %s %s\n",
- i, msrpc_name,
- c->cli->usr.ntc.user_name,
- c->cli->usr.ntc.domain));
-
- if (!strequal(msrpc_name, pipe_name))
- {
- continue;
- }
- if (!strequal(usr_creds->ntc.user_name, c->cli->usr.ntc.user_name))
- {
- continue;
- }
- if (!usr_creds->reuse &&
- !pwd_compare((struct pwd_info *)&usr_creds->ntc.pwd, &c->cli->usr.ntc.pwd))
- {
- DEBUG(100,("password doesn't match\n"));
- continue;
- }
- if (usr_creds->ntc.domain[0] == 0)
- {
- return c;
- }
- if (strequal(usr_creds->ntc.domain, c->cli->usr.ntc.domain))
- {
- return c;
- }
- }
-
- return NULL;
-}
-
-/****************************************************************************
-create a new client state from user credentials
-****************************************************************************/
-static struct msrpc_use *msrpc_use_get(const char* pipe_name,
- uint32 pid,
- const struct user_creds *usr_creds)
-{
- struct msrpc_use *cli = (struct msrpc_use*)malloc(sizeof(*cli));
-
- if (cli == NULL)
- {
- return NULL;
- }
-
- memset(cli, 0, sizeof(*cli));
-
- cli->cli = msrpc_initialise(NULL, pid);
-
- if (cli->cli == NULL)
- {
- return NULL;
- }
-
- msrpc_init_creds(cli->cli, usr_creds);
-
- return cli;
-}
-
-/****************************************************************************
-init client state
-****************************************************************************/
-struct msrpc_state *msrpc_use_add(const char* pipe_name,
- uint32 pid,
- struct user_creds *usr_creds,
- BOOL redir)
-{
- struct msrpc_use *cli;
- DEBUG(10,("msrpc_use_add: %s redir: %s\n", pipe_name, BOOLSTR(redir)));
-
- cli = msrpc_find(pipe_name, usr_creds);
-
- if (cli != NULL)
- {
- cli->num_users++;
- return cli->cli;
- }
-
- /* reuse an existing connection requested, and one was not found */
- if (usr_creds != NULL && usr_creds->reuse && !redir)
- {
- DEBUG(0,("msrpc_use_add: reuse requested, but one not found\n"));
- return False;
- }
-
- /*
- * allocate
- */
-
- cli = msrpc_use_get(pipe_name, pid, usr_creds);
- cli->cli->redirect = redir;
-
- if (!msrpc_establish_connection(cli->cli, pipe_name))
- {
- DEBUG(0,("msrpc_use_add: connection failed\n"));
- cli->cli = NULL;
- msrpc_use_free(cli);
- return NULL;
- }
-
- add_msrpc_to_array(&num_msrpcs, &msrpcs, cli);
- cli->num_users++;
-
- return cli->cli;
-}
-
-/****************************************************************************
-delete a client state
-****************************************************************************/
-BOOL msrpc_use_del(const char* pipe_name,
- const struct user_creds *usr_creds,
- BOOL force_close,
- BOOL *connection_closed)
-{
- int i;
-
- DEBUG(10,("msrpc_net_use_del: %s. force close: %s\n",
- pipe_name, BOOLSTR(force_close)));
-
- if (connection_closed != NULL)
- {
- *connection_closed = False;
- }
-
- for (i = 0; i < num_msrpcs; i++)
- {
- char *msrpc_name = NULL;
-
- if (msrpcs[i] == NULL) continue;
- if (msrpcs[i]->cli == NULL) continue;
-
- msrpc_name = msrpcs[i]->cli->pipe_name;
-
- if (!strequal(msrpc_name, pipe_name)) continue;
-
- if (strequal(usr_creds->ntc.user_name,
- msrpcs[i]->cli->usr.ntc.user_name) &&
- strequal(usr_creds->ntc.domain,
- msrpcs[i]->cli->usr.ntc.domain))
- {
- /* decrement number of users */
- msrpcs[i]->num_users--;
-
- DEBUG(10,("idx: %i num_users now: %d\n",
- i, msrpcs[i]->num_users));
-
- if (force_close || msrpcs[i]->num_users == 0)
- {
- msrpc_use_free(msrpcs[i]);
- msrpcs[i] = NULL;
- if (connection_closed != NULL)
- {
- *connection_closed = True;
- }
- }
- return True;
- }
- }
-
- return False;
-}
-
-/****************************************************************************
-enumerate client states
-****************************************************************************/
-void msrpc_net_use_enum(uint32 *num_cons, struct use_info ***use)
-{
- int i;
-
- *num_cons = 0;
- *use = NULL;
-
- for (i = 0; i < num_msrpcs; i++)
- {
- struct use_info item;
-
- ZERO_STRUCT(item);
-
- if (msrpcs[i] == NULL) continue;
-
- item.connected = msrpcs[i]->cli != NULL ? True : False;
-
- if (item.connected)
- {
- item.srv_name = msrpcs[i]->cli->pipe_name;
- item.user_name = msrpcs[i]->cli->usr.ntc.user_name;
- item.domain = msrpcs[i]->cli->usr.ntc.domain;
- }
-
- add_use_info_to_array(num_cons, use, &item);
- }
-}