svn commit: samba r11942 - branches/SAMBA_3_0/examples/perfcounter trunk/examples/perfcounter

[jerry at samba.org]

Author: jerry
Date: 2005-11-28 15:56:10 +0000 (Mon, 28 Nov 2005)
New Revision: 11942

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11942

Log:
patch from Marcin to fix the mkdir() in perfcount daemon
Modified:
   branches/SAMBA_3_0/examples/perfcounter/perf_writer_util.c
   trunk/examples/perfcounter/perf_writer_util.c


Changeset:
Modified: branches/SAMBA_3_0/examples/perfcounter/perf_writer_util.c
===================================================================
--- branches/SAMBA_3_0/examples/perfcounter/perf_writer_util.c	2005-11-28 13:15:57 UTC (rev 11941)
+++ branches/SAMBA_3_0/examples/perfcounter/perf_writer_util.c	2005-11-28 15:56:10 UTC (rev 11942)
@@ -77,7 +77,7 @@
     fprintf(stderr, "Usage: %s [-d] [-f <file_path>].\n", progname);
     fprintf(stderr, "\t-d: run as a daemon.\n");
     fprintf(stderr, "\t-f <file_path>: path where the TDB files reside.\n");
-    fprintf(stderr, "\t\tDEFAULT is /tmp/counters\n");
+    fprintf(stderr, "\t\tDEFAULT is /var/lib/samba/perfmon\n");
     exit(1);
 }
 
@@ -116,13 +116,13 @@
     if(strlen(rt->dbDir) == 0)
     {
 	/* No file path was passed in, use default */
-	sprintf(rt->dbDir, "/tmp/counters");
+	sprintf(rt->dbDir, "/var/lib/samba/perfmon");
     }
 
     sprintf(rt->nameFile, "%s/names.tdb", rt->dbDir);
     sprintf(rt->counterFile, "%s/data.tdb", rt->dbDir);
 
-    mkdir(rt->dbDir, O_RDWR);
+    mkdir(rt->dbDir, 0755);
     rt->cnames = tdb_open(rt->nameFile, 0, TDB_CLEAR_IF_FIRST, O_RDWR | O_CREAT, 0644);
     rt->cdata = tdb_open(rt->counterFile, 0, TDB_CLEAR_IF_FIRST, O_RDWR | O_CREAT, 0644);
 

Modified: trunk/examples/perfcounter/perf_writer_util.c
===================================================================
--- trunk/examples/perfcounter/perf_writer_util.c	2005-11-28 13:15:57 UTC (rev 11941)
+++ trunk/examples/perfcounter/perf_writer_util.c	2005-11-28 15:56:10 UTC (rev 11942)
@@ -77,7 +77,7 @@
     fprintf(stderr, "Usage: %s [-d] [-f <file_path>].\n", progname);
     fprintf(stderr, "\t-d: run as a daemon.\n");
     fprintf(stderr, "\t-f <file_path>: path where the TDB files reside.\n");
-    fprintf(stderr, "\t\tDEFAULT is /tmp/counters\n");
+    fprintf(stderr, "\t\tDEFAULT is /var/lib/samba/perfmon\n");
     exit(1);
 }
 
@@ -116,13 +116,13 @@
     if(strlen(rt->dbDir) == 0)
     {
 	/* No file path was passed in, use default */
-	sprintf(rt->dbDir, "/tmp/counters");
+	sprintf(rt->dbDir, "/var/lib/samba/perfmon");
     }
 
     sprintf(rt->nameFile, "%s/names.tdb", rt->dbDir);
     sprintf(rt->counterFile, "%s/data.tdb", rt->dbDir);
 
-    mkdir(rt->dbDir, O_RDWR);
+    mkdir(rt->dbDir, 0755);
     rt->cnames = tdb_open(rt->nameFile, 0, TDB_CLEAR_IF_FIRST, O_RDWR | O_CREAT, 0644);
     rt->cdata = tdb_open(rt->counterFile, 0, TDB_CLEAR_IF_FIRST, O_RDWR | O_CREAT, 0644);