Windows: mp target trailing dot not part vol name
authorJeffrey Altman <jaltman@your-file-system.com>
Fri, 4 Mar 2011 16:04:40 +0000 (11:04 -0500)
committerJeffrey Altman <jaltman@openafs.org>
Fri, 4 Mar 2011 19:55:06 +0000 (11:55 -0800)
Instead of passing "root.cell." into cm_FreelanceAddMount
pass in "root.cell" and add the trailing dot within the function.

Change-Id: I5d27c6c34a3197a451491a0bbdf6c854394ce572
Reviewed-on: http://gerrit.openafs.org/4124
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>

src/WINNT/afsd/cm_freelance.c

index c8498ed..d367b1b 100644 (file)
@@ -590,9 +590,9 @@ long cm_InitLocalMountPoints() {
             code = cm_GetRootCellName(&rootCellName[1]);
             if (code == 0) {
                 lock_ReleaseMutex(&cm_Freelance_Lock);
-                cm_FreelanceAddMount(&rootCellName[1], &rootCellName[1], "root.cell.", 0, NULL);
-                cm_FreelanceAddMount(rootCellName, &rootCellName[1], "root.cell.", 1, NULL);
-                cm_FreelanceAddMount(".root", &rootCellName[1], "root.afs.", 1, NULL);
+                cm_FreelanceAddMount(&rootCellName[1], &rootCellName[1], "root.cell", 0, NULL);
+                cm_FreelanceAddMount(rootCellName, &rootCellName[1], "root.cell", 1, NULL);
+                cm_FreelanceAddMount(".root", &rootCellName[1], "root.afs", 1, NULL);
                 lock_ObtainMutex(&cm_Freelance_Lock);
                 dwMountPoints = 3;
             }
@@ -791,9 +791,9 @@ long cm_InitLocalMountPoints() {
        code = cm_GetRootCellName(&rootCellName[1]);
         if (code == 0) {
             lock_ReleaseMutex(&cm_Freelance_Lock);
-            cm_FreelanceAddMount(&rootCellName[1], &rootCellName[1], "root.cell.", 0, NULL);
-            cm_FreelanceAddMount(rootCellName, &rootCellName[1], "root.cell.", 1, NULL);
-            cm_FreelanceAddMount(".root", &rootCellName[1], "root.afs.", 1, NULL);
+            cm_FreelanceAddMount(&rootCellName[1], &rootCellName[1], "root.cell", 0, NULL);
+            cm_FreelanceAddMount(rootCellName, &rootCellName[1], "root.cell", 1, NULL);
+            cm_FreelanceAddMount(".root", &rootCellName[1], "root.afs", 1, NULL);
             lock_ObtainMutex(&cm_Freelance_Lock);
         }
         return 0;
@@ -1117,9 +1117,9 @@ long cm_FreelanceAddMount(char *filename, char *cellname, char *volume, int rw,
                          );
 
         if (rw)
-            sprintf(line, "%s%%%s:%s", filename, fullname, volume);
+            sprintf(line, "%s%%%s:%s.", filename, fullname, volume);
         else
-            sprintf(line, "%s#%s:%s", filename, fullname, volume);
+            sprintf(line, "%s#%s:%s.", filename, fullname, volume);
 
         /* If we are adding a new value, there must be an unused name
          * within the range 0 to dwMountPoints 
@@ -1163,9 +1163,9 @@ long cm_FreelanceAddMount(char *filename, char *cellname, char *volume, int rw,
         fprintf(fp, "%d", n);
         fseek(fp, 0, SEEK_END);
         if (rw)
-            fprintf(fp, "%s%%%s:%s\n", filename, fullname, volume);
+            fprintf(fp, "%s%%%s:%s.\n", filename, fullname, volume);
         else
-            fprintf(fp, "%s#%s:%s\n", filename, fullname, volume);
+            fprintf(fp, "%s#%s:%s.\n", filename, fullname, volume);
         fclose(fp);
     }