summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2006-03-21 02:56:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:15:39 -0500
commit97ee5b1afa342eea40f973f5370c9f620c63bd01 (patch)
tree79ed1975a7b968b445702b258d98bb8d66ed925f /source3/smbd
parent1d5ab8fd05123dd46e64a6249db2928c89aec2f2 (diff)
downloadsamba-97ee5b1afa342eea40f973f5370c9f620c63bd01.tar.gz
samba-97ee5b1afa342eea40f973f5370c9f620c63bd01.tar.bz2
samba-97ee5b1afa342eea40f973f5370c9f620c63bd01.zip
r14600: Refactor capability interface from being IRIX-specific to using only
the POSIX interface. Note that this removes support for inherited capabilities. This wasn't used, and probably should not be. (This used to be commit 763f4c01488a96aec000c18bca313da37ed1df1b)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/chgpasswd.c2
-rw-r--r--source3/smbd/oplock_irix.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c
index 224ae3d763..aef487f4a7 100644
--- a/source3/smbd/chgpasswd.c
+++ b/source3/smbd/chgpasswd.c
@@ -417,7 +417,7 @@ while we were waiting\n", WTERMSIG(wstat)));
/*
* Lose any oplock capabilities.
*/
- oplock_set_capability(False, False);
+ drop_effective_capability(KERNEL_OPLOCK_CAPABILITY);
/* make sure it doesn't freeze */
alarm(20);
diff --git a/source3/smbd/oplock_irix.c b/source3/smbd/oplock_irix.c
index 8f01438745..83883444a7 100644
--- a/source3/smbd/oplock_irix.c
+++ b/source3/smbd/oplock_irix.c
@@ -35,7 +35,7 @@ static BOOL irix_oplocks_available(void)
int pfd[2];
pstring tmpname;
- oplock_set_capability(True, False);
+ set_effective_capability(KERNEL_OPLOCK_CAPABILITY);
slprintf(tmpname,sizeof(tmpname)-1, "%s/koplock.%d", lp_lockdir(), (int)sys_getpid());