diff options
author | Stefan Metzmacher <metze@samba.org> | 2006-07-10 18:15:24 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:10:01 -0500 |
commit | 54fba07f0183d2e45eaf8658f2900445a312524d (patch) | |
tree | 7e97bb4284f94cd6745dac1f4d03cde5f1d3215c /source4/lib | |
parent | ec2b3baf09ebff97bc958e73591e128f14c7a378 (diff) | |
download | samba-54fba07f0183d2e45eaf8658f2900445a312524d.tar.gz samba-54fba07f0183d2e45eaf8658f2900445a312524d.tar.bz2 samba-54fba07f0183d2e45eaf8658f2900445a312524d.zip |
r16923: remove unused substitude code
metze
(This used to be commit ea88c8c99eff2203d13f9877e590d9d7f2fbb910)
Diffstat (limited to 'source4/lib')
-rw-r--r-- | source4/lib/util/config.mk | 1 | ||||
-rw-r--r-- | source4/lib/util/substitute.c | 170 |
2 files changed, 0 insertions, 171 deletions
diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk index 84598be4d0..cc3b1930c5 100644 --- a/source4/lib/util/config.mk +++ b/source4/lib/util/config.mk @@ -22,7 +22,6 @@ OBJ_FILES = xfile.o \ util_file.o \ data_blob.o \ util.o \ - substitute.o \ fsusage.o \ ms_fnmatch.o \ mutex.o \ diff --git a/source4/lib/util/substitute.c b/source4/lib/util/substitute.c deleted file mode 100644 index 2e55a7befb..0000000000 --- a/source4/lib/util/substitute.c +++ /dev/null @@ -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) -{ -} |