summaryrefslogtreecommitdiff
path: root/source3/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
commitb67ba1e36b11aa140822f92b148438a1387d4d9d (patch)
tree8f9b5b7b36fb0050df72f4667a6da9d79e068023 /source3/smbd
parent7dd03e891e3aa06aa000e9bea8e0bad8ede34c8c (diff)
downloadsamba-b67ba1e36b11aa140822f92b148438a1387d4d9d.tar.gz
samba-b67ba1e36b11aa140822f92b148438a1387d4d9d.tar.bz2
samba-b67ba1e36b11aa140822f92b148438a1387d4d9d.zip
r9545: (Hopefully the last) fixes for DIR -> SMB_STRUCT_DIR.
Jeremy. (This used to be commit b242f278601e1a23c9116009482e802326d418f7)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/chgpasswd.c8
-rw-r--r--source3/smbd/msdfs.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c
index f445ca3365..374c57a083 100644
--- a/source3/smbd/chgpasswd.c
+++ b/source3/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/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index 2b13e2a4b5..1e6306382a 100644
--- a/source3/smbd/msdfs.c
+++ b/source3/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);