svn commit: samba r18218 - in branches/SAMBA_4_0/source/nsswitch: .

[tridge at samba.org]

Author: tridge
Date: 2006-09-07 11:48:53 +0000 (Thu, 07 Sep 2006)
New Revision: 18218

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

Log:

setenv() is guaranteed by libreplace

also, putenv() cannot take a const char *

Modified:
   branches/SAMBA_4_0/source/nsswitch/wb_common.c


Changeset:
Modified: branches/SAMBA_4_0/source/nsswitch/wb_common.c
===================================================================
--- branches/SAMBA_4_0/source/nsswitch/wb_common.c	2006-09-07 11:17:56 UTC (rev 18217)
+++ branches/SAMBA_4_0/source/nsswitch/wb_common.c	2006-09-07 11:48:53 UTC (rev 18218)
@@ -600,27 +600,14 @@
  enable them
  ************************************************************************/
  
-/* Use putenv() instead of setenv() in these functions as not all
-   environments have the latter. */
-
 BOOL winbind_off( void )
 {
-#if HAVE_SETENV
 	setenv(WINBINDD_DONT_ENV, "1", 1);
 	return True;
-#else
-	static const char *s = WINBINDD_DONT_ENV "=1";
-	return putenv(s) != -1;
-#endif
 }
 
 BOOL winbind_on( void )
 {
-#if HAVE_SETENV
 	setenv(WINBINDD_DONT_ENV, "0", 1);
 	return True;
-#else
-	static const char *s = WINBINDD_DONT_ENV "=0";
-	return putenv(s) != -1;
-#endif
 }