svn commit: samba r15133 - branches/SAMBA_3_0/source/param branches/SAMBA_3_0/source/smbd trunk/source/param trunk/source/smbd trunk/source/tdb

[vlendec at samba.org]

Author: vlendec
Date: 2006-04-19 14:11:51 +0000 (Wed, 19 Apr 2006)
New Revision: 15133

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

Log:
in_server is not used anywhere
Modified:
   branches/SAMBA_3_0/source/param/loadparm.c
   branches/SAMBA_3_0/source/smbd/server.c
   trunk/source/param/loadparm.c
   trunk/source/smbd/server.c
   trunk/source/tdb/tdb.c


Changeset:
Modified: branches/SAMBA_3_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_0/source/param/loadparm.c	2006-04-19 13:14:14 UTC (rev 15132)
+++ branches/SAMBA_3_0/source/param/loadparm.c	2006-04-19 14:11:51 UTC (rev 15133)
@@ -54,7 +54,6 @@
 #include "includes.h"
 
 BOOL in_client = False;		/* Not in the client by default */
-BOOL in_server = False;		/* Not in the server by default */
 BOOL bLoaded = False;
 
 extern userdom_struct current_user_info;

Modified: branches/SAMBA_3_0/source/smbd/server.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/server.c	2006-04-19 13:14:14 UTC (rev 15132)
+++ branches/SAMBA_3_0/source/smbd/server.c	2006-04-19 14:11:51 UTC (rev 15133)
@@ -731,7 +731,6 @@
 
  int main(int argc,const char *argv[])
 {
-	extern BOOL in_server;
 	/* shall I run as a daemon */
 	static BOOL is_daemon = False;
 	static BOOL interactive = False;
@@ -755,8 +754,6 @@
 	{ NULL }
 	};
 
-	in_server = True;
-
 	load_case_tables();
 
 #ifdef HAVE_SET_AUTH_PARAMETERS

Modified: trunk/source/param/loadparm.c
===================================================================
--- trunk/source/param/loadparm.c	2006-04-19 13:14:14 UTC (rev 15132)
+++ trunk/source/param/loadparm.c	2006-04-19 14:11:51 UTC (rev 15133)
@@ -54,7 +54,6 @@
 #include "includes.h"
 
 BOOL in_client = False;		/* Not in the client by default */
-BOOL in_server = False;		/* Not in the server by default */
 BOOL bLoaded = False;
 
 extern userdom_struct current_user_info;

Modified: trunk/source/smbd/server.c
===================================================================
--- trunk/source/smbd/server.c	2006-04-19 13:14:14 UTC (rev 15132)
+++ trunk/source/smbd/server.c	2006-04-19 14:11:51 UTC (rev 15133)
@@ -731,7 +731,6 @@
 
  int main(int argc,const char *argv[])
 {
-	extern BOOL in_server;
 	/* shall I run as a daemon */
 	static BOOL is_daemon = False;
 	static BOOL interactive = False;
@@ -755,8 +754,6 @@
 	{ NULL }
 	};
 
-	in_server = True;
-
 	load_case_tables();
 
 #ifdef HAVE_SET_AUTH_PARAMETERS

Modified: trunk/source/tdb/tdb.c
===================================================================
--- trunk/source/tdb/tdb.c	2006-04-19 13:14:14 UTC (rev 15132)
+++ trunk/source/tdb/tdb.c	2006-04-19 14:11:51 UTC (rev 15133)
@@ -74,7 +74,7 @@
 			return 0;
 
 		if (!TDB_DEAD(r) && hash==r->full_hash && key.dsize==r->key_len) {
-			char *k;
+			void *k;
 			/* a very likely hit - read the key */
 			k = tdb_alloc_read(tdb, rec_ptr + sizeof(*r), 
 					   r->key_len);