*/
#include "includes.h"
-#include "smbw.h"
-#include "wrapper.h"
+#include "realcalls.h"
-static pstring smb_cwd;
-
-struct smbw_server {
- struct smbw_server *next, *prev;
- struct cli_state cli;
- char *server_name;
- char *share_name;
- dev_t dev;
-};
-
-struct smbw_file {
- struct smbw_file *next, *prev;
- int cli_fd, fd;
- char *fname;
- off_t offset;
- struct smbw_server *srv;
-};
-
-struct smbw_dir {
- struct smbw_dir *next, *prev;
- int fd;
- int offset, count, malloced;
- struct smbw_server *srv;
- struct file_info *list;
- char *path;
-};
+pstring smbw_cwd;
static struct smbw_file *smbw_files;
-static struct smbw_dir *smbw_dirs;
static struct smbw_server *smbw_srvs;
-static struct bitmap *file_bmap;
-static pstring local_machine;
+struct bitmap *smbw_file_bmap;
+extern pstring global_myname;
extern int DEBUGLEVEL;
-static int smbw_busy;
+fstring smbw_prefix = SMBW_PREFIX;
+
+int smbw_busy=0;
+
+/* needs to be here because of dumb include files on some systems */
+int creat_bits = O_WRONLY|O_CREAT|O_TRUNC;
+
/*****************************************************
initialise structures
static pstring servicesf = CONFIGFILE;
extern FILE *dbf;
char *p;
+ int eno;
+ pstring line;
if (initialised) return;
initialised = 1;
+ eno = errno;
+
smbw_busy++;
DEBUGLEVEL = 0;
- setup_logging("smbw",True);
+ setup_logging("smbsh",True);
dbf = stderr;
- if ((p=getenv("SMBW_LOGFILE"))) {
- dbf = fopen(p, "a");
+ if ((p=smbw_getshared("LOGFILE"))) {
+ dbf = sys_fopen(p, "a");
}
- file_bmap = bitmap_allocate(SMBW_MAX_OPEN);
- if (!file_bmap) {
+ smbw_file_bmap = bitmap_allocate(SMBW_MAX_OPEN);
+ if (!smbw_file_bmap) {
exit(1);
}
load_interfaces();
- if (!lp_load(servicesf,True,False,False)) {
- exit(1);
- }
+ lp_load(servicesf,True,False,False);
- get_myname(local_machine,NULL);
+ get_myname(global_myname,NULL);
- if ((p=getenv("SMBW_DEBUG"))) {
+ if ((p=smbw_getshared("DEBUG"))) {
DEBUGLEVEL = atoi(p);
}
- if ((p=getenv(SMBW_PWD_ENV))) {
- pstrcpy(smb_cwd, p);
- DEBUG(4,("Initial cwd from smb_cwd is %s\n", smb_cwd));
- } else {
- sys_getwd(smb_cwd);
- DEBUG(4,("Initial cwd from getwd is %s\n", smb_cwd));
+ if ((p=smbw_getshared("RESOLVE_ORDER"))) {
+ lp_set_name_resolve_order(p);
+ }
+
+ if ((p=smbw_getshared("PREFIX"))) {
+ slprintf(smbw_prefix,sizeof(fstring)-1, "/%s/", p);
+ string_sub(smbw_prefix,"//", "/");
+ DEBUG(2,("SMBW_PREFIX is %s\n", smbw_prefix));
+ }
+
+ slprintf(line,sizeof(line)-1,"PWD_%d", getpid());
+
+ p = smbw_getshared(line);
+ if (!p) {
+ sys_getwd(smbw_cwd);
}
+ pstrcpy(smbw_cwd, p);
+ DEBUG(4,("Initial cwd is %s\n", smbw_cwd));
+
smbw_busy--;
+
+ set_maxfiles(SMBW_MAX_OPEN);
+
+ BlockSignals(True,SIGPIPE);
+
+ errno = eno;
}
/*****************************************************
determine if a file descriptor is a smb one
*******************************************************/
-BOOL smbw_fd(int fd)
+int smbw_fd(int fd)
+{
+ if (smbw_busy) return 0;
+ return smbw_file_bmap && bitmap_query(smbw_file_bmap, fd);
+}
+
+/*****************************************************
+determine if a file descriptor is an internal smbw fd
+*******************************************************/
+int smbw_local_fd(int fd)
{
- if (smbw_busy) return False;
- return (fd >= SMBW_FD_OFFSET);
+ struct smbw_server *srv;
+
+ smbw_init();
+
+ if (smbw_busy) return 0;
+ if (smbw_shared_fd(fd)) return 1;
+
+ for (srv=smbw_srvs;srv;srv=srv->next) {
+ if (srv->cli.fd == fd) return 1;
+ }
+
+ return 0;
}
/*****************************************************
*******************************************************/
ino_t smbw_inode(const char *name)
{
+ if (!*name) return 2;
return (ino_t)str_checksum(name);
}
{
static pstring s;
char *p, *p2;
- int len;
+ int len = strlen(smbw_prefix)-1;
*server = *share = *path = 0;
if (fname[0] == '/') {
pstrcpy(s, fname);
} else {
- slprintf(s,sizeof(s)-1, "%s/%s", smb_cwd, fname);
+ slprintf(s,sizeof(s)-1, "%s/%s", smbw_cwd, fname);
}
clean_fname(s);
DEBUG(5,("cleaned %s (fname=%s cwd=%s)\n",
- s, fname, smb_cwd));
+ s, fname, smbw_cwd));
- if (strncmp(s,SMBW_PREFIX,strlen(SMBW_PREFIX))) return s;
+ if (strncmp(s,smbw_prefix,len) ||
+ (s[len] != '/' && s[len] != 0)) return s;
+
+ p = s + len;
+ if (*p == '/') p++;
- p = s + strlen(SMBW_PREFIX);
p2 = strchr(p,'/');
if (p2) {
p = p2;
if (!p) {
+ if (len == 0) {
+ char *workgroup = smbw_getshared("WORKGROUP");
+ if (!workgroup) workgroup = lp_workgroup();
+ slprintf(server,sizeof(fstring)-1, "%s#1D", workgroup);
+ }
fstrcpy(share,"IPC$");
pstrcpy(path,"");
goto ok;
string_sub(path, "/", "\\");
ok:
- DEBUG(5,("parsed path name=%s cwd=%s [%s] [%s] [%s]\n",
- fname, smb_cwd,
+ DEBUG(4,("parsed path name=%s cwd=%s [%s] [%s] [%s]\n",
+ fname, smbw_cwd,
server, share, path));
return s;
determine if a path name (possibly relative) is in the
smb name space
*******************************************************/
-BOOL smbw_path(const char *path)
+int smbw_path(const char *path)
{
fstring server, share;
pstring s;
char *cwd;
- int l=strlen(SMBW_PREFIX)-1;
+ int len;
- if (path[0] == '/' && strncmp(path,SMBW_PREFIX,l)) {
- return False;
+ /* this is needed to prevent recursion with the BSD malloc which
+ opens /etc/malloc.conf on the first call */
+ if (strncmp(path,"/etc/", 5) == 0) {
+ return 0;
}
- if (smbw_busy) return False;
-
smbw_init();
+ len = strlen(smbw_prefix)-1;
+
+ if (path[0] == '/' && strncmp(path,smbw_prefix,len)) {
+ return 0;
+ }
+
+ if (smbw_busy) return 0;
+
DEBUG(3,("smbw_path(%s)\n", path));
cwd = smbw_parse_path(path, server, share, s);
- if (strncmp(cwd,SMBW_PREFIX,l) == 0 &&
- (cwd[l] == '/' || cwd[l] == 0)) {
- return True;
+ if (strncmp(cwd,smbw_prefix,len) == 0 &&
+ (cwd[len] == '/' || cwd[len] == 0)) {
+ return 1;
}
- return False;
+ return 0;
}
/*****************************************************
ret = cli_error(c, &eclass, &ecode);
if (ret) {
- DEBUG(3,("smbw_error %d %d (0x%x)\n",
- (int)eclass, (int)ecode, (int)ecode));
+ DEBUG(3,("smbw_error %d %d (0x%x) -> %d\n",
+ (int)eclass, (int)ecode, (int)ecode, ret));
}
return ret;
}
struct smbw_server *smbw_server(char *server, char *share)
{
struct smbw_server *srv=NULL;
- static struct cli_state c;
+ struct cli_state c;
char *username;
char *password;
char *workgroup;
struct nmb_name called, calling;
+ char *p, *server_n = server;
+ fstring group;
+ pstring ipenv;
+ struct in_addr ip;
+ extern struct in_addr ipzero;
+ char lm_24[24], nt_24[24];
+
+ ip = ipzero;
+ ZERO_STRUCT(c);
- username = getenv("SMBW_USER");
+ username = smbw_getshared("USER");
if (!username) username = getenv("USER");
if (!username) username = "guest";
- workgroup = getenv("SMBW_WORKGROUP");
+ workgroup = smbw_getshared("WORKGROUP");
if (!workgroup) workgroup = lp_workgroup();
- password = getenv("SMBW_PASSWORD");
+ password = smbw_getshared("PASSWORD");
if (!password) password = "";
/* try to use an existing connection */
return NULL;
}
+ make_nmb_name(&calling, global_myname, 0x0, "");
+ make_nmb_name(&called , server, 0x20, "");
+
+ DEBUG(4,("server_n=[%s] server=[%s]\n", server_n, server));
+
+ if ((p=strchr(server_n,'#')) && strcmp(p+1,"1D")==0) {
+ struct in_addr sip;
+ pstring s;
+
+ fstrcpy(group, server_n);
+ p = strchr(group,'#');
+ *p = 0;
+
+ /* cache the workgroup master lookup */
+ slprintf(s,sizeof(s)-1,"MASTER_%s", group);
+ if (!(server_n = smbw_getshared(s))) {
+ if (!find_master_ip(group, &sip)) {
+ errno = ENOENT;
+ return NULL;
+ }
+ fstrcpy(group, inet_ntoa(sip));
+ server_n = group;
+ smbw_setshared(s,server_n);
+ }
+ }
+
+ DEBUG(4,(" -> server_n=[%s] server=[%s]\n", server_n, server));
+
+ again:
+ slprintf(ipenv,sizeof(ipenv)-1,"HOST_%s", server_n);
+
+ ip = ipzero;
+ if ((p=smbw_getshared(ipenv))) {
+ ip = *(interpret_addr2(p));
+ }
+
/* have to open a new connection */
- if (!cli_initialise(&c) || !cli_connect(&c, server, NULL)) {
+ if (!cli_initialise(&c) || !cli_connect(&c, server_n, &ip)) {
errno = ENOENT;
return NULL;
}
- make_nmb_name(&calling, local_machine, 0x0, "");
- make_nmb_name(&called , server, 0x20, "");
-
if (!cli_session_request(&c, &calling, &called)) {
cli_shutdown(&c);
+ if (strcmp(called.name, "*SMBSERVER")) {
+ make_nmb_name(&called , "*SMBSERVER", 0x20, "");
+ goto again;
+ }
errno = ENOENT;
return NULL;
}
+ DEBUG(4,(" session request ok\n"));
+
if (!cli_negprot(&c)) {
cli_shutdown(&c);
errno = ENOENT;
return NULL;
}
+ SMBencrypt ((uchar *)password,(uchar *)c.cryptkey,(uchar *)lm_24);
+ SMBNTencrypt((uchar *)password,(uchar *)c.cryptkey,(uchar *)nt_24);
+
if (!cli_session_setup(&c, username,
- password, strlen(password),
- password, strlen(password),
- workgroup)) {
+ lm_24, 24,
+ nt_24, 24,
+ workgroup) &&
+ /* try an anonymous login if it failed */
+ !cli_session_setup(&c, "", "", 1,"", 0, workgroup)) {
cli_shutdown(&c);
errno = EPERM;
return NULL;
}
- if (!cli_send_tconX(&c, share,
- strstr(share,"IPC$")?"IPC":"A:",
+ DEBUG(4,(" session setup ok\n"));
+
+ if (!cli_send_tconX(&c, share, "?????",
password, strlen(password)+1)) {
errno = smbw_errno(&c);
cli_shutdown(&c);
return NULL;
}
+ smbw_setshared(ipenv,inet_ntoa(ip));
+
+ DEBUG(4,(" tconx ok\n"));
+
srv = (struct smbw_server *)malloc(sizeof(*srv));
if (!srv) {
errno = ENOMEM;
return NULL;
}
-/*****************************************************
-map a fd to a smbw_dir structure
-*******************************************************/
-struct smbw_dir *smbw_dir(int fd)
-{
- struct smbw_dir *dir;
-
- for (dir=smbw_dirs;dir;dir=dir->next) {
- if (dir->fd == fd) return dir;
- }
- return NULL;
-}
-
-/*****************************************************
-check if a DIR* is one of ours
-*******************************************************/
-BOOL smbw_dirp(struct smbw_dir *d)
-{
- struct smbw_dir *dir;
-
- for (dir=smbw_dirs;dir;dir=dir->next) {
- if (dir == d) return True;
- }
- return False;
-}
-
-/*****************************************************
-setup basic info in a stat structure
-*******************************************************/
-void smbw_setup_stat(struct stat *st, char *fname, size_t size, int mode)
-{
- ZERO_STRUCTP(st);
-
- if (IS_DOS_DIR(mode)) {
- st->st_mode = SMBW_DIR_MODE;
- } else {
- st->st_mode = SMBW_FILE_MODE;
- }
-
- st->st_size = size;
- st->st_blksize = 512;
- st->st_blocks = (size+511)/512;
- st->st_uid = getuid();
- st->st_gid = getgid();
- st->st_ino = smbw_inode(fname);
-}
-
-
-/*****************************************************
-try to do a QPATHINFO and if that fails then do a getatr
-this is needed because win95 sometimes refuses the qpathinfo
-*******************************************************/
-static BOOL smbw_getatr(struct smbw_server *srv, char *path,
- uint32 *mode, size_t *size,
- time_t *c_time, time_t *a_time, time_t *m_time)
-{
- if (cli_qpathinfo(&srv->cli, path, c_time, a_time, m_time,
- size, mode)) return True;
-
- /* if this is NT then don't bother with the getatr */
- if (srv->cli.capabilities & CAP_NT_SMBS) return False;
-
- if (cli_getatr(&srv->cli, path, mode, size, m_time)) {
- a_time = c_time = m_time;
- return True;
- }
- return False;
-}
-
-/*****************************************************
-free a smbw_dir structure and all entries
-*******************************************************/
-static void free_dir(struct smbw_dir *dir)
-{
- if (dir->list) {
- free(dir->list);
- }
- if (dir->path) free(dir->path);
- ZERO_STRUCTP(dir);
- free(dir);
-}
-
-
-static struct smbw_dir *cur_dir;
-
-/*****************************************************
-add a entry to a directory listing
-*******************************************************/
-void smbw_dir_add(struct file_info *finfo)
-{
- DEBUG(5,("%s\n", finfo->name));
-
- if (cur_dir->malloced == cur_dir->count) {
- cur_dir->list = (struct file_info *)Realloc(cur_dir->list,
- sizeof(cur_dir->list[0])*
- (cur_dir->count+100));
- if (!cur_dir->list) {
- /* oops */
- return;
- }
- cur_dir->malloced += 100;
- }
-
- cur_dir->list[cur_dir->count] = *finfo;
- cur_dir->count++;
-}
-
-/*****************************************************
-add a entry to a directory listing
-*******************************************************/
-void smbw_share_add(const char *share, uint32 type, const char *comment)
-{
- struct file_info finfo;
-
- ZERO_STRUCT(finfo);
-
- pstrcpy(finfo.name, share);
- finfo.mode = aRONLY | aDIR;
-
- smbw_dir_add(&finfo);
-}
-
-
-/*****************************************************
-open a directory on the server
-*******************************************************/
-int smbw_dir_open(const char *fname)
-{
- fstring server, share;
- pstring path;
- struct smbw_server *srv=NULL;
- struct smbw_dir *dir=NULL;
- pstring mask;
- int fd;
- char *s;
-
- DEBUG(4,("%s\n", __FUNCTION__));
-
- if (!fname) {
- errno = EINVAL;
- return -1;
- }
-
- smbw_init();
-
- /* work out what server they are after */
- s = smbw_parse_path(fname, server, share, path);
-
- DEBUG(4,("dir_open share=%s\n", share));
-
- /* get a connection to the server */
- srv = smbw_server(server, share);
- if (!srv) {
- /* smbw_server sets errno */
- goto failed;
- }
-
- dir = (struct smbw_dir *)malloc(sizeof(*dir));
- if (!dir) {
- errno = ENOMEM;
- goto failed;
- }
-
- ZERO_STRUCTP(dir);
-
- cur_dir = dir;
-
- slprintf(mask, sizeof(mask)-1, "%s\\*", path);
- string_sub(mask,"\\\\","\\");
-
- if (strcmp(share,"IPC$") == 0) {
- DEBUG(4,("doing NetShareEnum\n"));
- if (cli_RNetShareEnum(&srv->cli, smbw_share_add) <= 0) {
- errno = smbw_errno(&srv->cli);
- goto failed;
- }
- } else {
- if (cli_list(&srv->cli, mask, aHIDDEN|aSYSTEM|aDIR,
- smbw_dir_add) <= 0) {
- errno = smbw_errno(&srv->cli);
- goto failed;
- }
- }
-
- cur_dir = NULL;
-
- fd = bitmap_find(file_bmap, 0);
- if (fd == -1) {
- errno = EMFILE;
- goto failed;
- }
-
- DLIST_ADD(smbw_dirs, dir);
-
- bitmap_set(file_bmap, fd);
-
- dir->fd = fd + SMBW_FD_OFFSET;
- dir->srv = srv;
- dir->path = strdup(s);
-
- DEBUG(4,(" -> %d\n", dir->count));
-
- return dir->fd;
-
- failed:
- if (dir) {
- free_dir(dir);
- }
-
- return -1;
-}
-
-
/*****************************************************
a wrapper for open()
*******************************************************/
fstring server, share;
pstring path;
struct smbw_server *srv=NULL;
- int eno, fd = -1;
+ int eno=0, fd = -1;
struct smbw_file *file=NULL;
- DEBUG(4,("%s\n", __FUNCTION__));
-
smbw_init();
if (!fname) {
}
if (fd == -1) {
/* it might be a directory. Maybe we should use chkpath? */
+ eno = smbw_errno(&srv->cli);
fd = smbw_dir_open(fname);
+ if (fd == -1) errno = eno;
smbw_busy--;
return fd;
}
- if (fd == -1) {
- errno = eno;
- goto failed;
- }
file = (struct smbw_file *)malloc(sizeof(*file));
if (!file) {
ZERO_STRUCTP(file);
- file->cli_fd = fd;
- file->fname = strdup(path);
- if (!file->fname) {
+ file->f = (struct smbw_filedes *)malloc(sizeof(*(file->f)));
+ if (!file->f) {
errno = ENOMEM;
goto failed;
}
- file->srv = srv;
- file->fd = bitmap_find(file_bmap, 0);
+ ZERO_STRUCTP(file->f);
+
+ file->f->cli_fd = fd;
+ file->f->fname = strdup(path);
+ if (!file->f->fname) {
+ errno = ENOMEM;
+ goto failed;
+ }
+ file->srv = srv;
+ file->fd = open(SMBW_DUMMY, O_WRONLY);
if (file->fd == -1) {
errno = EMFILE;
goto failed;
}
- bitmap_set(file_bmap, file->fd);
+ if (bitmap_query(smbw_file_bmap, file->fd)) {
+ DEBUG(0,("ERROR: fd used in smbw_open\n"));
+ errno = EIO;
+ goto failed;
+ }
- file->fd += SMBW_FD_OFFSET;
+ file->f->ref_count=1;
+
+ bitmap_set(smbw_file_bmap, file->fd);
DLIST_ADD(smbw_files, file);
cli_close(&srv->cli, fd);
}
if (file) {
- if (file->fname) {
- free(file->fname);
+ if (file->f) {
+ if (file->f->fname) {
+ free(file->f->fname);
+ }
+ free(file->f);
}
free(file);
}
/*****************************************************
-a wrapper for fstat() on a directory
+a wrapper for pread()
*******************************************************/
-int smbw_dir_fstat(int fd, struct stat *st)
+ssize_t smbw_pread(int fd, void *buf, size_t count, off_t ofs)
{
- struct smbw_dir *dir;
+ struct smbw_file *file;
+ int ret;
- DEBUG(4,("%s\n", __FUNCTION__));
+ smbw_busy++;
- dir = smbw_dir(fd);
- if (!dir) {
+ file = smbw_file(fd);
+ if (!file) {
errno = EBADF;
+ smbw_busy--;
return -1;
}
+
+ ret = cli_read(&file->srv->cli, file->f->cli_fd, buf, ofs, count);
- ZERO_STRUCTP(st);
-
- smbw_setup_stat(st, "", dir->count*sizeof(struct dirent), aDIR);
-
- st->st_dev = dir->srv->dev;
+ if (ret == -1) {
+ errno = smbw_errno(&file->srv->cli);
+ smbw_busy--;
+ return -1;
+ }
- return 0;
+ smbw_busy--;
+ return ret;
}
/*****************************************************
-a wrapper for fstat()
+a wrapper for read()
*******************************************************/
-int smbw_fstat(int fd, struct stat *st)
+ssize_t smbw_read(int fd, void *buf, size_t count)
{
struct smbw_file *file;
- time_t c_time, a_time, m_time;
- uint32 size;
- int mode;
+ int ret;
- DEBUG(4,("%s\n", __FUNCTION__));
+ DEBUG(4,("smbw_read(%d, %d)\n", fd, (int)count));
smbw_busy++;
file = smbw_file(fd);
if (!file) {
- int ret = smbw_dir_fstat(fd, st);
+ errno = EBADF;
smbw_busy--;
- return ret;
+ return -1;
}
+
+ ret = cli_read(&file->srv->cli, file->f->cli_fd, buf,
+ file->f->offset, count);
- if (!cli_qfileinfo(&file->srv->cli, file->cli_fd,
- &mode, &size, &c_time, &a_time, &m_time) &&
- !cli_getattrE(&file->srv->cli, file->cli_fd,
- &mode, &size, &c_time, &a_time, &m_time)) {
- errno = EINVAL;
+ if (ret == -1) {
+ errno = smbw_errno(&file->srv->cli);
smbw_busy--;
return -1;
}
- smbw_setup_stat(st, file->fname, size, mode);
-
- st->st_atime = a_time;
- st->st_ctime = c_time;
- st->st_mtime = m_time;
- st->st_dev = file->srv->dev;
-
- DEBUG(4,("%s - OK\n", __FUNCTION__));
+ file->f->offset += ret;
+
+ DEBUG(4,(" -> %d\n", ret));
smbw_busy--;
- return 0;
+ return ret;
}
+
/*****************************************************
-a wrapper for stat()
+a wrapper for write()
*******************************************************/
-int smbw_stat(const char *fname, struct stat *st)
+ssize_t smbw_write(int fd, void *buf, size_t count)
{
- struct smbw_server *srv;
- fstring server, share;
- pstring path;
- time_t m_time=0, a_time=0, c_time=0;
- size_t size=0;
- uint32 mode=0;
+ struct smbw_file *file;
+ int ret;
- DEBUG(4,("%s (%s)\n", __FUNCTION__, fname));
+ smbw_busy++;
- if (!fname) {
- errno = EINVAL;
+ file = smbw_file(fd);
+ if (!file) {
+ errno = EBADF;
+ smbw_busy--;
return -1;
}
+
+ ret = cli_write(&file->srv->cli, file->f->cli_fd, 0, buf, file->f->offset, count);
- smbw_init();
+ if (ret == -1) {
+ errno = smbw_errno(&file->srv->cli);
+ smbw_busy--;
+ return -1;
+ }
- smbw_busy++;
-
- /* work out what server they are after */
- smbw_parse_path(fname, server, share, path);
-
- /* get a connection to the server */
- srv = smbw_server(server, share);
- if (!srv) {
- /* smbw_server sets errno */
- goto failed;
- }
-
- if (strcmp(share,"IPC$") == 0) {
- mode = aDIR | aRONLY;
- } else {
- if (!smbw_getatr(srv, path,
- &mode, &size, &c_time, &a_time, &m_time)) {
- errno = smbw_errno(&srv->cli);
- goto failed;
- }
- }
-
- smbw_setup_stat(st, path, size, mode);
-
- st->st_atime = time(NULL);
- st->st_ctime = m_time;
- st->st_mtime = m_time;
- st->st_dev = srv->dev;
-
- smbw_busy--;
- return 0;
-
- failed:
- smbw_busy--;
- return -1;
-}
-
-/*****************************************************
-a wrapper for read()
-*******************************************************/
-ssize_t smbw_read(int fd, void *buf, size_t count)
-{
- struct smbw_file *file;
- int ret;
-
- DEBUG(4,("%s %d\n", __FUNCTION__, (int)count));
-
- smbw_busy++;
-
- file = smbw_file(fd);
- if (!file) {
- errno = EBADF;
- smbw_busy--;
- return -1;
- }
-
- ret = cli_read(&file->srv->cli, file->cli_fd, buf, file->offset, count);
-
- if (ret == -1) {
- errno = smbw_errno(&file->srv->cli);
- smbw_busy--;
- return -1;
- }
-
- file->offset += ret;
+ file->f->offset += ret;
smbw_busy--;
return ret;
}
/*****************************************************
-a wrapper for write()
+a wrapper for pwrite()
*******************************************************/
-ssize_t smbw_write(int fd, void *buf, size_t count)
+ssize_t smbw_pwrite(int fd, void *buf, size_t count, off_t ofs)
{
struct smbw_file *file;
int ret;
- DEBUG(4,("%s\n", __FUNCTION__));
-
smbw_busy++;
file = smbw_file(fd);
if (!file) {
- DEBUG(3,("bad fd in read\n"));
errno = EBADF;
smbw_busy--;
return -1;
}
- ret = cli_write(&file->srv->cli, file->cli_fd, buf, file->offset, count);
+ ret = cli_write(&file->srv->cli, file->f->cli_fd, 0, buf, ofs, count);
if (ret == -1) {
errno = smbw_errno(&file->srv->cli);
return -1;
}
- file->offset += ret;
-
smbw_busy--;
return ret;
}
-/*****************************************************
-close a directory handle
-*******************************************************/
-int smbw_dir_close(int fd)
-{
- struct smbw_dir *dir;
-
- DEBUG(4,("%s\n", __FUNCTION__));
-
- dir = smbw_dir(fd);
- if (!dir) {
- DEBUG(4,("%s(%d)\n", __FUNCTION__, __LINE__));
- errno = EBADF;
- return -1;
- }
-
- bitmap_clear(file_bmap, dir->fd - SMBW_FD_OFFSET);
-
- DLIST_REMOVE(smbw_dirs, dir);
-
- free_dir(dir);
-
- return 0;
-}
-
/*****************************************************
a wrapper for close()
*******************************************************/
{
struct smbw_file *file;
- DEBUG(4,("%s\n", __FUNCTION__));
-
smbw_busy++;
file = smbw_file(fd);
return ret;
}
- if (!cli_close(&file->srv->cli, file->cli_fd)) {
+ if (file->f->ref_count == 1 &&
+ !cli_close(&file->srv->cli, file->f->cli_fd)) {
errno = smbw_errno(&file->srv->cli);
smbw_busy--;
return -1;
}
- bitmap_clear(file_bmap, file->fd - SMBW_FD_OFFSET);
+ bitmap_clear(smbw_file_bmap, file->fd);
+ close(file->fd);
DLIST_REMOVE(smbw_files, file);
- free(file->fname);
+ file->f->ref_count--;
+ if (file->f->ref_count == 0) {
+ free(file->f->fname);
+ free(file->f);
+ }
ZERO_STRUCTP(file);
free(file);
*******************************************************/
int smbw_fcntl(int fd, int cmd, long arg)
{
- DEBUG(4,("%s\n", __FUNCTION__));
return 0;
}
/*****************************************************
-a wrapper for getdents()
+a wrapper for access()
*******************************************************/
-int smbw_getdents(unsigned int fd, struct dirent *dirp, int count)
+int smbw_access(const char *name, int mode)
{
- struct smbw_dir *dir;
- int n=0;
+ struct stat st;
- DEBUG(4,("%s\n", __FUNCTION__));
+ DEBUG(4,("smbw_access(%s, 0x%x)\n", name, mode));
- smbw_busy++;
+ if (smbw_stat(name, &st)) return -1;
- dir = smbw_dir(fd);
- if (!dir) {
- errno = EBADF;
- smbw_busy--;
+ if (((mode & R_OK) && !(st.st_mode & S_IRUSR)) ||
+ ((mode & W_OK) && !(st.st_mode & S_IWUSR)) ||
+ ((mode & X_OK) && !(st.st_mode & S_IXUSR))) {
+ errno = EACCES;
return -1;
}
- while (count>=sizeof(*dirp) && (dir->offset < dir->count)) {
- dirp->d_off = (dir->offset+1)*sizeof(*dirp);
- dirp->d_reclen = sizeof(*dirp);
- safe_strcpy(&dirp->d_name[0], dir->list[dir->offset].name,
- sizeof(dirp->d_name)-1);
- dirp->d_ino = smbw_inode(dir->list[dir->offset].name);
- dir->offset++;
- count -= dirp->d_reclen;
- if (dir->offset == dir->count) {
- dirp->d_off = -1;
- }
- dirp++;
- n++;
- }
-
- smbw_busy--;
- return n*sizeof(*dirp);
-}
-
-
-/*****************************************************
-a wrapper for access()
-*******************************************************/
-int smbw_access(const char *name, int mode)
-{
- struct stat st;
- /* how do we map this properly ?? */
- return smbw_stat(name, &st);
+ return 0;
}
/*****************************************************
}
-/*****************************************************
-a wrapper for chdir()
-*******************************************************/
-int smbw_chdir(const char *name)
-{
- struct smbw_server *srv;
- fstring server, share;
- pstring path;
- uint32 mode = aDIR;
- char *cwd;
-
- smbw_init();
-
- if (smbw_busy) return real_chdir(cwd);
-
- smbw_busy++;
-
- if (!name) {
- errno = EINVAL;
- goto failed;
- }
-
- DEBUG(4,("%s (%s)\n", __FUNCTION__, name));
-
- /* work out what server they are after */
- cwd = smbw_parse_path(name, server, share, path);
-
- if (strncmp(cwd,SMBW_PREFIX,strlen(SMBW_PREFIX))) {
- if (real_chdir(cwd) == 0) {
- DEBUG(4,("set SMBW_CWD to %s\n", cwd));
- pstrcpy(smb_cwd, cwd);
- if (setenv(SMBW_PWD_ENV, smb_cwd, 1)) {
- DEBUG(4,("setenv failed\n"));
- }
- goto success;
- }
- errno = ENOENT;
- goto failed;
- }
-
- /* get a connection to the server */
- srv = smbw_server(server, share);
- if (!srv) {
- /* smbw_server sets errno */
- goto failed;
- }
-
- if (strcmp(share,"IPC$") &&
- !smbw_getatr(srv, path,
- &mode, NULL, NULL, NULL, NULL)) {
- errno = smbw_errno(&srv->cli);
- goto failed;
- }
-
- if (!(mode & aDIR)) {
- errno = ENOTDIR;
- goto failed;
- }
-
- DEBUG(4,("set SMBW_CWD2 to %s\n", cwd));
- pstrcpy(smb_cwd, cwd);
- if (setenv(SMBW_PWD_ENV, smb_cwd, 1)) {
- DEBUG(4,("setenv failed\n"));
- }
-
- /* we don't want the old directory to be busy */
- real_chdir("/");
-
- success:
- smbw_busy--;
- return 0;
-
- failed:
- smbw_busy--;
- return -1;
-}
-
-
/*****************************************************
a wrapper for unlink()
*******************************************************/
fstring server, share;
pstring path;
- DEBUG(4,("%s (%s)\n", __FUNCTION__, fname));
-
if (!fname) {
errno = EINVAL;
return -1;
goto failed;
}
- if (!cli_unlink(&srv->cli, path)) {
+ if (strncmp(srv->cli.dev, "LPT", 3) == 0) {
+ int job = smbw_stat_printjob(srv, path, NULL, NULL);
+ if (job == -1) {
+ goto failed;
+ }
+ if (cli_printjob_del(&srv->cli, job) != 0) {
+ goto failed;
+ }
+ } else if (!cli_unlink(&srv->cli, path)) {
errno = smbw_errno(&srv->cli);
goto failed;
}
fstring server2, share2;
pstring path2;
- DEBUG(4,("%s (%s, %s)\n", __FUNCTION__, oldname, newname));
-
if (!oldname || !newname) {
errno = EINVAL;
return -1;
smbw_init();
+ DEBUG(4,("smbw_rename(%s,%s)\n", oldname, newname));
+
smbw_busy++;
/* work out what server they are after */
}
if (!cli_rename(&srv->cli, path1, path2)) {
- errno = smbw_errno(&srv->cli);
- goto failed;
+ int eno = smbw_errno(&srv->cli);
+ if (eno != EEXIST ||
+ !cli_unlink(&srv->cli, path2) ||
+ !cli_rename(&srv->cli, path1, path2)) {
+ errno = eno;
+ goto failed;
+ }
}
smbw_busy--;
/*****************************************************
-a wrapper for utime()
+a wrapper for utime and utimes
*******************************************************/
-int smbw_utime(const char *fname, struct utimbuf *buf)
+static int smbw_settime(const char *fname, time_t t)
{
struct smbw_server *srv;
fstring server, share;
pstring path;
- uint32 mode;
-
- DEBUG(4,("%s (%s)\n", __FUNCTION__, fname));
+ uint16 mode;
if (!fname) {
errno = EINVAL;
goto failed;
}
- if (!cli_setatr(&srv->cli, path, mode, buf->modtime)) {
- errno = smbw_errno(&srv->cli);
- goto failed;
+ if (!cli_setatr(&srv->cli, path, mode, t)) {
+ /* some servers always refuse directory changes */
+ if (!(mode & aDIR)) {
+ errno = smbw_errno(&srv->cli);
+ goto failed;
+ }
}
smbw_busy--;
return -1;
}
+/*****************************************************
+a wrapper for utime
+*******************************************************/
+int smbw_utime(const char *fname, void *buf)
+{
+ struct utimbuf *tbuf = (struct utimbuf *)buf;
+ return smbw_settime(fname, tbuf?tbuf->modtime:time(NULL));
+}
+
+/*****************************************************
+a wrapper for utime
+*******************************************************/
+int smbw_utimes(const char *fname, void *buf)
+{
+ struct timeval *tbuf = (struct timeval *)buf;
+ return smbw_settime(fname, tbuf?tbuf->tv_sec:time(NULL));
+}
+
+
/*****************************************************
a wrapper for chown()
*******************************************************/
struct smbw_server *srv;
fstring server, share;
pstring path;
- uint32 mode;
-
- DEBUG(4,("%s (%s)\n", __FUNCTION__, fname));
+ uint16 mode;
if (!fname) {
errno = EINVAL;
pstring path;
uint32 mode;
- DEBUG(4,("%s (%s)\n", __FUNCTION__, fname));
-
if (!fname) {
errno = EINVAL;
return -1;
goto failed;
}
- if (!cli_getatr(&srv->cli, path, &mode, NULL, NULL)) {
+ mode = 0;
+
+ if (!(newmode & (S_IWUSR | S_IWGRP | S_IWOTH))) mode |= aRONLY;
+ if ((newmode & S_IXUSR) && lp_map_archive(-1)) mode |= aARCH;
+ if ((newmode & S_IXGRP) && lp_map_system(-1)) mode |= aSYSTEM;
+ if ((newmode & S_IXOTH) && lp_map_hidden(-1)) mode |= aHIDDEN;
+
+ if (!cli_setatr(&srv->cli, path, mode, 0)) {
errno = smbw_errno(&srv->cli);
goto failed;
}
- /* assume success for the moment - need to add attribute mapping */
-
smbw_busy--;
return 0;
return -1;
}
-
-/*****************************************************
-a wrapper for lseek() on directories
-*******************************************************/
-off_t smbw_dir_lseek(int fd, off_t offset, int whence)
-{
- struct smbw_dir *dir;
- off_t ret;
-
- DEBUG(4,("%s offset=%d whence=%d\n", __FUNCTION__,
- (int)offset, whence));
-
- dir = smbw_dir(fd);
- if (!dir) {
- errno = EBADF;
- return -1;
- }
-
- switch (whence) {
- case SEEK_SET:
- dir->offset = offset/sizeof(struct dirent);
- break;
- case SEEK_CUR:
- dir->offset += offset/sizeof(struct dirent);
- break;
- case SEEK_END:
- dir->offset = (dir->count * sizeof(struct dirent)) + offset;
- dir->offset /= sizeof(struct dirent);
- break;
- }
-
- ret = dir->offset * sizeof(struct dirent);
-
- DEBUG(4,(" -> %d\n", (int)ret));
-
- return ret;
-}
-
/*****************************************************
a wrapper for lseek()
*******************************************************/
off_t smbw_lseek(int fd, off_t offset, int whence)
{
struct smbw_file *file;
- uint32 size;
-
- DEBUG(4,("%s\n", __FUNCTION__));
+ size_t size;
smbw_busy++;
switch (whence) {
case SEEK_SET:
- file->offset = offset;
+ file->f->offset = offset;
break;
case SEEK_CUR:
- file->offset += offset;
+ file->f->offset += offset;
break;
case SEEK_END:
- if (!cli_qfileinfo(&file->srv->cli, file->cli_fd,
- NULL, &size, NULL, NULL, NULL) &&
- !cli_getattrE(&file->srv->cli, file->cli_fd,
+ if (!cli_qfileinfo(&file->srv->cli, file->f->cli_fd,
+ NULL, &size, NULL, NULL, NULL,
+ NULL, NULL) &&
+ !cli_getattrE(&file->srv->cli, file->f->cli_fd,
NULL, &size, NULL, NULL, NULL)) {
errno = EINVAL;
smbw_busy--;
return -1;
}
- file->offset = size + offset;
+ file->f->offset = size + offset;
break;
}
smbw_busy--;
- return file->offset;
+ return file->f->offset;
}
/*****************************************************
-a wrapper for mkdir()
+a wrapper for dup()
*******************************************************/
-int smbw_mkdir(const char *fname, mode_t mode)
+int smbw_dup(int fd)
{
- struct smbw_server *srv;
- fstring server, share;
- pstring path;
+ int fd2;
+ struct smbw_file *file, *file2;
- DEBUG(4,("%s (%s)\n", __FUNCTION__, fname));
+ smbw_busy++;
- if (!fname) {
- errno = EINVAL;
- return -1;
+ file = smbw_file(fd);
+ if (!file) {
+ errno = EBADF;
+ goto failed;
}
- smbw_init();
-
- smbw_busy++;
-
- /* work out what server they are after */
- smbw_parse_path(fname, server, share, path);
+ fd2 = dup(file->fd);
+ if (fd2 == -1) {
+ goto failed;
+ }
- /* get a connection to the server */
- srv = smbw_server(server, share);
- if (!srv) {
- /* smbw_server sets errno */
+ if (bitmap_query(smbw_file_bmap, fd2)) {
+ DEBUG(0,("ERROR: fd already open in dup!\n"));
+ errno = EIO;
goto failed;
}
- if (!cli_mkdir(&srv->cli, path)) {
- errno = smbw_errno(&srv->cli);
+ file2 = (struct smbw_file *)malloc(sizeof(*file2));
+ if (!file2) {
+ close(fd2);
+ errno = ENOMEM;
goto failed;
}
+ ZERO_STRUCTP(file2);
+
+ *file2 = *file;
+ file2->fd = fd2;
+
+ file->f->ref_count++;
+
+ bitmap_set(smbw_file_bmap, fd2);
+
+ DLIST_ADD(smbw_files, file2);
+
smbw_busy--;
- return 0;
+ return fd2;
failed:
smbw_busy--;
return -1;
}
+
/*****************************************************
-a wrapper for rmdir()
+a wrapper for dup2()
*******************************************************/
-int smbw_rmdir(const char *fname)
+int smbw_dup2(int fd, int fd2)
{
- struct smbw_server *srv;
- fstring server, share;
- pstring path;
+ struct smbw_file *file, *file2;
- DEBUG(4,("%s (%s)\n", __FUNCTION__, fname));
+ smbw_busy++;
- if (!fname) {
- errno = EINVAL;
- return -1;
+ file = smbw_file(fd);
+ if (!file) {
+ errno = EBADF;
+ goto failed;
}
- smbw_init();
-
- smbw_busy++;
-
- /* work out what server they are after */
- smbw_parse_path(fname, server, share, path);
+ if (bitmap_query(smbw_file_bmap, fd2)) {
+ DEBUG(0,("ERROR: fd already open in dup2!\n"));
+ errno = EIO;
+ goto failed;
+ }
- /* get a connection to the server */
- srv = smbw_server(server, share);
- if (!srv) {
- /* smbw_server sets errno */
+ if (dup2(file->fd, fd2) != fd2) {
goto failed;
}
- if (!cli_rmdir(&srv->cli, path)) {
- errno = smbw_errno(&srv->cli);
+ file2 = (struct smbw_file *)malloc(sizeof(*file2));
+ if (!file2) {
+ close(fd2);
+ errno = ENOMEM;
goto failed;
}
+ ZERO_STRUCTP(file2);
+
+ *file2 = *file;
+ file2->fd = fd2;
+
+ file->f->ref_count++;
+
+ bitmap_set(smbw_file_bmap, fd2);
+
+ DLIST_ADD(smbw_files, file2);
+
smbw_busy--;
- return 0;
+ return fd2;
failed:
smbw_busy--;
/*****************************************************
-a wrapper for getcwd()
+close a connection to a server
*******************************************************/
-char *smbw_getcwd(char *buf, size_t size)
+static void smbw_srv_close(struct smbw_server *srv)
{
- smbw_init();
-
- if (smbw_busy) {
- return __getcwd(buf, size);
- }
-
smbw_busy++;
- if (!buf) {
- if (size <= 0) size = strlen(smb_cwd)+1;
- buf = (char *)malloc(size);
- if (!buf) {
- errno = ENOMEM;
- smbw_busy--;
- return NULL;
- }
- }
+ cli_shutdown(&srv->cli);
- if (strlen(smb_cwd) > size-1) {
- errno = ERANGE;
- smbw_busy--;
- return NULL;
- }
+ free(srv->server_name);
+ free(srv->share_name);
- safe_strcpy(buf, smb_cwd, size);
+ DLIST_REMOVE(smbw_srvs, srv);
+
+ ZERO_STRUCTP(srv);
+ free(srv);
+
smbw_busy--;
- return buf;
}
/*****************************************************
-a wrapper for fchdir()
+when we fork we have to close all connections and files
+in the child
*******************************************************/
-int smbw_fchdir(unsigned int fd)
+int smbw_fork(void)
{
- struct smbw_dir *dir;
+ pid_t child;
+ int p[2];
+ char c=0;
+ pstring line;
- DEBUG(4,("%s\n", __FUNCTION__));
+ struct smbw_file *file, *next_file;
+ struct smbw_server *srv, *next_srv;
- smbw_busy++;
-
- dir = smbw_dir(fd);
- if (!dir) {
- errno = EBADF;
- smbw_busy--;
- return -1;
- }
+ if (pipe(p)) return real_fork();
- smbw_busy--;
-
- return chdir(dir->path);
-}
+ child = real_fork();
-/*****************************************************
-open a directory on the server
-*******************************************************/
-DIR *smbw_opendir(const char *fname)
-{
- int fd;
+ if (child) {
+ /* block the parent for a moment until the sockets are
+ closed */
+ close(p[1]);
+ read(p[0], &c, 1);
+ close(p[0]);
+ return child;
+ }
- smbw_busy++;
+ close(p[0]);
- fd = smbw_dir_open(fname);
+ /* close all files */
+ for (file=smbw_files;file;file=next_file) {
+ next_file = file->next;
+ close(file->fd);
+ }
- if (fd == -1) {
- smbw_busy--;
- return NULL;
+ /* close all server connections */
+ for (srv=smbw_srvs;srv;srv=next_srv) {
+ next_srv = srv->next;
+ smbw_srv_close(srv);
}
- smbw_busy--;
+ slprintf(line,sizeof(line)-1,"PWD_%d", getpid());
+ smbw_setshared(line,smbw_cwd);
- return (DIR *)smbw_dir(fd);
+ /* unblock the parent */
+ write(p[1], &c, 1);
+ close(p[1]);
+
+ /* and continue in the child */
+ return 0;
}
+#ifndef NO_ACL_WRAPPER
/*****************************************************
-read one entry from a directory
+say no to acls
*******************************************************/
-struct dirent *smbw_readdir(struct smbw_dir *d)
+ int smbw_acl(const char *pathp, int cmd, int nentries, aclent_t *aclbufp)
{
- static struct dirent de;
-
- if (smbw_getdents(d->fd, &de, sizeof(struct dirent)) > 0)
- return &de;
-
- return NULL;
+ if (cmd == GETACL || cmd == GETACLCNT) return 0;
+ errno = ENOSYS;
+ return -1;
}
+#endif
+#ifndef NO_FACL_WRAPPER
/*****************************************************
-close a DIR*
+say no to acls
*******************************************************/
-int smbw_closedir(struct smbw_dir *d)
+ int smbw_facl(int fd, int cmd, int nentries, aclent_t *aclbufp)
{
- return smbw_close(d->fd);
+ if (cmd == GETACL || cmd == GETACLCNT) return 0;
+ errno = ENOSYS;
+ return -1;
}
+#endif
-/*****************************************************
-seek in a directory
-*******************************************************/
-void smbw_seekdir(struct smbw_dir *d, off_t offset)
+
+#ifdef HAVE_STAT64
+/* this can't be in wrapped.c because of include conflicts */
+ void stat64_convert(struct stat *st, struct stat64 *st64)
{
- smbw_dir_lseek(d->fd,offset, SEEK_SET);
+ st64->st_size = st->st_size;
+ st64->st_mode = st->st_mode;
+ st64->st_ino = st->st_ino;
+ st64->st_dev = st->st_dev;
+ st64->st_rdev = st->st_rdev;
+ st64->st_nlink = st->st_nlink;
+ st64->st_uid = st->st_uid;
+ st64->st_gid = st->st_gid;
+ st64->st_atime = st->st_atime;
+ st64->st_mtime = st->st_mtime;
+ st64->st_ctime = st->st_ctime;
+ st64->st_blksize = st->st_blksize;
+ st64->st_blocks = st->st_blocks;
}
+#endif
-/*****************************************************
-current loc in a directory
-*******************************************************/
-off_t smbw_telldir(struct smbw_dir *d)
+#ifdef HAVE_READDIR64
+ void dirent64_convert(struct dirent *d, struct dirent64 *d64)
+{
+ d64->d_ino = d->d_ino;
+ d64->d_off = d->d_off;
+ d64->d_reclen = d->d_reclen;
+ pstrcpy(d64->d_name, d->d_name);
+}
+#endif
+
+
+#ifdef HAVE___XSTAT
+/* Definition of `struct stat' used in the linux kernel.. */
+struct kernel_stat {
+ unsigned short int st_dev;
+ unsigned short int __pad1;
+ unsigned long int st_ino;
+ unsigned short int st_mode;
+ unsigned short int st_nlink;
+ unsigned short int st_uid;
+ unsigned short int st_gid;
+ unsigned short int st_rdev;
+ unsigned short int __pad2;
+ unsigned long int st_size;
+ unsigned long int st_blksize;
+ unsigned long int st_blocks;
+ unsigned long int st_atime;
+ unsigned long int __unused1;
+ unsigned long int st_mtime;
+ unsigned long int __unused2;
+ unsigned long int st_ctime;
+ unsigned long int __unused3;
+ unsigned long int __unused4;
+ unsigned long int __unused5;
+};
+
+/*
+ * Prototype for gcc in 'fussy' mode.
+ */
+ void xstat_convert(int vers, struct stat *st, struct kernel_stat *kbuf);
+ void xstat_convert(int vers, struct stat *st, struct kernel_stat *kbuf)
{
- return smbw_dir_lseek(d->fd,0,SEEK_CUR);
+#ifdef _STAT_VER_LINUX_OLD
+ if (vers == _STAT_VER_LINUX_OLD) {
+ memcpy(st, kbuf, sizeof(*st));
+ return;
+ }
+#endif
+
+ ZERO_STRUCTP(st);
+
+ st->st_dev = kbuf->st_dev;
+ st->st_ino = kbuf->st_ino;
+ st->st_mode = kbuf->st_mode;
+ st->st_nlink = kbuf->st_nlink;
+ st->st_uid = kbuf->st_uid;
+ st->st_gid = kbuf->st_gid;
+ st->st_rdev = kbuf->st_rdev;
+ st->st_size = kbuf->st_size;
+ st->st_blksize = kbuf->st_blksize;
+ st->st_blocks = kbuf->st_blocks;
+ st->st_atime = kbuf->st_atime;
+ st->st_mtime = kbuf->st_mtime;
+ st->st_ctime = kbuf->st_ctime;
}
+#endif
git.samba.org / samba.git / blobdiff