summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-03-18 00:17:10 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:11:06 -0500
commitd4c0da18a732d5d437eb1f0d9dd3279ef8cda649 (patch)
tree9165371a796697dbd86e2ac892f3c9b02ed663e9
parent72621f838e56e67dd68616cf91a57830d5218912 (diff)
downloadsamba-d4c0da18a732d5d437eb1f0d9dd3279ef8cda649.tar.gz
samba-d4c0da18a732d5d437eb1f0d9dd3279ef8cda649.tar.bz2
samba-d4c0da18a732d5d437eb1f0d9dd3279ef8cda649.zip
r5871: Remove file with unused function (that uses fstring)
Remove fstring usage from version.c (This used to be commit d25163159c19d6f948551438f459d161ba6ea4ac)
-rw-r--r--source4/lib/basic.mk1
-rw-r--r--source4/lib/username.c51
-rw-r--r--source4/lib/version.c5
3 files changed, 3 insertions, 54 deletions
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index 5f9a60e114..257f59d8ed 100644
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -45,7 +45,6 @@ ADD_OBJ_FILES = \
lib/system.o \
lib/time.o \
lib/genrand.o \
- lib/username.o \
lib/dprintf.o \
lib/xfile.o \
lib/util_str.o \
diff --git a/source4/lib/username.c b/source4/lib/username.c
deleted file mode 100644
index 55965a7980..0000000000
--- a/source4/lib/username.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- Username handling
- Copyright (C) Andrew Tridgell 1992-1998
- Copyright (C) Jeremy Allison 1997-2001.
-
- 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 "pstring.h"
-
-/*****************************************************************
- Splits passed user or group name to domain and user/group name parts
- Returns True if name was splitted and False otherwise.
-*****************************************************************/
-
-BOOL split_domain_and_name(const char *name, char *domain, char* username)
-{
- char *p = strchr(name,*lp_winbind_separator());
-
-
- /* Parse a string of the form DOMAIN/user into a domain and a user */
- DEBUG(10,("split_domain_and_name: checking whether name |%s| local or not\n", name));
-
- if (p) {
- fstrcpy(username, p+1);
- fstrcpy(domain, name);
- domain[PTR_DIFF(p, name)] = 0;
- } else if (lp_winbind_use_default_domain()) {
- fstrcpy(username, name);
- fstrcpy(domain, lp_workgroup());
- } else {
- return False;
- }
-
- DEBUG(10,("split_domain_and_name: all is fine, domain is |%s| and name is |%s|\n", domain, username));
- return True;
-}
diff --git a/source4/lib/version.c b/source4/lib/version.c
index fb5ed3ce05..1adbc91385 100644
--- a/source4/lib/version.c
+++ b/source4/lib/version.c
@@ -27,13 +27,14 @@ const char *samba_version_string(void)
#ifndef SAMBA_VERSION_VENDOR_SUFFIX
return SAMBA_VERSION_OFFICIAL_STRING;
#else
- static fstring samba_version;
+ static char *samba_version;
static BOOL init_samba_version;
if (init_samba_version)
return samba_version;
- snprintf(samba_version,sizeof(samba_version),"%s-%s",
+ samba_version = talloc_asprintf(
+ talloc_autofree_context(), "%s-%s",
SAMBA_VERSION_OFFICIAL_STRING,
SAMBA_VERSION_VENDOR_SUFFIX);