diff options
| -rw-r--r-- | source3/include/smb_macros.h | 5 | ||||
| -rw-r--r-- | source3/lib/cmd_interp.c | 20 |
2 files changed, 7 insertions, 18 deletions
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index 007f88edba..9fe7f26cb3 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -30,11 +30,6 @@ #define BITSETB(ptr,bit) ((((char *)ptr)[0] & (1<<(bit)))!=0) #define BITSETW(ptr,bit) ((SVAL(ptr,0) & (1<<(bit)))!=0) -#define IS_BITS_SET_ALL(var,bit) (((var)&(bit))==(bit)) -#define IS_BITS_SET_SOME(var,bit) (((var)&(bit))!=0) -#define IS_BITS_CLR_ALL(var,bit) (((var)&(bit))==0) -#define IS_BITS_CLR_SOME(var,bit) (((var)&(bit))!=(bit)) - /* for readability... */ #define IS_DOS_READONLY(test_mode) (((test_mode) & aRONLY) != 0) #define IS_DOS_DIR(test_mode) (((test_mode) & aDIR) != 0) diff --git a/source3/lib/cmd_interp.c b/source3/lib/cmd_interp.c index 5f7e98c243..84fb28049a 100644 --- a/source3/lib/cmd_interp.c +++ b/source3/lib/cmd_interp.c @@ -1091,8 +1091,7 @@ static uint32 cmd_set(struct client_info *info, int argc, char *argv[]) } } - if (IS_BITS_SET_ALL(cmd_set_options, CMD_INTER)) - { + if (cmd_set_options & CMD_INTER) { setup_logging(debugf, interactive); if (!interactive) reopen_logs(); @@ -1101,8 +1100,7 @@ static uint32 cmd_set(struct client_info *info, int argc, char *argv[]) strupper(global_myname); fstrcpy(cli_info.myhostname, global_myname); - if (IS_BITS_SET_ALL(cmd_set_options, CMD_SVC)) - { + if (cmd_set_options & CMD_SVC) { if (!lp_load(servicesf, True, False, False)) { fprintf(stderr, @@ -1112,26 +1110,23 @@ static uint32 cmd_set(struct client_info *info, int argc, char *argv[]) } - if (IS_BITS_SET_ALL(cmd_set_options, CMD_INTER)) - { + if (cmd_set_options & CMD_INTER) { load_interfaces(); } DEBUG(10, ("cmd_set: options: %x\n", cmd_set_options)); - if (IS_BITS_SET_ALL(cmd_set_options, CMD_HELP)) - { + if (cmd_set_options & CMD_HELP) { return 0; } - if (IS_BITS_SET_ALL(cmd_set_options, CMD_NOPW)) - { + if (cmd_set_options & CMD_NOPW) { set_user_password(&usr.ntc, True, NULL); } else { set_user_password(&usr.ntc, - IS_BITS_SET_ALL(cmd_set_options, CMD_PASS), + ((cmd_set_options & CMD_PASS) != 0), password); } @@ -1310,8 +1305,7 @@ int command_main(int argc, char *argv[]) status = cmd_set(&cli_info, argc, argv); - if (IS_BITS_SET_SOME(cmd_set_options, CMD_HELP|CMD_STR)) - { + if (cmd_set_options & (CMD_HELP|CMD_STR)) { free_connections(); get_safe_nt_error_msg(status, msg, sizeof(msg)); |