]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mount.ceph: key -> secret
authorSage Weil <sage@newdream.net>
Fri, 14 Aug 2009 19:50:03 +0000 (12:50 -0700)
committerSage Weil <sage@newdream.net>
Fri, 14 Aug 2009 21:37:49 +0000 (14:37 -0700)
src/mount/mount.ceph.c

index 34200d5a86a77f0b2c07281d5976e0b5343f24fe..491970f1cae3c045ce023a0041d7f89bc80b73d7 100644 (file)
@@ -170,34 +170,34 @@ static int parse_options(char ** optionsp, int * filesys_flags)
                        *filesys_flags &= ~MS_RDONLY;
                 } else if (strncmp(data, "remount", 7) == 0) {
                         *filesys_flags |= MS_REMOUNT;
-               } else if (strncmp(data, "keyfile", 7) == 0) {
+               } else if (strncmp(data, "secretfile", 7) == 0) {
                        char *fn = value;
                        char *end = fn;
                        int fd;
-                       char key[1000];
+                       char secret[1000];
                        int len;
 
                        while (*end && *end != ',')
                                end++;
                        fd = open(fn, O_RDONLY);
                        if (fd < 0) {
-                               perror("unable to read keyfile");
+                               perror("unable to read secretfile");
                                return -1;
                        }
-                       len = read(fd, key, 1000);
+                       len = read(fd, secret, 1000);
                        if (len <= 0) {
-                               perror("unable to read key from keyfile");
+                               perror("unable to read secret from secretfile");
                                return -1;
                        }
-                       end = key;
-                       while (end < key + len && *end && *end != '\n' && *end != '\r')
+                       end = secret;
+                       while (end < secret + len && *end && *end != '\n' && *end != '\r')
                                end++;
                        *end = '\0';
                        close(fd);
 
-                       //printf("read key of len %d from %s\n", len, fn);
-                       data = "key";
-                       value = key;
+                       //printf("read secret of len %d from %s\n", len, fn);
+                       data = "secret";
+                       value = secret;
                        skip = 0;
                } else {
                        skip = 0;