remove unused seek_file(); don't hardcode '\' when printing the auth-user

diff --git a/source/nsswitch/wbinfo.c b/source/nsswitch/wbinfo.c
index 792af84827f4e182296fafdb4e6ae150e14afb95..7d25524f8eee6fe8f0eed628f329c710c1ffd7e6 100644 (file)
--- a/source/nsswitch/wbinfo.c
+++ b/source/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/source/smbd/fileio.c b/source/smbd/fileio.c
index f395954d053b94ad74a4f5792e2587a4f6faaba4..3462a3b9fa57ff03324b838019e0104a50aea479 100644 (file)
--- a/source/smbd/fileio.c
+++ b/source/smbd/fileio.c
@@ -24,31 +24,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.
 ****************************************************************************/