sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

Remove PSTRING_LEN from smbd/ nmbd/.

Browse Source 
Remove pstring from libsmb/clidfs.c except for a nasty
hack (that will be removed when pstrings are gone from
client/).
Jeremy.
This commit is contained in:
Jeremy Allison 2007-11-29 17:25:41 -08:00
parent 20c1ba23f2
commit cc257b71d1
8 changed files with 529 additions and 389 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
source/client/client.c
View File

@ -226,7 +226,7 @@ static int do_dskattr(void)
struct cli_state *targetcli;
pstring targetpath;
if ( !cli_resolve_path( "", cli, cur_dir, &targetcli, targetpath ) ) {
if ( !cli_resolve_path_pstring( "", cli, cur_dir, &targetcli, targetpath ) ) {
d_printf("Error in dskattr: %s\n", cli_errstr(cli));
return 1;
}
@ -286,7 +286,7 @@ static int do_cd(char *newdir)
pstring_clean_name(cur_dir);
pstrcpy( dname, cur_dir );
if ( !cli_resolve_path( "", cli, dname, &targetcli, targetpath ) ) {
if ( !cli_resolve_path_pstring( "", cli, dname, &targetcli, targetpath ) ) {
d_printf("cd %s: %s\n", dname, cli_errstr(cli));
pstrcpy(cur_dir,saved_dir);
goto out;
@ -655,7 +655,7 @@ void do_list(const char *mask,uint16 attribute,void (*fn)(file_info *),bool rec,
/* check for dfs */
if ( !cli_resolve_path( "", cli, head, &targetcli, targetpath ) ) {
if ( !cli_resolve_path_pstring( "", cli, head, &targetcli, targetpath ) ) {
d_printf("do_list: [%s] %s\n", head, cli_errstr(cli));
remove_do_list_queue_head();
continue;
@ -685,7 +685,7 @@ void do_list(const char *mask,uint16 attribute,void (*fn)(file_info *),bool rec,
} else {
/* check for dfs */
if ( cli_resolve_path( "", cli, mask, &targetcli, targetpath ) ) {
if ( cli_resolve_path_pstring( "", cli, mask, &targetcli, targetpath ) ) {
if (cli_list(targetcli, targetpath, attribute, do_list_helper, NULL) == -1)
d_printf("%s listing %s\n", cli_errstr(targetcli), targetpath);
}
@ -823,7 +823,7 @@ static int do_get(char *rname, char *lname, bool reget)
strlower_m(lname);
}
if ( !cli_resolve_path( "", cli, rname, &targetcli, targetname ) ) {
if ( !cli_resolve_path_pstring( "", cli, rname, &targetcli, targetname ) ) {
d_printf("Failed to open %s: %s\n", rname, cli_errstr(cli));
return 1;
}
@ -1118,7 +1118,7 @@ static bool do_mkdir(char *name)
struct cli_state *targetcli;
pstring targetname;
if ( !cli_resolve_path( "", cli, name, &targetcli, targetname ) ) {
if ( !cli_resolve_path_pstring( "", cli, name, &targetcli, targetname ) ) {
d_printf("mkdir %s: %s\n", name, cli_errstr(cli));
return False;
}
@ -1188,7 +1188,7 @@ static int cmd_mkdir(void)
pstring targetname;
*ddir2 = 0;
if ( !cli_resolve_path( "", cli, mask, &targetcli, targetname ) ) {
if ( !cli_resolve_path_pstring( "", cli, mask, &targetcli, targetname ) ) {
return 1;
}
@ -1250,7 +1250,7 @@ static int do_put(char *rname, char *lname, bool reput)
struct cli_state *targetcli;
pstring targetname;
if ( !cli_resolve_path( "", cli, rname, &targetcli, targetname ) ) {
if ( !cli_resolve_path_pstring( "", cli, rname, &targetcli, targetname ) ) {
d_printf("Failed to open %s: %s\n", rname, cli_errstr(cli));
return 1;
}
@ -1770,7 +1770,7 @@ static int cmd_wdel(void)
pstrcpy(mask,cur_dir);
pstrcat(mask,buf);
if ( !cli_resolve_path( "", cli, mask, &targetcli, targetname ) ) {
if ( !cli_resolve_path_pstring( "", cli, mask, &targetcli, targetname ) ) {
d_printf("cmd_wdel %s: %s\n", mask, cli_errstr(cli));
return 1;
}
@ -1800,7 +1800,7 @@ static int cmd_open(void)
}
pstrcat(mask,buf);
if ( !cli_resolve_path( "", cli, mask, &targetcli, targetname ) ) {
if ( !cli_resolve_path_pstring( "", cli, mask, &targetcli, targetname ) ) {
d_printf("open %s: %s\n", mask, cli_errstr(cli));
return 1;
}
@ -1845,7 +1845,7 @@ static int cmd_posix_open(void)
}
mode = (mode_t)strtol(buf, (char **)NULL, 8);
if (!cli_resolve_path( "", cli, mask, &targetcli, targetname )) {
if (!cli_resolve_path_pstring( "", cli, mask, &targetcli, targetname )) {
d_printf("posix_open %s: %s\n", mask, cli_errstr(cli));
return 1;
}
@ -1887,7 +1887,7 @@ static int cmd_posix_mkdir(void)
}
mode = (mode_t)strtol(buf, (char **)NULL, 8);
if (!cli_resolve_path( "", cli, mask, &targetcli, targetname )) {
if (!cli_resolve_path_pstring( "", cli, mask, &targetcli, targetname )) {
d_printf("posix_mkdir %s: %s\n", mask, cli_errstr(cli));
return 1;
}
@ -1917,7 +1917,7 @@ static int cmd_posix_unlink(void)
}
pstrcat(mask,buf);
if (!cli_resolve_path( "", cli, mask, &targetcli, targetname )) {
if (!cli_resolve_path_pstring( "", cli, mask, &targetcli, targetname )) {
d_printf("posix_unlink %s: %s\n", mask, cli_errstr(cli));
return 1;
}
@ -1946,7 +1946,7 @@ static int cmd_posix_rmdir(void)
}
pstrcat(mask,buf);
if (!cli_resolve_path( "", cli, mask, &targetcli, targetname)) {
if (!cli_resolve_path_pstring( "", cli, mask, &targetcli, targetname)) {
d_printf("posix_rmdir %s: %s\n", mask, cli_errstr(cli));
return 1;
}
@ -2141,7 +2141,7 @@ static int cmd_rmdir(void)
}
pstrcat(mask,buf);
if ( !cli_resolve_path( "", cli, mask, &targetcli, targetname ) ) {
if ( !cli_resolve_path_pstring( "", cli, mask, &targetcli, targetname ) ) {
d_printf("rmdir %s: %s\n", mask, cli_errstr(cli));
return 1;
}
@ -2177,7 +2177,7 @@ static int cmd_link(void)
pstrcat(oldname,buf);
pstrcat(newname,buf2);
if ( !cli_resolve_path( "", cli, oldname, &targetcli, targetname ) ) {
if ( !cli_resolve_path_pstring( "", cli, oldname, &targetcli, targetname ) ) {
d_printf("link %s: %s\n", oldname, cli_errstr(cli));
return 1;
}
@ -2222,7 +2222,7 @@ static int cmd_symlink(void)
pstrcpy(oldname,buf);
pstrcat(newname,buf2);
if ( !cli_resolve_path( "", cli, oldname, &targetcli, targetname ) ) {
if ( !cli_resolve_path_pstring( "", cli, oldname, &targetcli, targetname ) ) {
d_printf("link %s: %s\n", oldname, cli_errstr(cli));
return 1;
}
@ -2259,7 +2259,7 @@ static int cmd_chmod(void)
mode = (mode_t)strtol(buf, NULL, 8);
pstrcat(src,buf2);
if ( !cli_resolve_path( "", cli, src, &targetcli, targetname ) ) {
if ( !cli_resolve_path_pstring( "", cli, src, &targetcli, targetname ) ) {
d_printf("chmod %s: %s\n", src, cli_errstr(cli));
return 1;
}
@ -2407,7 +2407,7 @@ static int cmd_getfacl(void)
pstrcat(src,name);
if ( !cli_resolve_path( "", cli, src, &targetcli, targetname ) ) {
if ( !cli_resolve_path_pstring( "", cli, src, &targetcli, targetname ) ) {
d_printf("stat %s: %s\n", src, cli_errstr(cli));
return 1;
}
@ -2572,7 +2572,7 @@ static int cmd_stat(void)
pstrcat(src,name);
if ( !cli_resolve_path( "", cli, src, &targetcli, targetname ) ) {
if ( !cli_resolve_path_pstring( "", cli, src, &targetcli, targetname ) ) {
d_printf("stat %s: %s\n", src, cli_errstr(cli));
return 1;
}
@ -2663,7 +2663,7 @@ static int cmd_chown(void)
gid = (gid_t)atoi(buf2);
pstrcat(src,buf3);
if ( !cli_resolve_path( "", cli, src, &targetcli, targetname ) ) {
if ( !cli_resolve_path_pstring( "", cli, src, &targetcli, targetname ) ) {
d_printf("chown %s: %s\n", src, cli_errstr(cli));
return 1;
}
@ -2706,12 +2706,12 @@ static int cmd_rename(void)
pstrcat(src,buf);
pstrcat(dest,buf2);
if ( !cli_resolve_path( "", cli, src, &targetcli, targetsrc ) ) {
if ( !cli_resolve_path_pstring( "", cli, src, &targetcli, targetsrc ) ) {
d_printf("rename %s: %s\n", src, cli_errstr(cli));
return 1;
}
if ( !cli_resolve_path( "", cli, dest, &targetcli, targetdest ) ) {
if ( !cli_resolve_path_pstring( "", cli, dest, &targetcli, targetdest ) ) {
d_printf("rename %s: %s\n", dest, cli_errstr(cli));
return 1;
}
@ -2769,7 +2769,7 @@ static int cmd_hardlink(void)
pstrcat(src,buf);
pstrcat(dest,buf2);
if ( !cli_resolve_path( "", cli, src, &targetcli, targetname ) ) {
if ( !cli_resolve_path_pstring( "", cli, src, &targetcli, targetname ) ) {
d_printf("hardlink %s: %s\n", src, cli_errstr(cli));
return 1;
}
@ -3218,7 +3218,7 @@ static int cmd_show_connect( void )
struct cli_state *targetcli;
pstring targetpath;
if ( !cli_resolve_path( "", cli, cur_dir, &targetcli, targetpath ) ) {
if ( !cli_resolve_path_pstring( "", cli, cur_dir, &targetcli, targetpath ) ) {
d_printf("showconnect %s: %s\n", cur_dir, cli_errstr(cli));
return 1;
}
@ -3417,7 +3417,7 @@ static int process_command_string(char *cmd)
/* establish the connection if not already */
if (!cli) {
cli = cli_cm_open(desthost, service, True);
cli = cli_cm_open(talloc_tos(), desthost, service, True);
if (!cli)
return 0;
}
@ -3737,29 +3737,37 @@ static int process_stdin(void)
int rc = 0;
while (1) {
TALLOC_CTX *frame = talloc_stackframe();
pstring tok;
pstring the_prompt;
char *cline;
pstring line;
int i;
/* display a prompt */
slprintf(the_prompt, sizeof(the_prompt)-1, "smb: %s> ", cur_dir);
cline = smb_readline(the_prompt, readline_callback, completion_fn);
if (!cline) break;
if (!cline) {
TALLOC_FREE(frame);
break;
}
pstrcpy(line, cline);
/* special case - first char is ! */
if (*line == '!') {
system(line + 1);
TALLOC_FREE(frame);
continue;
}
/* and get the first part of the command */
ptr = line;
if (!next_token_nr(&ptr,tok,NULL,sizeof(tok))) continue;
if (!next_token_nr(&ptr,tok,NULL,sizeof(tok))) {
TALLOC_FREE(frame);
continue;
}
if ((i = process_tok(tok)) >= 0) {
rc = commands[i].fn();
@ -3768,6 +3776,7 @@ static int process_stdin(void)
} else {
d_printf("%s: command not found\n",tok);
}
TALLOC_FREE(frame);
}
return rc;
}
@ -3780,7 +3789,7 @@ static int process(char *base_directory)
{
int rc = 0;
cli = cli_cm_open(desthost, service, True);
cli = cli_cm_open(talloc_tos(), desthost, service, True);
if (!cli) {
return 1;
}
@ -3809,7 +3818,7 @@ static int process(char *base_directory)
static int do_host_query(char *query_host)
{
cli = cli_cm_open(query_host, "IPC$", True);
cli = cli_cm_open(talloc_tos(), query_host, "IPC$", True);
if (!cli)
return 1;
@ -3822,7 +3831,7 @@ static int do_host_query(char *query_host)
cli_cm_shutdown();
cli_cm_set_port( 139 );
cli = cli_cm_open(query_host, "IPC$", True);
cli = cli_cm_open(talloc_tos(), query_host, "IPC$", True);
}
if (cli == NULL) {
@ -3847,7 +3856,7 @@ static int do_tar_op(char *base_directory)
/* do we already have a connection? */
if (!cli) {
cli = cli_cm_open(desthost, service, True);
cli = cli_cm_open(talloc_tos(), desthost, service, True);
if (!cli)
return 1;
}
@ -3961,7 +3970,7 @@ static int do_message_op(void)
POPT_TABLEEND
};
TALLOC_CTX *frame = talloc_stackframe();
load_case_tables();
#ifdef KANJI
@ -4200,7 +4209,7 @@ static int do_message_op(void)
if (message) {
return do_message_op();
}
if (process(base_directory)) {
return 1;
}

59
source/client/smbctool.c
View File

@ -304,9 +304,9 @@ static int do_dskattr(void)
{
int total, bsize, avail;
struct cli_state *targetcli;
pstring targetpath;
char *targetpath = NULL;
if ( !cli_resolve_path( "", cli, cur_dir, &targetcli, targetpath ) ) {
if ( !cli_resolve_path(talloc_tos(), "", cli, cur_dir, &targetcli, &targetpath ) ) {
d_printf("Error in dskattr: %s\n", cli_errstr(cli));
return 1;
}
@ -731,7 +731,7 @@ void do_list(const char *mask,uint16 attribute,void (*fn)(file_info *),bool rec,
{
static int in_do_list = 0;
struct cli_state *targetcli;
pstring targetpath;
char *targetpath;
if (in_do_list && rec) {
fprintf(stderr, "INTERNAL ERROR: do_list called recursively when the recursive flag is true\n");
@ -747,7 +747,7 @@ void do_list(const char *mask,uint16 attribute,void (*fn)(file_info *),bool rec,
if (rec) {
init_do_list_queue();
add_to_do_list_queue(mask);
while (! do_list_queue_empty()) {
/*
* Need to copy head so that it doesn't become
@ -758,15 +758,15 @@ void do_list(const char *mask,uint16 attribute,void (*fn)(file_info *),bool rec,
*/
pstring head;
pstrcpy(head, do_list_queue_head());
/* check for dfs */
if ( !cli_resolve_path( "", cli, head, &targetcli, targetpath ) ) {
if ( !cli_resolve_path(talloc_tos(), "", cli, head, &targetcli, &targetpath ) ) {
d_printf("do_list: [%s] %s\n", head, cli_errstr(cli));
remove_do_list_queue_head();
continue;
}
cli_list(targetcli, targetpath, attribute, do_list_helper, NULL);
remove_do_list_queue_head();
if ((! do_list_queue_empty()) && (fn == display_finfo)) {
@ -787,8 +787,7 @@ void do_list(const char *mask,uint16 attribute,void (*fn)(file_info *),bool rec,
}
} else {
/* check for dfs */
if ( cli_resolve_path( "", cli, mask, &targetcli, targetpath ) ) {
if (cli_resolve_path(talloc_tos(), "", cli, mask, &targetcli, &targetpath ) ) {
if (cli_list(targetcli, targetpath, attribute, do_list_helper, NULL) == -1)
d_printf("%s listing %s\n", cli_errstr(targetcli), targetpath);
}
@ -1857,21 +1856,21 @@ static int cmd_open(void)
pstring mask;
pstring buf;
struct cli_state *targetcli;
pstring targetname;
char *targetname;
pstrcpy(mask,cur_dir);
if (!next_token_nr(NULL,buf,NULL,sizeof(buf))) {
d_printf("open <filename>\n");
return 1;
}
pstrcat(mask,buf);
if ( !cli_resolve_path( "", cli, mask, &targetcli, targetname ) ) {
if (!cli_resolve_path(talloc_tos(), "", cli, mask, &targetcli, &targetname ) ) {
d_printf("open %s: %s\n", mask, cli_errstr(cli));
return 1;
}
cli_nt_create(targetcli, targetname, FILE_READ_DATA);
return 0;
@ -3320,31 +3319,39 @@ static int process_stdin(void)
int rc = 0;
while (1) {
TALLOC_CTX *ctx = talloc_stackframe();
pstring tok;
pstring the_prompt;
char *cline;
pstring line;
int i;
/* display a prompt */
slprintf(the_prompt, sizeof(the_prompt)-1, "smb: %s> ", cur_dir);
/* Removed callback since we don't need to swallow keepalives with libsmbclient */
/*cline = smb_readline(the_prompt, readline_callback, completion_fn);*/
cline = smb_readline(the_prompt, NULL, completion_fn);
if (!cline) break;
if (!cline) {
TALLOC_FREE(frame);
break;
}
pstrcpy(line, cline);
/* special case - first char is ! */
if (*line == '!') {
system(line + 1);
TALLOC_FREE(frame);
continue;
}
/* and get the first part of the command */
ptr = line;
if (!next_token_nr(&ptr,tok,NULL,sizeof(tok))) continue;
if (!next_token_nr(&ptr,tok,NULL,sizeof(tok))) {
TALLOC_FREE(frame);
continue;
}
if ((i = process_tok(tok)) >= 0) {
rc = commands[i].fn();
@ -3353,6 +3360,7 @@ static int process_stdin(void)
} else {
d_printf("%s: command not found\n",tok);
}
TALLOC_FREE(frame);
}
return rc;
}
@ -3375,7 +3383,7 @@ static int process(char *base_directory)
d_printf("Error initializing libsmbclient: %s\n", strerror(errno));
return 1;
}
if (*base_directory) {
rc = do_cd(base_directory);
if (rc) {
@ -3386,16 +3394,17 @@ static int process(char *base_directory)
else /* start the auth fn*/
{
rc = do_cd("/");
if (rc)
if (rc) {
return rc;
}
}
if (cmdstr) {
rc = process_command_string(cmdstr);
} else {
process_stdin();
}
cli_cm_shutdown();
return rc;
}

15
source/libsmb/cliconnect.c
View File

@ -879,8 +879,8 @@ ntlmssp:
password is in plaintext, the same should be done.
****************************************************************************/
NTSTATUS cli_session_setup(struct cli_state *cli,
const char *user,
NTSTATUS cli_session_setup(struct cli_state *cli,
const char *user,
const char *pass, int passlen,
const char *ntpass, int ntpasslen,
const char *workgroup)
@ -888,8 +888,17 @@ NTSTATUS cli_session_setup(struct cli_state *cli,
char *p;
fstring user2;
if (user) {
fstrcpy(user2, user);
} else {
user2[0] ='\0';
}
if (!workgroup) {
workgroup = "";
}
/* allow for workgroups as part of the username */
fstrcpy(user2, user);
if ((p=strchr_m(user2,'\\')) || (p=strchr_m(user2,'/')) ||
(p=strchr_m(user2,*lp_winbind_separator()))) {
*p = 0;

571
source/libsmb/clidfs.c
View File

File diff suppressed because it is too large Load Diff

169
source/libsmb/libsmbclient.c
View File

@ -1055,7 +1055,7 @@ smbc_open_ctx(SMBCCTX *context,
{
fstring server, share, user, password, workgroup;
pstring path;
pstring targetpath;
char *targetpath = NULL;
struct cli_state *targetcli;
SMBCSRV *srv = NULL;
SMBCFILE *file = NULL;
@ -1102,18 +1102,14 @@ smbc_open_ctx(SMBCCTX *context,
if (errno == EPERM) errno = EACCES;
TALLOC_FREE(frame);
return NULL; /* smbc_server sets errno */
}
/* Hmmm, the test for a directory is suspect here ... FIXME */
if (strlen(path) > 0 && path[strlen(path) - 1] == '\\') {
fd = -1;
}
else {
} else {
file = SMB_MALLOC_P(SMBCFILE);
if (!file) {
@ -1127,7 +1123,7 @@ smbc_open_ctx(SMBCCTX *context,
ZERO_STRUCTP(file);
/*d_printf(">>>open: resolving %s\n", path);*/
if (!cli_resolve_path( "", srv->cli, path, &targetcli, targetpath))
if (!cli_resolve_path(frame, "", srv->cli, path, &targetcli, &targetpath))
{
d_printf("Could not resolve %s\n", path);
SAFE_FREE(file);
@ -1135,7 +1131,7 @@ smbc_open_ctx(SMBCCTX *context,
return NULL;
}
/*d_printf(">>>open: resolved %s as %s\n", path, targetpath);*/
if ((fd = cli_open(targetcli, targetpath, flags,
context->internal->_share_mode)) < 0) {
@ -1248,7 +1244,8 @@ smbc_read_ctx(SMBCCTX *context,
{
int ret;
fstring server, share, user, password;
pstring path, targetpath;
pstring path;
char *targetpath = NULL;
struct cli_state *targetcli;
TALLOC_CTX *frame = talloc_stackframe();
@ -1307,17 +1304,17 @@ smbc_read_ctx(SMBCCTX *context,
TALLOC_FREE(frame);
return -1;
}
/*d_printf(">>>read: resolving %s\n", path);*/
if (!cli_resolve_path("", file->srv->cli, path,
&targetcli, targetpath))
if (!cli_resolve_path(frame, "", file->srv->cli, path,
&targetcli, &targetpath))
{
d_printf("Could not resolve %s\n", path);
TALLOC_FREE(frame);
return -1;
}
/*d_printf(">>>fstat: resolved path as %s\n", targetpath);*/
ret = cli_read(targetcli, file->cli_fd, (char *)buf, offset, count);
if (ret < 0) {
@ -1350,15 +1347,15 @@ smbc_write_ctx(SMBCCTX *context,
int ret;
off_t offset;
fstring server, share, user, password;
pstring path, targetpath;
pstring path;
char *targetpath = NULL;
struct cli_state *targetcli;
TALLOC_CTX *frame = talloc_stackframe();
/* First check all pointers before dereferencing them */
if (!context || !context->internal ||
!context->internal->_initialized) {
errno = EINVAL;
TALLOC_FREE(frame);
return -1;
@ -1366,17 +1363,14 @@ smbc_write_ctx(SMBCCTX *context,
}
if (!file || !DLIST_CONTAINS(context->internal->_files, file)) {
errno = EBADF;
TALLOC_FREE(frame);
return -1;
}
/* Check that the buffer exists ... */
if (buf == NULL) {
errno = EINVAL;
TALLOC_FREE(frame);
return -1;
@ -1398,22 +1392,19 @@ smbc_write_ctx(SMBCCTX *context,
TALLOC_FREE(frame);
return -1;
}
/*d_printf(">>>write: resolving %s\n", path);*/
if (!cli_resolve_path("", file->srv->cli, path,
&targetcli, targetpath))
{
if (!cli_resolve_path(frame, "", file->srv->cli, path,
&targetcli, &targetpath)) {
d_printf("Could not resolve %s\n", path);
TALLOC_FREE(frame);
return -1;
}
/*d_printf(">>>write: resolved path as %s\n", targetpath);*/
ret = cli_write(targetcli, file->cli_fd, 0, (char *)buf, offset, count);
if (ret <= 0) {
errno = smbc_errno(context, targetcli);
TALLOC_FREE(frame);
return -1;
@ -1425,7 +1416,7 @@ smbc_write_ctx(SMBCCTX *context,
TALLOC_FREE(frame);
return ret; /* Success, 0 bytes of data ... */
}
/*
* Routine to close() a file ...
*/
@ -1434,9 +1425,10 @@ static int
smbc_close_ctx(SMBCCTX *context,
SMBCFILE *file)
{
SMBCSRV *srv;
SMBCSRV *srv;
fstring server, share, user, password;
pstring path, targetpath;
pstring path;
char *targetpath = NULL;
struct cli_state *targetcli;
TALLOC_CTX *frame = talloc_stackframe();
@ -1450,7 +1442,6 @@ smbc_close_ctx(SMBCCTX *context,
}
if (!file || !DLIST_CONTAINS(context->internal->_files, file)) {
errno = EBADF;
TALLOC_FREE(frame);
return -1;
@ -1459,7 +1450,6 @@ smbc_close_ctx(SMBCCTX *context,
/* IS a dir ... */
if (!file->file) {
TALLOC_FREE(frame);
return (context->closedir)(context, file);
@ -1478,11 +1468,10 @@ smbc_close_ctx(SMBCCTX *context,
TALLOC_FREE(frame);
return -1;
}
/*d_printf(">>>close: resolving %s\n", path);*/
if (!cli_resolve_path("", file->srv->cli, path,
&targetcli, targetpath))
{
if (!cli_resolve_path(frame, "", file->srv->cli, path,
&targetcli, &targetpath)) {
d_printf("Could not resolve %s\n", path);
TALLOC_FREE(frame);
return -1;
@ -1531,18 +1520,16 @@ smbc_getatr(SMBCCTX * context,
SMB_INO_T *ino)
{
pstring fixedpath;
pstring targetpath;
char *targetpath = NULL;
struct cli_state *targetcli;
time_t write_time;
TALLOC_CTX *frame = talloc_stackframe();
if (!context || !context->internal ||
!context->internal->_initialized) {
errno = EINVAL;
TALLOC_FREE(frame);
return -1;
}
/* path fixup for . and .. */
@ -1555,14 +1542,14 @@ smbc_getatr(SMBCCTX * context,
trim_string(fixedpath, NULL, "\\.");
}
DEBUG(4,("smbc_getatr: sending qpathinfo\n"));
if (!cli_resolve_path( "", srv->cli, fixedpath, &targetcli, targetpath))
{
if (!cli_resolve_path(frame, "", srv->cli, fixedpath,
&targetcli, &targetpath)) {
d_printf("Couldn't resolve %s\n", path);
TALLOC_FREE(frame);
return False;
}
if (!srv->no_pathinfo2 &&
cli_qpathinfo2(targetcli, targetpath,
create_time_ts,
@ -1710,7 +1697,8 @@ smbc_unlink_ctx(SMBCCTX *context,
const char *fname)
{
fstring server, share, user, password, workgroup;
pstring path, targetpath;
pstring path;
char *targetpath;
struct cli_state *targetcli;
SMBCSRV *srv = NULL;
TALLOC_CTX *frame = talloc_stackframe();
@ -1758,8 +1746,8 @@ smbc_unlink_ctx(SMBCCTX *context,
}
/*d_printf(">>>unlink: resolving %s\n", path);*/
if (!cli_resolve_path( "", srv->cli, path, &targetcli, targetpath))
{
if (!cli_resolve_path(frame, "", srv->cli, path,
&targetcli, &targetpath)) {
d_printf("Could not resolve %s\n", path);
TALLOC_FREE(frame);
return -1;
@ -1835,16 +1823,16 @@ smbc_rename_ctx(SMBCCTX *ocontext,
fstring workgroup;
pstring path1;
pstring path2;
pstring targetpath1;
pstring targetpath2;
char *targetpath1;
char *targetpath2;
struct cli_state *targetcli1;
struct cli_state *targetcli2;
SMBCSRV *srv = NULL;
TALLOC_CTX *frame = talloc_stackframe();
if (!ocontext || !ncontext ||
if (!ocontext || !ncontext ||
!ocontext->internal || !ncontext->internal ||
!ocontext->internal->_initialized ||
!ocontext->internal->_initialized ||
!ncontext->internal->_initialized) {
errno = EINVAL; /* Best I can think of ... */
@ -1852,15 +1840,14 @@ smbc_rename_ctx(SMBCCTX *ocontext,
return -1;
}
if (!oname || !nname) {
if (!oname || !nname) {
errno = EINVAL;
TALLOC_FREE(frame);
return -1;
}
DEBUG(4, ("smbc_rename(%s,%s)\n", oname, nname));
smbc_parse_path(ocontext, oname,
@ -1887,9 +1874,7 @@ smbc_rename_ctx(SMBCCTX *ocontext,
if (strcmp(server1, server2) || strcmp(share1, share2) ||
strcmp(user1, user2)) {
/* Can't rename across file systems, or users?? */
errno = EXDEV;
TALLOC_FREE(frame);
return -1;
@ -1906,27 +1891,26 @@ smbc_rename_ctx(SMBCCTX *ocontext,
}
/*d_printf(">>>rename: resolving %s\n", path1);*/
if (!cli_resolve_path( "", srv->cli, path1, &targetcli1, targetpath1))
{
if (!cli_resolve_path(frame, "", srv->cli, path1,
&targetcli1, &targetpath1)) {
d_printf("Could not resolve %s\n", path1);
TALLOC_FREE(frame);
return -1;
}
/*d_printf(">>>rename: resolved path as %s\n", targetpath1);*/
/*d_printf(">>>rename: resolving %s\n", path2);*/
if (!cli_resolve_path( "", srv->cli, path2, &targetcli2, targetpath2))
{
if (!cli_resolve_path(frame, "", srv->cli, path2,
&targetcli2, &targetpath2)) {
d_printf("Could not resolve %s\n", path2);
TALLOC_FREE(frame);
return -1;
}
/*d_printf(">>>rename: resolved path as %s\n", targetpath2);*/
if (strcmp(targetcli1->desthost, targetcli2->desthost) ||
strcmp(targetcli1->share, targetcli2->share))
{
/* can't rename across file systems */
errno = EXDEV;
TALLOC_FREE(frame);
return -1;
@ -1962,17 +1946,16 @@ smbc_lseek_ctx(SMBCCTX *context,
{
SMB_OFF_T size;
fstring server, share, user, password;
pstring path, targetpath;
pstring path;
char *targetpath;
struct cli_state *targetcli;
TALLOC_CTX *frame = talloc_stackframe();
if (!context || !context->internal ||
!context->internal->_initialized) {
errno = EINVAL;
TALLOC_FREE(frame);
return -1;
}
if (!file || !DLIST_CONTAINS(context->internal->_files, file)) {
@ -2010,28 +1993,26 @@ smbc_lseek_ctx(SMBCCTX *context,
user, sizeof(user),
password, sizeof(password),
NULL, 0)) {
errno = EINVAL;
TALLOC_FREE(frame);
return -1;
}
/*d_printf(">>>lseek: resolving %s\n", path);*/
if (!cli_resolve_path("", file->srv->cli, path,
&targetcli, targetpath))
{
if (!cli_resolve_path(frame, "", file->srv->cli, path,
&targetcli, &targetpath)) {
d_printf("Could not resolve %s\n", path);
TALLOC_FREE(frame);
return -1;
}
/*d_printf(">>>lseek: resolved path as %s\n", targetpath);*/
if (!cli_qfileinfo(targetcli, file->cli_fd, NULL,
&size, NULL, NULL, NULL, NULL, NULL))
&size, NULL, NULL, NULL, NULL, NULL))
{
SMB_OFF_T b_size = size;
if (!cli_getattrE(targetcli, file->cli_fd,
NULL, &b_size, NULL, NULL, NULL))
NULL, &b_size, NULL, NULL, NULL))
{
errno = EINVAL;
TALLOC_FREE(frame);
@ -2238,14 +2219,13 @@ smbc_fstat_ctx(SMBCCTX *context,
fstring user;
fstring password;
pstring path;
pstring targetpath;
char *targetpath;
struct cli_state *targetcli;
SMB_INO_T ino = 0;
TALLOC_CTX *frame = talloc_stackframe();
if (!context || !context->internal ||
!context->internal->_initialized) {
errno = EINVAL;
TALLOC_FREE(frame);
return -1;
@ -2253,7 +2233,6 @@ smbc_fstat_ctx(SMBCCTX *context,
}
if (!file || !DLIST_CONTAINS(context->internal->_files, file)) {
errno = EBADF;
TALLOC_FREE(frame);
return -1;
@ -2261,7 +2240,6 @@ smbc_fstat_ctx(SMBCCTX *context,
}
if (!file->file) {
TALLOC_FREE(frame);
return (context->fstatdir)(context, file, st);
@ -2280,11 +2258,10 @@ smbc_fstat_ctx(SMBCCTX *context,
TALLOC_FREE(frame);
return -1;
}
/*d_printf(">>>fstat: resolving %s\n", path);*/
if (!cli_resolve_path("", file->srv->cli, path,
&targetcli, targetpath))
{
if (!cli_resolve_path(frame, "", file->srv->cli, path,
&targetcli, &targetpath)) {
d_printf("Could not resolve %s\n", path);
TALLOC_FREE(frame);
return -1;
@ -2979,7 +2956,7 @@ smbc_opendir_ctx(SMBCCTX *context,
* The server and share are specified ... work from
* there ...
*/
pstring targetpath;
char *targetpath;
struct cli_state *targetcli;
/* We connect to the server and list the directory */
@ -3006,9 +2983,8 @@ smbc_opendir_ctx(SMBCCTX *context,
p = path + strlen(path);
pstrcat(path, "\\*");
if (!cli_resolve_path("", srv->cli, path,
&targetcli, targetpath))
{
if (!cli_resolve_path(frame, "", srv->cli, path,
&targetcli, &targetpath)) {
d_printf("Could not resolve %s\n", path);
if (dir) {
SAFE_FREE(dir->fname);
@ -3017,7 +2993,7 @@ smbc_opendir_ctx(SMBCCTX *context,
TALLOC_FREE(frame);
return NULL;
}
if (cli_list(targetcli, targetpath,
aDIR | aSYSTEM | aHIDDEN,
dir_list_fn, (void *)dir) < 0) {
@ -3358,13 +3334,13 @@ smbc_mkdir_ctx(SMBCCTX *context,
fstring user;
fstring password;
fstring workgroup;
pstring path, targetpath;
pstring path;
char *targetpath;
struct cli_state *targetcli;
TALLOC_CTX *frame = talloc_stackframe();
if (!context || !context->internal ||
if (!context || !context->internal ||
!context->internal->_initialized) {
errno = EINVAL;
TALLOC_FREE(frame);
return -1;
@ -3372,13 +3348,12 @@ smbc_mkdir_ctx(SMBCCTX *context,
}
if (!fname) {
errno = EINVAL;
TALLOC_FREE(frame);
return -1;
}
DEBUG(4, ("smbc_mkdir(%s)\n", fname));
if (smbc_parse_path(context, fname,
@ -3407,8 +3382,8 @@ smbc_mkdir_ctx(SMBCCTX *context,
}
/*d_printf(">>>mkdir: resolving %s\n", path);*/
if (!cli_resolve_path( "", srv->cli, path, &targetcli, targetpath))
{
if (!cli_resolve_path(frame, "", srv->cli, path,
&targetcli, &targetpath)) {
d_printf("Could not resolve %s\n", path);
TALLOC_FREE(frame);
return -1;
@ -3462,13 +3437,12 @@ smbc_rmdir_ctx(SMBCCTX *context,
fstring password;
fstring workgroup;
pstring path;
pstring targetpath;
char *targetpath;
struct cli_state *targetcli;
TALLOC_CTX *frame = talloc_stackframe();
if (!context || !context->internal ||
if (!context || !context->internal ||
!context->internal->_initialized) {
errno = EINVAL;
TALLOC_FREE(frame);
return -1;
@ -3476,13 +3450,12 @@ smbc_rmdir_ctx(SMBCCTX *context,
}
if (!fname) {
errno = EINVAL;
TALLOC_FREE(frame);
return -1;
}
DEBUG(4, ("smbc_rmdir(%s)\n", fname));
if (smbc_parse_path(context, fname,
@ -3512,8 +3485,8 @@ smbc_rmdir_ctx(SMBCCTX *context,
}
/*d_printf(">>>rmdir: resolving %s\n", path);*/
if (!cli_resolve_path( "", srv->cli, path, &targetcli, targetpath))
{
if (!cli_resolve_path(frame, "", srv->cli, path,
&targetcli, &targetpath)) {
d_printf("Could not resolve %s\n", path);
TALLOC_FREE(frame);
return -1;

8
source/nmbd/nmbd_sendannounce.c
View File

@ -34,7 +34,7 @@ extern bool found_lm_clients;
void send_browser_reset(int reset_type, const char *to_name, int to_type, struct in_addr to_ip)
{
char outbuf[PSTRING_LEN];
char outbuf[1024];
char *p;
DEBUG(3,("send_browser_reset: sending reset request type %d to %s<%02x> IP %s.\n",
@ -59,7 +59,7 @@ void send_browser_reset(int reset_type, const char *to_name, int to_type, struct
void broadcast_announce_request(struct subnet_record *subrec, struct work_record *work)
{
char outbuf[PSTRING_LEN];
char outbuf[1024];
char *p;
work->needannounce = True;
@ -90,7 +90,7 @@ static void send_announcement(struct subnet_record *subrec, int announce_type,
time_t announce_interval,
const char *server_name, int server_type, const char *server_comment)
{
char outbuf[PSTRING_LEN];
char outbuf[1024];
unstring upper_server_name;
char *p;
@ -131,7 +131,7 @@ static void send_lm_announcement(struct subnet_record *subrec, int announce_type
time_t announce_interval,
char *server_name, int server_type, char *server_comment)
{
char outbuf[PSTRING_LEN];
char outbuf[1024];
char *p=outbuf;
memset(outbuf,'\0',sizeof(outbuf));

6
source/smbd/password.c
View File

@ -402,14 +402,14 @@ void add_session_user(const char *user)
len_session_userlist) ) {
char *newlist;
if (len_session_userlist > 128 * PSTRING_LEN) {
if (len_session_userlist > 128 * 1024) {
DEBUG(3,("add_session_user: session userlist already "
"too large.\n"));
return;
}
newlist = (char *)SMB_REALLOC_KEEP_OLD_ON_ERROR(
session_userlist,
len_session_userlist + PSTRING_LEN );
len_session_userlist + 1024 );
if( newlist == NULL ) {
DEBUG(1,("Unable to resize session_userlist\n"));
return;
@ -418,7 +418,7 @@ void add_session_user(const char *user)
*newlist = '\0';
}
session_userlist = newlist;
len_session_userlist += PSTRING_LEN;
len_session_userlist += 1024;
}
safe_strcat(session_userlist," ",len_session_userlist-1);

5
source/utils/net_rpc.c
View File

@ -3591,11 +3591,12 @@ static void copy_fn(const char *mnt, file_info *f, const char *mask, void *state
bool sync_files(struct copy_clistate *cp_clistate, pstring mask)
{
struct cli_state *targetcli;
pstring targetpath;
char *targetpath = NULL;
DEBUG(3,("calling cli_list with mask: %s\n", mask));
if ( !cli_resolve_path( "", cp_clistate->cli_share_src, mask, &targetcli, targetpath ) ) {
if ( !cli_resolve_path(talloc_tos(), "", cp_clistate->cli_share_src,
mask, &targetcli, &targetpath ) ) {
d_fprintf(stderr, "cli_resolve_path %s failed with error: %s\n",
mask, cli_errstr(cp_clistate->cli_share_src));
return False;