summaryrefslogtreecommitdiff
path: root/src/mount
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2009-08-14 12:50:03 -0700
committerSage Weil <sage@newdream.net>2009-08-14 14:37:49 -0700
commitb362024a70cbfa2c6dd2b6f3dc498bb872d15c03 (patch)
tree624ddb04476755e783c361b4ed3efdee4c75dfeb /src/mount
parent821d9ef76d6f8bb6ea4b111777c68cdca08f5271 (diff)
downloadceph-b362024a70cbfa2c6dd2b6f3dc498bb872d15c03.tar.gz
mount.ceph: key -> secret
Diffstat (limited to 'src/mount')
-rw-r--r--src/mount/mount.ceph.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mount/mount.ceph.c b/src/mount/mount.ceph.c
index 34200d5a86a..491970f1cae 100644
--- a/src/mount/mount.ceph.c
+++ b/src/mount/mount.ceph.c
@@ -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;