Fix building --with-smbwrapper.

diff --git a/source/smbwrapper/shared.c b/source/smbwrapper/shared.c
index 00dd30b70e1a4d25e628d4d79680f0541d2af718..b4cfcf71486a3ead71dea398a73d10839378c34b 100644 (file)
--- a/source/smbwrapper/shared.c
+++ b/source/smbwrapper/shared.c
@@ -52,7 +52,7 @@ void smbw_setup_shared(void)
 
        slprintf(s,sizeof(s)-1,"%d", shared_fd);
 
-       smbw_setenv("SMBW_HANDLE", s);
+       setenv("SMBW_HANDLE", s, 1);
 
        return;
 
@@ -194,24 +194,6 @@ void smbw_setshared(const char *name, const char *val)
 }
 
 
-/*****************************************************************
-set an env variable - some systems don't have this
-*****************************************************************/  
-int smbw_setenv(const char *name, const char *value)
-{
-       pstring s;
-       char *p;
-       int ret = -1;
-
-       slprintf(s,sizeof(s)-1,"%s=%s", name, value);
-
-       p = strdup(s);
-
-       if (p) ret = putenv(p);
-
-       return ret;
-}
-
 /*****************************************************************
 return true if the passed fd is the SMBW_HANDLE
 *****************************************************************/  

diff --git a/source/smbwrapper/smbsh.c b/source/smbwrapper/smbsh.c
index d853aa1afce615678efd164eebc59290434c2201..221c6d87c2283eab306f4c35bf40fb6701990bb5 100644 (file)
--- a/source/smbwrapper/smbsh.c
+++ b/source/smbwrapper/smbsh.c
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
                smbw_setshared("PASSWORD", p);
        }
 
-       setenv("PS1", "smbsh$ ");
+       setenv("PS1", "smbsh$ ", 1);
 
        sys_getwd(wd);
 
@@ -101,18 +101,18 @@ int main(int argc, char *argv[])
        smbw_setshared(line, wd);
 
        slprintf(line,sizeof(line)-1,"%s/smbwrapper.so", libd);
-       etenv("LD_PRELOAD", line);
+       setenv("LD_PRELOAD", line, 1);
 
        slprintf(line,sizeof(line)-1,"%s/smbwrapper.32.so", libd);
 
        if (file_exist(line, NULL)) {
                slprintf(line,sizeof(line)-1,"%s/smbwrapper.32.so:DEFAULT", libd);
-               setenv("_RLD_LIST", line);
+               setenv("_RLD_LIST", line, 1);
                slprintf(line,sizeof(line)-1,"%s/smbwrapper.so:DEFAULT", libd);
-               setenv("_RLDN32_LIST", line);
+               setenv("_RLDN32_LIST", line, 1);
        } else {
                slprintf(line,sizeof(line)-1,"%s/smbwrapper.so:DEFAULT", libd);
-               setenv("_RLD_LIST", line);
+               setenv("_RLD_LIST", line, 1);
        }
 
        {