summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerb Lewis <herb@samba.org>2005-02-09 21:23:33 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:55:36 -0500
commita572700531aeca75c62d1a189efd4606dfa8b354 (patch)
tree80501104e5d963f8fe4dfab22ebd54a1151a0d39
parentb3d17b8b166a870f08edbe506b5f4f91e22f0b25 (diff)
downloadsamba-a572700531aeca75c62d1a189efd4606dfa8b354.tar.gz
samba-a572700531aeca75c62d1a189efd4606dfa8b354.tar.xz
samba-a572700531aeca75c62d1a189efd4606dfa8b354.zip
r5287: fix build problem when HAVE_POSIX_ACL not defined
(This used to be commit 2bd0253c11977122b195dc2f685d5367869973fd)
-rw-r--r--source3/smbd/trans2.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 18fd5c946f8..1d925e81de3 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -2191,6 +2191,7 @@ int set_bad_path_error(int err, BOOL bad_path, char *outbuf, int def_class, uint
return UNIXERROR(def_class,def_code);
}
+#if defined(HAVE_POSIX_ACLS)
/****************************************************************************
Utility function to count the number of entries in a POSIX acl.
****************************************************************************/
@@ -2305,6 +2306,7 @@ static BOOL marshall_posix_acl(connection_struct *conn, char *pdata, SMB_STRUCT_
return True;
}
+#endif
/****************************************************************************
Reply to a TRANS2_QFILEPATHINFO or TRANSACT2_QFILEINFO (query file info by
@@ -2870,6 +2872,7 @@ static int call_trans2qfilepathinfo(connection_struct *conn, char *inbuf, char *
break;
}
+#if defined(HAVE_POSIX_ACLS)
case SMB_QUERY_POSIX_ACL:
{
SMB_ACL_T file_acl = NULL;
@@ -2946,6 +2949,7 @@ static int call_trans2qfilepathinfo(connection_struct *conn, char *inbuf, char *
data_size = (num_file_acls + num_def_acls)*SMB_POSIX_ACL_ENTRY_SIZE + SMB_POSIX_ACL_HEADER_SIZE;
break;
}
+#endif
default:
return ERROR_DOS(ERRDOS,ERRunknownlevel);
@@ -3755,6 +3759,7 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n",
return(-1);
}
+#if defined(HAVE_POSIX_ACLS)
case SMB_SET_POSIX_ACL:
{
uint16 posix_acl_version;
@@ -3804,6 +3809,7 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n",
send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0);
return(-1);
}
+#endif
default:
return ERROR_DOS(ERRDOS,ERRunknownlevel);