Added debug in truncate, fixed warning with gcc3.

Jeremy.
(This used to be commit 970ec14b4ba1ccf66820384ced8442e1878c09cd)

diff --git a/source3/passdb/pdb_nisplus.c b/source3/passdb/pdb_nisplus.c
index eceb1ea546beb68bc9e09146a4bfcdc3c5ce3a07..6a97bd02b83f7a5a4f304a83dc2a8b0592a147ca 100644 (file)
--- a/source3/passdb/pdb_nisplus.c
+++ b/source3/passdb/pdb_nisplus.c
@@ -375,8 +375,7 @@ static BOOL make_sam_from_nisp_object(SAM_ACCOUNT *pw_buf, const nis_object *obj
   if (!(pdb_get_acct_ctrl(pw_buf) & ACB_PWNOTREQ) &&
       strncasecmp(ptr, "NO PASSWORD", 11)) {
     if (strlen(ptr) != 32 || !pdb_gethexpwd(ptr, smbntpwd)) {
-      DEBUG(0, ("malformed NT pwd entry:
- uid = %d.\n",
+      DEBUG(0, ("malformed NT pwd entry: uid = %d.\n",
                pdb_get_uid(pw_buf)));
       return False;
     }

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 02a78c4cd37e53867e8fc13efbe2c6d63c963895..37cee4918b96b27e2520523a06ebfbbc8c6262d2 100644 (file)
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -386,6 +386,7 @@ int vfs_set_filelen(files_struct *fsp, SMB_OFF_T len)
        int ret;
 
        release_level_2_oplocks_on_change(fsp);
+       DEBUG(10,("vfs_set_filelen: ftruncate %s to len %.0f\n", fsp->fsp_name, (double)len));
        if ((ret = fsp->conn->vfs_ops.ftruncate(fsp, fsp->fd, len)) != -1)
                set_filelen_write_cache(fsp, len);