diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/nsswitch/wbinfo.c | 2 | ||||
| -rw-r--r-- | source3/smbd/fileio.c | 25 |
2 files changed, 1 insertions, 26 deletions
diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c index 792af84827..7d25524f8e 100644 --- a/source3/nsswitch/wbinfo.c +++ b/source3/nsswitch/wbinfo.c @@ -923,7 +923,7 @@ static void wbinfo_get_auth_user(void) /* Pretty print authorised user info */ - d_printf("%s%s%s%s%s\n", domain ? domain : "", domain ? "\\" : "", + d_printf("%s%s%s%s%s\n", domain ? domain : "", domain ? lp_winbind_separator(): "", user, password ? "%" : "", password ? password : ""); SAFE_FREE(user); diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c index f395954d05..3462a3b9fa 100644 --- a/source3/smbd/fileio.c +++ b/source3/smbd/fileio.c @@ -25,31 +25,6 @@ static BOOL setup_write_cache(files_struct *, SMB_OFF_T); /**************************************************************************** - Seek a file. Try to avoid the seek if possible. -****************************************************************************/ - -static SMB_OFF_T seek_file(files_struct *fsp,SMB_OFF_T pos) -{ - SMB_OFF_T seek_ret; - - seek_ret = SMB_VFS_LSEEK(fsp,fsp->fd,pos,SEEK_SET); - - if(seek_ret == -1) { - DEBUG(0,("seek_file: (%s) sys_lseek failed. Error was %s\n", - fsp->fsp_name, strerror(errno) )); - fsp->pos = -1; - return -1; - } - - fsp->pos = seek_ret; - - DEBUG(10,("seek_file (%s): requested pos = %.0f, new pos = %.0f\n", - fsp->fsp_name, (double)pos, (double)fsp->pos )); - - return(fsp->pos); -} - -/**************************************************************************** Read from write cache if we can. ****************************************************************************/ |