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

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/dynconfig.c (modified) (5 diffs)

trunk/server/source3/dynconfig.c

@@ -99 +99 @@
 DEFINE_DYN_CONFIG_PARAM(CACHEDIR) /** Temporary cache files. Default LOCKDIR */
 DEFINE_DYN_CONFIG_PARAM(PIDDIR)
+DEFINE_DYN_CONFIG_PARAM(NMBDSOCKETDIR)
 DEFINE_DYN_CONFIG_PARAM(NCALRPCDIR)
 DEFINE_DYN_CONFIG_PARAM(SMB_PASSWD_FILE)
 DEFINE_DYN_CONFIG_PARAM(PRIVATE_DIR)
+DEFINE_DYN_CONFIG_PARAM(LOCALEDIR)
 
 #ifdef __OS2__
+// @todo change this file so it also works for rpm
+// @todo see what NMBDSOCKETDIR & LOCALEDIR are used for
 
 /* Directory the binary was called from, same as getbindir() */
@@ -295 +299 @@
 }
 
+/* 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))
+                {
+                        snprintf(buffer, 260, "%s", LIBDIR);
+                } else {
+                        snprintf(buffer, 260, "%s/%s", exedir, "lib");
+                }
+        }
+
+        if (dyn_SHLIBEXT == NULL) {
+                return buffer;
+        }
+        return dyn_SHLIBEXT;
+}
+
 /* Directory holding lock files */
 const char *get_dyn_LOCKDIR(void)
@@ -309 +334 @@
 }
 
+/* Directory holding persistent state files */
+const char *get_dyn_STATEDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                snprintf(buffer, 260, "%s/samba/lock", getenv("ETC"));
+        }
+        if (dyn_STATEDIR == NULL) {
+                return buffer;
+        }
+        return dyn_STATEDIR;
+}
+
+/* Temporary cache files. Default LOCKDIR */
+const char *get_dyn_CACHEDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                snprintf(buffer, 260, "%s/samba/lock", getenv("ETC"));
+        }
+        if (dyn_CACHEDIR == NULL) {
+                return buffer;
+        }
+        return dyn_CACHEDIR;
+}
+
 /* Directory holding the pid files */
 const char *get_dyn_PIDDIR(void)
@@ -323 +376 @@
 }
 
+/* Directory holding the NMBDSOCKETDIR (whatever that is) */
+const char *get_dyn_NMBDSOCKETDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (!os2_GetExePath(exedir))
+                {
+                        snprintf(buffer, 260, "%s", NMBDSOCKETDIR);
+                } else {
+                        snprintf(buffer, 260, "%s/%s", exedir, "lib");
+                }
+        }
+
+        if (dyn_NMBDSOCKETDIR == NULL) {
+                return buffer;
+        }
+        return dyn_NMBDSOCKETDIR;
+}
+
+/* Directory holding the LOCALEDIR (whatever that is) */
+const char *get_dyn_LOCALEDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (!os2_GetExePath(exedir))
+                {
+                        snprintf(buffer, 260, "%s", LOCALEDIR);
+                } else {
+                        snprintf(buffer, 260, "%s/%s", exedir, "lib");
+                }
+        }
+
+        if (dyn_LOCALEDIR == NULL) {
+                return buffer;
+        }
+        return dyn_LOCALEDIR;
+}
+
+/* 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))
+                {
+                        snprintf(buffer, 260, "%s", NCALRPCDIR);
+                } else {
+                        snprintf(buffer, 260, "%s/%s", exedir, "lib");
+                }
+        }
+
+        if (dyn_NCALRPCDIR == NULL) {
+                return buffer;
+        }
+        return dyn_NCALRPCDIR;
+}
+
 /* Location of smbpasswd */
 const char *get_dyn_SMB_PASSWD_FILE(void)
@@ -351 +467 @@
 }
 
-/* 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))
-                {
-                        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))
-                {
-                        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
-}