summaryrefslogtreecommitdiffstats
path: root/source/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-08-23 21:29:37 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:01:12 -0500
commitb242f278601e1a23c9116009482e802326d418f7 (patch)
tree4abd959a462e6b46582a64d69ee339e6a9140152 /source/smbd
parent1f8aff85a68569480efc543cfe1556752c35311e (diff)
downloadsamba-b242f278601e1a23c9116009482e802326d418f7.tar.gz
samba-b242f278601e1a23c9116009482e802326d418f7.tar.xz
samba-b242f278601e1a23c9116009482e802326d418f7.zip
r9545: (Hopefully the last) fixes for DIR -> SMB_STRUCT_DIR.
Jeremy.
Diffstat (limited to 'source/smbd')
-rw-r--r--source/smbd/chgpasswd.c8
-rw-r--r--source/smbd/msdfs.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/source/smbd/chgpasswd.c b/source/smbd/chgpasswd.c
index f445ca3365b..374c57a083a 100644
--- a/source/smbd/chgpasswd.c
+++ b/source/smbd/chgpasswd.c
@@ -64,7 +64,7 @@ static int findpty(char **slave)
{
int master;
static fstring line;
- DIR *dirp;
+ SMB_STRUCT_DIR *dirp;
const char *dpname;
#if defined(HAVE_GRANTPT)
@@ -93,7 +93,7 @@ static int findpty(char **slave)
fstrcpy(line, "/dev/ptyXX");
- dirp = opendir("/dev");
+ dirp = sys_opendir("/dev");
if (!dirp)
return (-1);
while ((dpname = readdirname(dirp)) != NULL)
@@ -110,12 +110,12 @@ static int findpty(char **slave)
DEBUG(3, ("pty: opened %s\n", line));
line[5] = 't';
*slave = line;
- closedir(dirp);
+ sys_closedir(dirp);
return (master);
}
}
}
- closedir(dirp);
+ sys_closedir(dirp);
return (-1);
}
diff --git a/source/smbd/msdfs.c b/source/smbd/msdfs.c
index 2b13e2a4b5a..1e6306382aa 100644
--- a/source/smbd/msdfs.c
+++ b/source/smbd/msdfs.c
@@ -1010,7 +1010,7 @@ BOOL remove_msdfs_link(struct junction_map *jucn)
static int form_junctions(TALLOC_CTX *ctx, int snum, struct junction_map *jucn, int jn_remain)
{
int cnt = 0;
- DIR *dirp;
+ SMB_STRUCT_DIR *dirp;
char* dname;
pstring connect_path;
char* service_name = lp_servicename(snum);