summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-06-19 00:44:21 +0000
committerJeremy Allison <jra@samba.org>2001-06-19 00:44:21 +0000
commitbab60032dce1c19359d864727f75645f533261cd (patch)
treef18e72ada82db9c38d6805b6fda60200e22fed01
parent2fd48347b169cecaefc7c4001bd544a78892a800 (diff)
downloadsamba-bab60032dce1c19359d864727f75645f533261cd.tar.gz
samba-bab60032dce1c19359d864727f75645f533261cd.tar.xz
samba-bab60032dce1c19359d864727f75645f533261cd.zip
rpc_server/srv_srvsvc_nt.c: Don't test an uint32 for < 0.
utils/smbcacls.c: Set enum correctly. Jeremy.
-rw-r--r--source/rpc_server/srv_srvsvc_nt.c2
-rw-r--r--source/utils/smbcacls.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/rpc_server/srv_srvsvc_nt.c b/source/rpc_server/srv_srvsvc_nt.c
index b28a0c96833..e56e63490d3 100644
--- a/source/rpc_server/srv_srvsvc_nt.c
+++ b/source/rpc_server/srv_srvsvc_nt.c
@@ -1761,7 +1761,7 @@ static uint32 init_server_disk_enum(uint32 *resume)
/*resume can be an offset into the list for now*/
- if(*resume < 0)
+ if(*resume & 0x80000000)
*resume = 0;
if(*resume > server_disk_count)
diff --git a/source/utils/smbcacls.c b/source/utils/smbcacls.c
index 7b459a32ed6..4893eb4202b 100644
--- a/source/utils/smbcacls.c
+++ b/source/utils/smbcacls.c
@@ -810,7 +810,7 @@ You can string acls together with spaces, commas or newlines\n\
char *p;
static pstring servicesf = CONFIGFILE;
struct cli_state *cli=NULL;
- enum acl_mode mode = 0;
+ enum acl_mode mode = SMB_ACL_SET;
char *the_acl = NULL;
enum chown_mode change_mode = REQUEST_NONE;
int result;