diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-08-27 19:46:22 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-08-27 19:46:22 +0000 |
| commit | b031af348c7dcc8c74bf49945211c466b8eca079 (patch) | |
| tree | c6a20abba3c8432ad2980beeab9e1d2a8528f3a4 /source3/lib | |
| parent | 1d726fe0e054be9017309186c24b24d032e85636 (diff) | |
| download | samba-b031af348c7dcc8c74bf49945211c466b8eca079.tar.gz samba-b031af348c7dcc8c74bf49945211c466b8eca079.tar.bz2 samba-b031af348c7dcc8c74bf49945211c466b8eca079.zip | |
converted another bunch of stuff to NTSTATUS
(This used to be commit 1d36250e338ae0ff9fbbf86019809205dd97d05e)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/cmd_interp.c | 6 | ||||
| -rw-r--r-- | source3/lib/util_seaccess.c | 8 | ||||
| -rw-r--r-- | source3/lib/util_sock.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source3/lib/cmd_interp.c b/source3/lib/cmd_interp.c index 0ae6f5fb83..1d31d78b94 100644 --- a/source3/lib/cmd_interp.c +++ b/source3/lib/cmd_interp.c @@ -314,7 +314,7 @@ static uint32 cmd_set_options = 0xffffffff; ****************************************************************************/ static uint32 do_command(struct client_info *info, char *line) { - uint32 status = 0x0; + NTSTATUS status = 0x0; int i; if (!get_cmd_args(line)) @@ -355,7 +355,7 @@ static uint32 do_command(struct client_info *info, char *line) ****************************************************************************/ static uint32 process(struct client_info *info, char *cmd_str) { - uint32 status = 0; + NTSTATUS status = 0; pstring line; char *cmd = cmd_str; @@ -1286,7 +1286,7 @@ static void readline_init(void) ****************************************************************************/ int command_main(int argc, char *argv[]) { - uint32 status; + NTSTATUS status; mode_t myumask = 0755; char progname[255], path[255], *s; pstring msg; diff --git a/source3/lib/util_seaccess.c b/source3/lib/util_seaccess.c index 1716226272..f10c84c276 100644 --- a/source3/lib/util_seaccess.c +++ b/source3/lib/util_seaccess.c @@ -157,7 +157,7 @@ static BOOL get_max_access( SEC_ACL *the_acl, NT_USER_TOKEN *token, uint32 *gran */ *granted = acc_granted; - *status = NT_STATUS_NOPROBLEMO; + *status = NT_STATUS_OK; return True; } @@ -218,7 +218,7 @@ BOOL se_access_check(SEC_DESC *sd, struct current_user *user, if (!status || !acc_granted) return False; - *status = NT_STATUS_NOPROBLEMO; + *status = NT_STATUS_OK; *acc_granted = 0; DEBUG(10,("se_access_check: requested access %x, for uid %u\n", @@ -232,7 +232,7 @@ BOOL se_access_check(SEC_DESC *sd, struct current_user *user, /* ACL must have something in it */ if (!sd || (sd && (!(sd->type & SEC_DESC_DACL_PRESENT) || sd->dacl == NULL))) { - *status = NT_STATUS_NOPROBLEMO; + *status = NT_STATUS_OK; *acc_granted = acc_desired; DEBUG(5, ("se_access_check: no sd or blank DACL, access allowed\n")); return True; @@ -295,7 +295,7 @@ BOOL se_access_check(SEC_DESC *sd, struct current_user *user, if (tmp_acc_desired == 0) { *acc_granted = acc_desired; - *status = NT_STATUS_NOPROBLEMO; + *status = NT_STATUS_OK; DEBUG(5,("se_access_check: access (%x) granted.\n", (unsigned int)acc_desired )); return True; } diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c index 144f7cbd68..16b457c413 100644 --- a/source3/lib/util_sock.c +++ b/source3/lib/util_sock.c @@ -807,7 +807,7 @@ int open_socket_in( int type, int port, int dlevel, uint32 socket_addr, BOOL reb if( setsockopt(res,SOL_SOCKET,SO_REUSEADDR,(char *)&val,sizeof(val)) == -1 ) { if( DEBUGLVL( dlevel ) ) { dbgtext( "open_socket_in(): setsockopt: " ); - dbgtext( "SO_REUSEADDR = %d ", val?"True":"False" ); + dbgtext( "SO_REUSEADDR = %s ", val?"True":"False" ); dbgtext( "on port %d failed ", port ); dbgtext( "with error = %s\n", strerror(errno) ); } |