|
|
| version 1.1.1.2, 2013/10/14 07:51:14 | version 1.1.1.3, 2016/11/01 09:54:32 |
|---|---|
| Line 4 | Line 4 |
| * Copyright (C) 1996 Andrew Tridgell | * Copyright (C) 1996 Andrew Tridgell |
| * Copyright (C) 1996 Paul Mackerras | * Copyright (C) 1996 Paul Mackerras |
| * Copyright (C) 2002 Martin Pool <mbp@samba.org> | * Copyright (C) 2002 Martin Pool <mbp@samba.org> |
| * Copyright (C) 2004-2013 Wayne Davison | * Copyright (C) 2004-2015 Wayne Davison |
| * | * |
| * This program is free software; you can redistribute it and/or modify | * This program is free software; you can redistribute it and/or modify |
| * it under the terms of the GNU General Public License as published by | * it under the terms of the GNU General Public License as published by |
| Line 231 static int maybe_hard_link(struct file_struct *file, i | Line 231 static int maybe_hard_link(struct file_struct *file, i |
| } | } |
| } | } |
| if (atomic_create(file, fname, oldname, MAKEDEV(0, 0), sxp, statret == 0 ? DEL_FOR_FILE : 0)) { | if (atomic_create(file, fname, NULL, oldname, MAKEDEV(0, 0), sxp, statret == 0 ? DEL_FOR_FILE : 0)) { |
| if (itemizing) { | if (itemizing) { |
| itemize(fname, file, ndx, statret, sxp, | itemize(fname, file, ndx, statret, sxp, |
| ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0, | ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0, |
| Line 426 int hard_link_check(struct file_struct *file, int ndx, | Line 426 int hard_link_check(struct file_struct *file, int ndx, |
| else { | else { |
| sxp->acc_acl = alt_sx.acc_acl; | sxp->acc_acl = alt_sx.acc_acl; |
| sxp->def_acl = alt_sx.def_acl; | sxp->def_acl = alt_sx.def_acl; |
| sxp->nfs4_acl = alt_sx.nfs4_acl; | |
| alt_sx.acc_acl = alt_sx.def_acl = NULL; | alt_sx.acc_acl = alt_sx.def_acl = NULL; |
| alt_sx.nfs4_acl = NULL; | |
| } | } |
| } | } |
| #endif | #endif |