svn commit: samba r16923 - in branches/SAMBA_4_0/source: lib/util
param smb_server smb_server/smb
metze at samba.org
metze at samba.org
Mon Jul 10 18:15:25 GMT 2006
Author: metze
Date: 2006-07-10 18:15:24 +0000 (Mon, 10 Jul 2006)
New Revision: 16923
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16923
Log:
remove unused substitude code
metze
Removed:
branches/SAMBA_4_0/source/lib/util/substitute.c
Modified:
branches/SAMBA_4_0/source/lib/util/config.mk
branches/SAMBA_4_0/source/param/loadparm.c
branches/SAMBA_4_0/source/smb_server/smb/negprot.c
branches/SAMBA_4_0/source/smb_server/smb_server.h
Changeset:
Modified: branches/SAMBA_4_0/source/lib/util/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/util/config.mk 2006-07-10 16:47:47 UTC (rev 16922)
+++ branches/SAMBA_4_0/source/lib/util/config.mk 2006-07-10 18:15:24 UTC (rev 16923)
@@ -22,7 +22,6 @@
util_file.o \
data_blob.o \
util.o \
- substitute.o \
fsusage.o \
ms_fnmatch.o \
mutex.o \
Deleted: branches/SAMBA_4_0/source/lib/util/substitute.c
===================================================================
--- branches/SAMBA_4_0/source/lib/util/substitute.c 2006-07-10 16:47:47 UTC (rev 16922)
+++ branches/SAMBA_4_0/source/lib/util/substitute.c 2006-07-10 18:15:24 UTC (rev 16923)
@@ -1,170 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- string substitution functions
- Copyright (C) Andrew Tridgell 1992-2000
-
- 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.
-*/
-
-
-#include "includes.h"
-#include "smb_server/smb_server.h"
-
-/**
- * @file
- * @brief Substitution handling
- */
-
-/* oh bugger - I really didn't want to have a top-level context
- anywhere, but until we change all lp_*() calls to take a context
- argument this is needed */
-static struct substitute_context *sub;
-
-_PUBLIC_ void sub_set_context(struct substitute_context *subptr)
-{
- sub = subptr;
-}
-
-/*
- setup a string in the negotiate structure, using alpha_strcpy with SAFE_NETBIOS_CHARS
-*/
-static void setup_string(char **dest, const char *str)
-{
-#define SAFE_NETBIOS_CHARS ". -_"
- char *s;
-
- s = strdup(str);
- if (!s) {
- return;
- }
-
- alpha_strcpy(s, str, SAFE_NETBIOS_CHARS, strlen(s)+1);
-
- trim_string(s," "," ");
- strlower(s);
-
- SAFE_FREE(*dest);
- (*dest) = s;
-}
-
-_PUBLIC_ void sub_set_remote_proto(const char *str)
-{
- if (!sub) return;
- setup_string(&sub->remote_proto, str);
-}
-
-_PUBLIC_ void sub_set_remote_arch(const char *str)
-{
- if (!sub) return;
- setup_string(&sub->remote_arch, str);
-}
-
-/**
- setup the string used by %U substitution
-*/
-_PUBLIC_ void sub_set_user_name(const char *name)
-{
- if (!sub) return;
- setup_string(&sub->user_name, name);
-}
-
-/**
-FIXME
-**/
-_PUBLIC_ void standard_sub_basic(char *str,size_t len)
-{
-}
-
-/**
- Do some standard substitutions in a string.
- This function will return an allocated string that have to be freed.
-**/
-_PUBLIC_ char *talloc_sub_basic(TALLOC_CTX *mem_ctx, const char *smb_name, const char *str)
-{
- return talloc_strdup(mem_ctx, str);
-}
-
-_PUBLIC_ char *alloc_sub_basic(const char *smb_name, const char *str)
-{
- return strdup(str);
-}
-
-/**
- Do some specific substitutions in a string.
- This function will return an allocated string that have to be freed.
-**/
-
-_PUBLIC_ char *talloc_sub_specified(TALLOC_CTX *mem_ctx,
- const char *input_string,
- const char *username,
- const char *domain,
- uid_t uid,
- gid_t gid)
-{
- return talloc_strdup(mem_ctx, input_string);
-}
-
-_PUBLIC_ char *alloc_sub_specified(const char *input_string,
- const char *username,
- const char *domain,
- uid_t uid,
- gid_t gid)
-{
- return strdup(input_string);
-}
-
-_PUBLIC_ char *talloc_sub_advanced(TALLOC_CTX *mem_ctx,
- int snum,
- const char *user,
- const char *connectpath,
- gid_t gid,
- const char *smb_name,
- char *str)
-{
- return talloc_strdup(mem_ctx, str);
-}
-
-_PUBLIC_ char *alloc_sub_advanced(int snum, const char *user,
- const char *connectpath, gid_t gid,
- const char *smb_name, char *str)
-{
- return strdup(str);
-}
-
-/**
- Do some standard substitutions in a string.
-**/
-
-_PUBLIC_ void standard_sub_tcon(struct smbsrv_tcon *tcon, char *str, size_t len)
-{
-}
-
-_PUBLIC_ char *talloc_sub_tcon(TALLOC_CTX *mem_ctx, struct smbsrv_tcon *tcon, char *str)
-{
- return talloc_strdup(mem_ctx, str);
-}
-
-_PUBLIC_ char *alloc_sub_tcon(struct smbsrv_tcon *tcon, char *str)
-{
- return strdup(str);
-}
-
-/**
- Like standard_sub but by snum. FIXME
-**/
-
-_PUBLIC_ void standard_sub_snum(int snum, char *str, size_t len)
-{
-}
Modified: branches/SAMBA_4_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_4_0/source/param/loadparm.c 2006-07-10 16:47:47 UTC (rev 16922)
+++ branches/SAMBA_4_0/source/param/loadparm.c 2006-07-10 18:15:24 UTC (rev 16923)
@@ -68,6 +68,8 @@
static BOOL bLoaded = False;
+#define standard_sub_basic(str,len)
+
/* some helpful bits */
#define LP_SNUM_OK(i) (((i) >= 0) && ((i) < iNumServices) && ServicePtrs[(i)]->valid)
#define VALID(i) ServicePtrs[i]->valid
Modified: branches/SAMBA_4_0/source/smb_server/smb/negprot.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb/negprot.c 2006-07-10 16:47:47 UTC (rev 16922)
+++ branches/SAMBA_4_0/source/smb_server/smb/negprot.c 2006-07-10 18:15:24 UTC (rev 16923)
@@ -502,7 +502,6 @@
if (strcmp(supported_protocols[protocol].proto_name, protos[i]) != 0) continue;
supported_protocols[protocol].proto_reply_fn(req, i);
- sub_set_remote_proto(supported_protocols[protocol].short_name);
DEBUG(3,("Selected protocol [%d][%s]\n",
i, supported_protocols[protocol].proto_name));
return;
Modified: branches/SAMBA_4_0/source/smb_server/smb_server.h
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb_server.h 2006-07-10 16:47:47 UTC (rev 16922)
+++ branches/SAMBA_4_0/source/smb_server/smb_server.h 2006-07-10 18:15:24 UTC (rev 16923)
@@ -257,31 +257,6 @@
struct request_buffer out;
};
-/* this contains variables that should be used in % substitutions for
- * smb.conf parameters */
-struct substitute_context {
- char *remote_arch;
-
- /* our local netbios name, as give to us by the client */
- char *local_machine;
-
- /* the remote netbios name, as give to us by the client */
- char *remote_machine;
-
- /* the select remote protocol */
- char *remote_proto;
-
- /* the name of the client as should be displayed in
- * smbstatus. Can be an IP or a netbios name */
- char *client_name;
-
- /* the username for %U */
- char *user_name;
-};
-
-/* Remote architectures we know about. */
-enum remote_arch_types {RA_UNKNOWN, RA_WFWG, RA_OS2, RA_WIN95, RA_WINNT, RA_WIN2K, RA_WINXP, RA_SAMBA};
-
enum security_types {SEC_SHARE,SEC_USER};
/* smb server context structure. This should contain all the state
@@ -313,10 +288,6 @@
*/
unsigned max_recv; /* init to BUFFER_SIZE */
- /* a guess at the remote architecture. Try not to rely on this - in almost
- all cases using these values is the wrong thing to do */
- enum remote_arch_types ra_type;
-
/* the negotiatiated protocol */
enum protocol_types protocol;
More information about the samba-cvs
mailing list