summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-01-06 19:57:14 +0000
committerGerald Carter <jerry@samba.org>2004-01-06 19:57:14 +0000
commitd86628d0628a064f58e3ce9fbaf55ad9d5a92540 (patch)
tree31cefe696e17647bfde3b132bbc5c991944cfc38
parentb6acba72cd8b3b35273723b38d801479e1a6fbf7 (diff)
downloadsamba-d86628d0628a064f58e3ce9fbaf55ad9d5a92540.tar.gz
samba-d86628d0628a064f58e3ce9fbaf55ad9d5a92540.tar.bz2
samba-d86628d0628a064f58e3ce9fbaf55ad9d5a92540.zip
remove unused seek_file(); don't hardcode '\' when printing the auth-user
(This used to be commit fac5e05ca1b56cb6e3ab6537d0848fa373c00831)
-rw-r--r--source3/nsswitch/wbinfo.c2
-rw-r--r--source3/smbd/fileio.c25
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.
****************************************************************************/