Changeset 831

Timestamp:

Nov 13, 2013, 5:29:22 PM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.6: remove some @todo

Location:

trunk/server/source3

Files:

• dynconfig.c (modified) (7 diffs)
• libsmb/clifile.c (modified) (1 diff)
• param/loadparm.c (modified) (1 diff)

trunk/server/source3/dynconfig.c ¶

@@ -106 +106 @@
 
 #ifdef __OS2__
-// @todo change this file so it also works for rpm
-// @todo see what NMBDSOCKETDIR & LOCALEDIR are used for
+// @todo_port change this file so it also works for rpm
 
 /* Directory the binary was called from, same as getbindir() */
@@ -376 +375 @@
 }
 
-/* Directory holding the NMBDSOCKETDIR (whatever that is) */
+/* Directory holding the NMBDSOCKETDIR */
 const char *get_dyn_NMBDSOCKETDIR(void)
 {
@@ -382 +381 @@
         if (!*buffer)
         {
-                char exedir[1024] = "";
-                if (!os2_GetExePath(exedir))
-                {
-                        snprintf(buffer, 260, "%s", NMBDSOCKETDIR);
-                } else {
-                        snprintf(buffer, 260, "%s/%s", exedir, "lib");
-                }
+                snprintf(buffer, 260, "%s/samba/nmbd", getenv("ETC"));
         }
 
@@ -397 +390 @@
 }
 
-/* Directory holding the LOCALEDIR (whatever that is) */
+/* Directory holding the LOCALEDIR */
 const char *get_dyn_LOCALEDIR(void)
 {
@@ -403 +396 @@
         if (!*buffer)
         {
-                char exedir[1024] = "";
-                if (!os2_GetExePath(exedir))
-                {
-                        snprintf(buffer, 260, "%s", LOCALEDIR);
-                } else {
-                        snprintf(buffer, 260, "%s/%s", exedir, "lib");
-                }
+                snprintf(buffer, 260, "%s/samba/locale", getenv("ETC"));
         }
 
@@ -418 +405 @@
 }
 
-/* Directory holding the NCALRPCDIR (whatever that is) */
+/* Directory holding the NCALRPCDIR */
 const char *get_dyn_NCALRPCDIR(void)
 {
@@ -424 +411 @@
         if (!*buffer)
         {
-                char exedir[1024] = "";
-                if (!os2_GetExePath(exedir))
-                {
-                        snprintf(buffer, 260, "%s", NCALRPCDIR);
-                } else {
-                        snprintf(buffer, 260, "%s/%s", exedir, "lib");
-                }
+                snprintf(buffer, 260, "%s/samba/ncalrpc", getenv("ETC"));
         }
 

trunk/server/source3/libsmb/clifile.c ¶

@@ -4213 +4213 @@
                                     SMB_INFO_QUERY_ALL_EAS, 4,
                                     cli->max_xmit);
-// @todo in earlier port the above cli->max_xmit was changed to CLI_BUFFER_SIZE
-// @todo is that still needed? if no regressions are found please remove it
+// @todo_port in earlier port the above cli->max_xmit was changed to CLI_BUFFER_SIZE
+// @todo_port is that still needed? if no regressions are found please remove it
         if (tevent_req_nomem(subreq, req)) {
                 return tevent_req_post(req, ev);

trunk/server/source3/param/loadparm.c ¶

@@ -9737 +9737 @@
            }
            lp_do_parameter(GLOBAL_SECTION_SNUM, "lock directory", s);
-// @todo what do these directories do
+
+           s=NULL;
+           if (asprintf(&s, "%s/%s", lp_statedir(), "client") < 0) {
+                smb_panic("init_globals: ENOMEM");
+           }
            lp_do_parameter(GLOBAL_SECTION_SNUM, "state directory", s);
+
+           s=NULL;
+           if (asprintf(&s, "%s/%s", lp_cachedir(), "client") < 0) {
+                smb_panic("init_globals: ENOMEM");
+           }
            lp_do_parameter(GLOBAL_SECTION_SNUM, "cache directory", s);
            SAFE_FREE(s);