Changeset 454 for trunk/server/source3/dynconfig.c

Timestamp:

Jun 4, 2010, 3:11:43 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: merged changes from 3.3

File:

• trunk/server/source3/dynconfig.c (modified) (3 diffs)

trunk/server/source3/dynconfig.c

@@ -41 +41 @@
  **/
 
+#ifndef __OS2__
 #define DEFINE_DYN_CONFIG_PARAM(name) \
 static char *dyn_##name; \
@@ -65 +66 @@
         return (dyn_##name == NULL);\
 }
+#else
+#define DEFINE_DYN_CONFIG_PARAM(name) \
+static char *dyn_##name; \
+\
+ const char *set_dyn_##name(const char *newpath) \
+{\
+        if (dyn_##name) {\
+                SAFE_FREE(dyn_##name);\
+        }\
+        dyn_##name = SMB_STRDUP(newpath);\
+        return dyn_##name;\
+}\
+\
+ bool is_default_dyn_##name(void) \
+{\
+        return (dyn_##name == NULL);\
+}
+#endif
 
 DEFINE_DYN_CONFIG_PARAM(SBINDIR)
@@ -83 +102 @@
 DEFINE_DYN_CONFIG_PARAM(SMB_PASSWD_FILE)
 DEFINE_DYN_CONFIG_PARAM(PRIVATE_DIR)
+
+#ifdef __OS2__
+
+/* Directory the binary was called from, same as getbindir() */
+const char *get_dyn_SBINDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", SBINDIR);
+                } else {
+                        snprintf(buffer, 260, "%s", exedir);
+                }
+        }
+
+        if (dyn_SBINDIR == NULL) {
+                return buffer;
+        }
+        return dyn_SBINDIR;
+}
+
+/* Directory the binary was called from, same as getsbindir() */
+const char *get_dyn_BINDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", BINDIR);
+                } else {
+                        snprintf(buffer, 260, "%s", exedir);
+                }
+        }
+
+        if (dyn_BINDIR == NULL) {
+                return buffer;
+        }
+        return dyn_BINDIR;
+}
+
+/* Directory holding the SWAT files */
+const char *get_dyn_SWATDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", SWATDIR);
+                } else {
+                        snprintf(buffer, 260, "%s/%s", exedir,"swat");
+                }
+        }
+
+        if (dyn_SWATDIR == NULL) {
+                return buffer;
+        }
+        return dyn_SWATDIR;
+}
+
+/* Location of smb.conf file. */
+const char *get_dyn_CONFIGFILE(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                snprintf(buffer, 260, "%s/samba/smb.conf", getenv("ETC"));
+        }
+        /* Set UNIXROOT to x:\MPTN if UNIXROOT is undefined */
+        if (getenv("UNIXROOT") == NULL) {
+                static char unixroot[1024] = "";
+                strncpy(unixroot,getenv("ETC"),strlen(getenv("ETC"))-4);
+                setenv("UNIXROOT",unixroot,0);
+        }
+        /* Make sure TMPIR points to a proper value */
+        static char tmpdir[1024] = "";
+        if (getenv("TMPDIR") == NULL && getenv("TEMP") != NULL) {
+                strncpy(tmpdir,getenv("TEMP"),strlen(getenv("TEMP")));
+                setenv("TMPDIR",tmpdir,0);
+        }
+        if (getenv("TMPDIR") == NULL) {
+                strncpy(tmpdir,getenv("ETC"),2);
+                stpcpy(tmpdir,"/OS2/SYSTEM");
+                setenv("TMPDIR",tmpdir,0);
+        }
+
+        if (dyn_CONFIGFILE == NULL) {
+                return buffer;
+        }
+        return dyn_CONFIGFILE;
+}
+
+/** Log file directory. **/
+const char *get_dyn_LOGFILEBASE(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                snprintf(buffer, 260, "%s/samba/log", getenv("ETC"));
+        }
+        if (dyn_LOGFILEBASE == NULL) {
+                return buffer;
+        }
+        return dyn_LOGFILEBASE;
+}
+
+/** Statically configured LanMan hosts. **/
+const char *get_dyn_LMHOSTSFILE(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                snprintf(buffer, 260, "%s/samba/lmhosts", getenv("ETC"));
+        }
+        if (dyn_LMHOSTSFILE == NULL) {
+                return buffer;
+        }
+        return dyn_LMHOSTSFILE;
+}
+
+/* Directory holding the codepages */
+const char *get_dyn_CODEPAGEDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", CODEPAGEDIR);
+                } else {
+                        snprintf(buffer, 260, "%s/%s", exedir, "codepages");
+                }
+        }
+
+        if (dyn_CODEPAGEDIR == NULL) {
+                return buffer;
+        }
+        return dyn_CODEPAGEDIR;
+}
+
+/* Directory holding the libs */
+const char *get_dyn_LIBDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", LIBDIR);
+                } else {
+                        snprintf(buffer, 260, "%s/%s", exedir, "lib");
+                }
+        }
+
+        if (dyn_LIBDIR == NULL) {
+                return buffer;
+        }
+        return dyn_LIBDIR;
+}
+
+/* Directory holding the modules */
+const char *get_dyn_MODULESDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", MODULESDIR);
+                } else {
+                        snprintf(buffer, 260, "%s/%s", exedir, "modules");
+                }
+        }
+
+        if (dyn_MODULESDIR == NULL) {
+                return buffer;
+        }
+        return dyn_MODULESDIR;
+}
+
+/* Directory holding lock files */
+const char *get_dyn_LOCKDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                snprintf(buffer, 260, "%s/samba/lock", getenv("ETC"));
+        }
+        if (dyn_LOCKDIR == NULL) {
+                return buffer;
+        }
+        return dyn_LOCKDIR;
+}
+
+/* Directory holding the pid files */
+const char *get_dyn_PIDDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                snprintf(buffer, 260, "%s/samba/pid", getenv("ETC"));
+        }
+        if (dyn_PIDDIR == NULL) {
+                return buffer;
+        }
+        return dyn_PIDDIR;
+}
+
+/* Location of smbpasswd */
+const char *get_dyn_SMB_PASSWD_FILE(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                snprintf(buffer, 260, "%s/samba/private/smbpasswd", getenv("ETC"));
+        }
+        if (dyn_SMB_PASSWD_FILE == NULL) {
+                return buffer;
+        }
+        return dyn_SMB_PASSWD_FILE;
+}
+
+/* Directory holding the private files */
+const char *get_dyn_PRIVATE_DIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                snprintf(buffer, 260, "%s/samba/private", getenv("ETC"));
+        }
+        if (dyn_PRIVATE_DIR == NULL) {
+                return buffer;
+        }
+        return dyn_PRIVATE_DIR;
+}
+
+/* @todo define NCALRPCDIR and SHLIBDIR eventually different */
+
+/* Directory holding the shared libs (same as libdir) */
+const char *get_dyn_SHLIBEXT(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", LIBDIR);
+                } else {
+                        snprintf(buffer, 260, "%s/%s", exedir, "lib");
+                }
+        }
+
+        if (dyn_SHLIBEXT == NULL) {
+                return buffer;
+        }
+        return dyn_SHLIBEXT;
+}
+
+/* Directory holding the NCALRPCDIR (whatever that is) */
+const char *get_dyn_NCALRPCDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", NCALRPCDIR);
+                } else {
+                        snprintf(buffer, 260, "%s/%s", exedir, "lib");
+                }
+        }
+
+        if (dyn_NCALRPCDIR == NULL) {
+                return buffer;
+        }
+        return dyn_NCALRPCDIR;
+}
+
+#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)
+{
+#ifdef FHS_COMPATIBLE
+        return STATEDIR;
+#else
+        return lp_lockdir();
+#endif
+}
+
+const char *get_dyn_CACHEDIR(void)
+{
+#ifdef FHS_COMPATIBLE
+        return CACHEDIR;
+#else
+        return lp_lockdir();
+#endif
+}