diff options
| author | Kevin Coffman <kwc@citi.umich.edu> | 2007-03-16 10:27:48 -0400 |
|---|---|---|
| committer | Neil Brown <neilb@suse.de> | 2007-03-19 09:47:37 +1100 |
| commit | f5954afaeeee07ca6ded6c4cdcbf965f02f7a670 (patch) | |
| tree | 17962c71f32a421622b786faa607265c233b9a30 /utils/gssd/gssd.c | |
| parent | fbff46da25a0a578136fd92a6b66e807b6599ca3 (diff) | |
| download | nfs-utils-f5954afaeeee07ca6ded6c4cdcbf965f02f7a670.tar.gz nfs-utils-f5954afaeeee07ca6ded6c4cdcbf965f02f7a670.tar.xz nfs-utils-f5954afaeeee07ca6ded6c4cdcbf965f02f7a670.zip | |
Create two separate paths for pipefs_dir and pipefs_nfsdir.
Future work needs access to the base pipefs directory rather than
the nfs subdirectory. Create two separate paths called
pipefs_dir and pipefs_nfsdir with the name of each.
Signed-off-by: Kevin Coffman <kwc@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Diffstat (limited to 'utils/gssd/gssd.c')
| -rw-r--r-- | utils/gssd/gssd.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/utils/gssd/gssd.c b/utils/gssd/gssd.c index 319dca4..747637c 100644 --- a/utils/gssd/gssd.c +++ b/utils/gssd/gssd.c @@ -53,7 +53,8 @@ #include "gss_util.h" #include "krb5_util.h" -char pipefsdir[PATH_MAX] = GSSD_PIPEFS_DIR; +char pipefs_dir[PATH_MAX] = GSSD_PIPEFS_DIR; +char pipefs_nfsdir[PATH_MAX] = GSSD_PIPEFS_DIR; char keytabfile[PATH_MAX] = GSSD_DEFAULT_KEYTAB_FILE; char ccachedir[PATH_MAX] = GSSD_DEFAULT_CRED_DIR; int use_memcache = 0; @@ -116,8 +117,8 @@ main(int argc, char *argv[]) rpc_verbosity++; break; case 'p': - strncpy(pipefsdir, optarg, sizeof(pipefsdir)); - if (pipefsdir[sizeof(pipefsdir)-1] != '\0') + strncpy(pipefs_dir, optarg, sizeof(pipefs_dir)); + if (pipefs_dir[sizeof(pipefs_dir)-1] != '\0') errx(1, "pipefs path name too long"); break; case 'k': @@ -135,10 +136,10 @@ main(int argc, char *argv[]) break; } } - strncat(pipefsdir + strlen(pipefsdir), "/" GSSD_SERVICE_NAME, - sizeof(pipefsdir)-strlen(pipefsdir)); - if (pipefsdir[sizeof(pipefsdir)-1] != '\0') - errx(1, "pipefs path name too long"); + snprintf(pipefs_nfsdir, sizeof(pipefs_nfsdir), "%s/%s", + pipefs_dir, GSSD_SERVICE_NAME); + if (pipefs_nfsdir[sizeof(pipefs_nfsdir)-1] != '\0') + errx(1, "pipefs_nfsdir path name too long"); if ((progname = strrchr(argv[0], '/'))) progname++; |