diff options
| author | Jeremy Allison <jra@samba.org> | 2000-02-15 19:36:47 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-02-15 19:36:47 +0000 |
| commit | 3cf31a194f5721b67b1255e3f168d4bc87d433fc (patch) | |
| tree | f9e3ef842e2bad4d7fb0142f685962e125176b23 /source3/smbd/dfree.c | |
| parent | 8688933c7feb87179c178a30e4fc42970fe1da8f (diff) | |
| download | samba-3cf31a194f5721b67b1255e3f168d4bc87d433fc.tar.gz samba-3cf31a194f5721b67b1255e3f168d4bc87d433fc.tar.bz2 samba-3cf31a194f5721b67b1255e3f168d4bc87d433fc.zip | |
Added replacement functions sys_popen and sys_pclose. These are based
on the glibc source code and are safer than the traditional popen as
they don't use a shell to exec the requested command. Now we have
these functions they can be tightened up (environment etc.) as required
to make a safe popen. It should now be safe to add the environement
variable loading code to loadparm.c
Jeremy.
(This used to be commit b52e92b09d4ca3b66e534f520468dee27065d048)
Diffstat (limited to 'source3/smbd/dfree.c')
| -rw-r--r-- | source3/smbd/dfree.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/dfree.c b/source3/smbd/dfree.c index 7838080461..7866d60277 100644 --- a/source3/smbd/dfree.c +++ b/source3/smbd/dfree.c @@ -208,7 +208,6 @@ static SMB_BIG_UINT disk_free(char *path, BOOL small_query, * If external disk calculation specified, use it. */ -#ifdef HAVE_POPEN dfree_command = lp_dfree_command(); if (dfree_command && *dfree_command) { pstring line; @@ -216,7 +215,9 @@ static SMB_BIG_UINT disk_free(char *path, BOOL small_query, FILE *pp; slprintf (line, sizeof(pstring) - 1, "%s %s", dfree_command, path); - pp = popen(line, "r"); + DEBUG (3, ("disk_free: Running command %s\n", line)); + + pp = sys_popen(line, "r"); if (pp) { fgets(line, sizeof(pstring), pp); line[sizeof(pstring)-1] = '\0'; @@ -236,7 +237,7 @@ static SMB_BIG_UINT disk_free(char *path, BOOL small_query, *bsize = (SMB_BIG_UINT)strtoul(p, NULL, 10); else *bsize = 1024; - pclose (pp); + sys_pclose (pp); DEBUG (3, ("Parsed output of dfree, dsize=%u, dfree=%u, bsize=%u\n", (unsigned int)*dsize, (unsigned int)*dfree, (unsigned int)*bsize)); @@ -245,12 +246,11 @@ static SMB_BIG_UINT disk_free(char *path, BOOL small_query, if (!*dfree) *dfree = 1024; } else { - DEBUG (0, ("disk_free: popen() failed for command %s. Error was : %s\n", + DEBUG (0, ("disk_free: sys_popen() failed for command %s. Error was : %s\n", line, strerror(errno) )); fsusage(path, dfree, dsize); } } else -#endif /* HAVE_POPEN */ fsusage(path, dfree, dsize); if (disk_quotas(path, &bsize_q, &dfree_q, &dsize_q)) { |