svn commit: samba r5871 - in branches/SAMBA_4_0/source/lib: .

[jelmer at samba.org]

Author: jelmer
Date: 2005-03-18 00:17:10 +0000 (Fri, 18 Mar 2005)
New Revision: 5871

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5871

Log:
Remove file with unused function (that uses fstring)
Remove fstring usage from version.c

Removed:
   branches/SAMBA_4_0/source/lib/username.c
Modified:
   branches/SAMBA_4_0/source/lib/basic.mk
   branches/SAMBA_4_0/source/lib/version.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/basic.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/basic.mk	2005-03-17 22:13:36 UTC (rev 5870)
+++ branches/SAMBA_4_0/source/lib/basic.mk	2005-03-18 00:17:10 UTC (rev 5871)
@@ -45,7 +45,6 @@
 		lib/system.o \
 		lib/time.o \
 		lib/genrand.o \
-		lib/username.o \
 		lib/dprintf.o \
 		lib/xfile.o \
 		lib/util_str.o \

Deleted: branches/SAMBA_4_0/source/lib/username.c
===================================================================
--- branches/SAMBA_4_0/source/lib/username.c	2005-03-17 22:13:36 UTC (rev 5870)
+++ branches/SAMBA_4_0/source/lib/username.c	2005-03-18 00:17:10 UTC (rev 5871)
@@ -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;
-}

Modified: branches/SAMBA_4_0/source/lib/version.c
===================================================================
--- branches/SAMBA_4_0/source/lib/version.c	2005-03-17 22:13:36 UTC (rev 5870)
+++ branches/SAMBA_4_0/source/lib/version.c	2005-03-18 00:17:10 UTC (rev 5871)
@@ -27,13 +27,14 @@
 #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);