s3-kerberos: remove print_kdc_line() completely.

[sfrench/samba-autobuild/.git] / source3 / modules / vfs_media_harmony.c

diff --git a/source3/modules/vfs_media_harmony.c b/source3/modules/vfs_media_harmony.c
index bdbb750e9caa945bd85031177b6bada916e5709d..bba98052e0056207b3eb32e7db32a44df4487d22 100644 (file)
--- a/source3/modules/vfs_media_harmony.c
+++ b/source3/modules/vfs_media_harmony.c
@@ -492,12 +492,11 @@ static int alloc_get_client_smb_fname(struct vfs_handle_struct *handle,
        DEBUG(MH_INFO_DEBUG, ("Entering with smb_fname->base_name '%s'\n",
                              smb_fname->base_name));
 
-       copystatus = copy_smb_filename(ctx, smb_fname, clientFname);
-       if (!NT_STATUS_IS_OK(copystatus))
-       {
+       clientFname = cp_smb_filename(ctx, smb_fname);
+       if (clientFname == NULL) {
                DEBUG(MH_ERR_DEBUG, ("alloc_get_client_smb_fname "
                                        "NTERR\n"));
-               errno = map_errno_from_nt_status(copystatus);
+               errno = ENOMEM;
                status = -1;
                goto err;
        }
@@ -608,7 +607,7 @@ static int set_fake_mtime(vfs_handle_struct *handle,
 
        DEBUG(MH_INFO_DEBUG, ("Fake stat'ing '%s'\n", statPath));
        if (statFn(statPath, &fakeStat,
-                       lp_fake_dir_create_times(SNUM(handle->conn))))
+                       lp_fake_directory_create_times(SNUM(handle->conn))))
        {
                /* This can fail for legitimate reasons - i.e. the
                 * fakeStat directory doesn't exist, which is okay
@@ -1490,7 +1489,9 @@ static int mh_fstat(vfs_handle_struct *handle,
 out:
        DEBUG(MH_INFO_DEBUG, ("Leaving with fsp->fsp_name->st.st_ex_mtime "
                        "%s",
-                       ctime(&(fsp->fsp_name->st.st_ex_mtime.tv_sec))));
+                       fsp->fsp_name != NULL ?
+                               ctime(&(fsp->fsp_name->st.st_ex_mtime.tv_sec)) :
+                               "0"));
        return status;
 }