rpc_server/srv_srvsvc_nt.c: Don't test an uint32 for < 0.

utils/smbcacls.c: Set enum correctly.
Jeremy.
(This used to be commit 66f959e0ffb0cd385167a34c7db3f4959eaf1d7f)

diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index b28a0c96833ef681889eb8e4c6aa7c4db65afee3..e56e63490d30b71d3718c9155d7340de84f5c92b 100644 (file)
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/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/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 7b459a32ed6b32fda56508c4a49c6f2c12433ea8..4893eb4202b652610fb03b2e07c4765d74e213fb 100644 (file)
--- a/source3/utils/smbcacls.c
+++ b/source3/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;