Changeset 680 for branches/samba-3.3.x/source/dynconfig.c

Timestamp:

Jan 25, 2012, 9:46:18 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba Client 2.1: Fix for Ticket #181, remove several bogus files

File:

• branches/samba-3.3.x/source/dynconfig.c (modified) (27 diffs)

branches/samba-3.3.x/source/dynconfig.c

@@ -4 +4 @@
    Copyright (C) 2003 by Jim McDonough <jmcd@us.ibm.com>
    Copyright (C) 2007 by Jeremy Allison <jra@samba.org>
-
    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 3 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, see <http://www.gnu.org/licenses/>.
 */
-
 #include "includes.h"
 
@@ -40 +36 @@
  * table?  There's kind of a chicken-and-egg situation there...
  **/
-
 #ifndef __OS2__
 #define DEFINE_DYN_CONFIG_PARAM(name) \
@@ -84 +79 @@
 }
 #endif
-
 DEFINE_DYN_CONFIG_PARAM(SBINDIR)
 DEFINE_DYN_CONFIG_PARAM(BINDIR)
@@ -100 +94 @@
 DEFINE_DYN_CONFIG_PARAM(PRIVATE_DIR)
 
-
 #ifdef __OS2__
-
 /* Directory the binary was called from, same as getbindir() */
 const char *get_dyn_SBINDIR(void)
@@ -117 +109 @@
                 }
         }
-
         if (dyn_SBINDIR == NULL) {
                 return buffer;
@@ -123 +114 @@
         return dyn_SBINDIR;
 }
-
 /* Directory the binary was called from, same as getsbindir() */
 const char *get_dyn_BINDIR(void)
@@ -138 +128 @@
                 }
         }
-
         if (dyn_BINDIR == NULL) {
                 return buffer;
@@ -144 +133 @@
         return dyn_BINDIR;
 }
-
 /* Directory holding the SWAT files */
 const char *get_dyn_SWATDIR(void)
@@ -159 +147 @@
                 }
         }
-
         if (dyn_SWATDIR == NULL) {
                 return buffer;
@@ -165 +152 @@
         return dyn_SWATDIR;
 }
-
 /* Location of smb.conf file. */
 const char *get_dyn_CONFIGFILE(void)
@@ -191 +177 @@
                 setenv("TMPDIR",tmpdir,0);
         }
-
         if (dyn_CONFIGFILE == NULL) {
                 return buffer;
@@ -197 +182 @@
         return dyn_CONFIGFILE;
 }
-
 /** Log file directory. **/
 const char *get_dyn_LOGFILEBASE(void)
@@ -211 +195 @@
         return dyn_LOGFILEBASE;
 }
-
 /** Statically configured LanMan hosts. **/
 const char *get_dyn_LMHOSTSFILE(void)
@@ -225 +208 @@
         return dyn_LMHOSTSFILE;
 }
-
 /* Directory holding the codepages */
 const char *get_dyn_CODEPAGEDIR(void)
@@ -237 +219 @@
                         snprintf(buffer, 260, "%s", CODEPAGEDIR);
                 } else {
-                        snprintf(buffer, 260, "%s/%s", exedir, "codepages");
-                }
-        }
-
+                        if (!lp_is_in_client()) {
+                                snprintf(buffer, 260, "%s/%s", exedir, "codepages");
+                        } else {
+                                snprintf(buffer, 260, "%s/%s", getenv("SMB_EXE"), "codepages");
+                        }
+                }
+        }
         if (dyn_CODEPAGEDIR == NULL) {
                 return buffer;
@@ -246 +231 @@
         return dyn_CODEPAGEDIR;
 }
-
 /* Directory holding the libs */
 const char *get_dyn_LIBDIR(void)
@@ -261 +245 @@
                 }
         }
-
         if (dyn_LIBDIR == NULL) {
                 return buffer;
@@ -267 +250 @@
         return dyn_LIBDIR;
 }
-
 /* Directory holding the modules */
 const char *get_dyn_MODULESDIR(void)
@@ -282 +264 @@
                 }
         }
-
         if (dyn_MODULESDIR == NULL) {
                 return buffer;
@@ -288 +269 @@
         return dyn_MODULESDIR;
 }
-
 /* Directory holding lock files */
 const char *get_dyn_LOCKDIR(void)
@@ -307 +287 @@
         return dyn_LOCKDIR;
 }
-
 /* Directory holding the pid files */
 const char *get_dyn_PIDDIR(void)
@@ -321 +300 @@
         return dyn_PIDDIR;
 }
-
 /* Location of smbpasswd */
 const char *get_dyn_SMB_PASSWD_FILE(void)
@@ -335 +313 @@
         return dyn_SMB_PASSWD_FILE;
 }
-
 /* Directory holding the private files */
 const char *get_dyn_PRIVATE_DIR(void)
@@ -349 +326 @@
         return dyn_PRIVATE_DIR;
 }
-
 /* Directory holding the shared libs (same as libdir) */
 const char *get_dyn_SHLIBEXT(void)
@@ -364 +340 @@
                 }
         }
-
         if (dyn_SHLIBEXT == NULL) {
                 return buffer;
@@ -370 +345 @@
         return dyn_SHLIBEXT;
 }
-
 #endif /* __OS2__ */
-
 /* In non-FHS mode, these should be configurable using 'lock dir =';
    but in FHS mode, they are their own directory.  Implement as wrapper
    functions so that everything can still be kept in dynconfig.c.
  */
-
 const char *get_dyn_STATEDIR(void)
 {
@@ -386 +358 @@
 #endif
 }
-
 const char *get_dyn_CACHEDIR(void)
 {